Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-19 08:09:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use correct in-thread message tone on O+.

Browse Source 
We manually play the ringtone when in-thread notifications are enabled,
but we weren't using the sound specified by the channel in the system
settings. This fixes that problem by reading the NotificationChannel
setting.
This commit is contained in:
Greyson Parrelli
2018-08-22 11:58:41 -07:00
parent 54715e9c43
commit f1efe2b589
5 changed files with 33 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/org/thoughtcrime/securesms/notifications/MessageNotifier.java
View File

@@ -325,7 +325,7 @@ public class MessageNotifier {
}
if (signal) {
builder.setAlarms(notificationState.getRingtone(), notificationState.getVibrate());
builder.setAlarms(notificationState.getRingtone(context), notificationState.getVibrate());
builder.setTicker(notifications.get(0).getIndividualRecipient(),
notifications.get(0).getText());
}
@@ -363,7 +363,7 @@ public class MessageNotifier {
}
if (signal) {
builder.setAlarms(notificationState.getRingtone(), notificationState.getVibrate());
builder.setAlarms(notificationState.getRingtone(context), notificationState.getVibrate());
builder.setTicker(notifications.get(0).getIndividualRecipient(),
notifications.get(0).getText());
}
@@ -378,7 +378,7 @@ public class MessageNotifier {
return;
}
Uri uri = recipient != null ? recipient.resolve().getMessageRingtone() : null;
Uri uri = recipient != null ? recipient.resolve().getMessageRingtone(context) : null;
if (uri == null) {
uri = TextSecurePreferences.getNotificationRingtone(context);