Move notification preferences back in-app for O+.

Fixes #8147
2026-04-19 16:19:33 +01:00 · 2018-08-30 17:59:15 -07:00
parent 3f9ddaf409
commit e840dc6687
11 changed files with 282 additions and 161 deletions
--- a/src/org/thoughtcrime/securesms/notifications/MessageNotifier.java
+++ b/src/org/thoughtcrime/securesms/notifications/MessageNotifier.java
@@ -381,7 +381,7 @@ public class MessageNotifier {
    Uri uri = recipient != null ? recipient.resolve().getMessageRingtone(context) : null;

    if (uri == null) {
-      uri = TextSecurePreferences.getNotificationRingtone(context);
+      uri = NotificationChannels.supported() ? NotificationChannels.getMessageRingtone(context) : TextSecurePreferences.getNotificationRingtone(context);
    }

    if (uri.toString().isEmpty()) {