Fix incorrect notification sound when channel is set to silent.

Fixes #12317
This commit is contained in:
Cody Henthorne
2022-07-08 15:03:27 -04:00
committed by Alex Hart
parent e80df64698
commit 748dbc2ba5
3 changed files with 5 additions and 3 deletions

View File

@@ -25,7 +25,8 @@ class CustomNotificationsSettingsRepository(context: Context) {
val recipient = Recipient.resolved(recipientId)
val database = SignalDatabase.recipients
if (recipient.notificationChannel != null) {
database.setMessageRingtone(recipient.id, NotificationChannels.getMessageRingtone(context, recipient))
val ringtoneUri: Uri? = NotificationChannels.getMessageRingtone(context, recipient)
database.setMessageRingtone(recipient.id, if (ringtoneUri == Uri.EMPTY) null else ringtoneUri)
database.setMessageVibrate(recipient.id, RecipientDatabase.VibrateState.fromBoolean(NotificationChannels.getMessageVibrate(context, recipient)))
}
}