Support for custom call ringtone selection and per-chat ringtones

This commit is contained in:
Moxie Marlinspike
2018-02-16 11:10:35 -08:00
parent 35a6ec707f
commit 71c7ef5b5e
15 changed files with 408 additions and 125 deletions

View File

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

View File

@@ -48,7 +48,7 @@ public class NotificationState {
Recipient recipient = notifications.getFirst().getRecipient();
if (recipient != null) {
return recipient.getRingtone();
return recipient.resolve().getMessageRingtone();
}
}
@@ -60,7 +60,7 @@ public class NotificationState {
Recipient recipient = notifications.getFirst().getRecipient();
if (recipient != null) {
return recipient.getVibrate();
return recipient.resolve().getMessageVibrate();
}
}