TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-11-27 20:15:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Do not call Notification.setSound with empty ringtone

Browse Source 
Closes #6293
// FREEBIE
This commit is contained in:
Christian Ascheberg 2017-02-23 17:28:34 +01:00 committed by Moxie Marlinspike
parent 65c05e0388
commit 44bb2c7c72
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/org/thoughtcrime/securesms/notifications/AbstractNotificationBuilder.java
View File

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