Address bugs in notification channel backup restore.

This commit is contained in:
Greyson Parrelli
2018-09-07 16:18:26 -07:00
parent ad036b0d6a
commit 70eecb754e
5 changed files with 15 additions and 23 deletions

View File

@@ -381,7 +381,10 @@ public class MessageNotifier {
return;
}
Uri uri = recipient != null ? recipient.resolve().getMessageRingtone(context) : null;
Uri uri = null;
if (recipient != null) {
uri = NotificationChannels.supported() ? NotificationChannels.getMessageRingtone(context, recipient) : recipient.getMessageRingtone();
}
if (uri == null) {
uri = NotificationChannels.supported() ? NotificationChannels.getMessageRingtone(context) : TextSecurePreferences.getNotificationRingtone(context);