Do not call Notification.setSound with empty ringtone

Closes #6293
// FREEBIE
fork-5.53.8
Christian Ascheberg 2017-02-23 17:28:34 +01:00 zatwierdzone przez Moxie Marlinspike
rodzic 65c05e0388
commit 44bb2c7c72
1 zmienionych plików z 2 dodań i 2 usunięć

Wyświetl plik

@ -44,8 +44,8 @@ public abstract class AbstractNotificationBuilder extends NotificationCompat.Bui
String defaultRingtoneName = TextSecurePreferences.getNotificationRingtone(context);
boolean defaultVibrate = TextSecurePreferences.isNotificationVibrateEnabled(context);
if (ringtone != null) setSound(ringtone);
else if (!TextUtils.isEmpty(defaultRingtoneName)) setSound(Uri.parse(defaultRingtoneName));
if (ringtone == null && !TextUtils.isEmpty(defaultRingtoneName)) setSound(Uri.parse(defaultRingtoneName));
else if (ringtone != null && !ringtone.toString().isEmpty()) setSound(ringtone);
if (vibrate == RecipientPreferenceDatabase.VibrateState.ENABLED ||
(vibrate == RecipientPreferenceDatabase.VibrateState.DEFAULT && defaultVibrate))