TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-10-23 21:29:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Subtle rebase conflicts...

Browse Source
This commit is contained in:
Moxie Marlinspike
2013-11-18 15:29:19 -08:00
parent f10d6a7b0b
commit fde8d32848
7 changed files with 23 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -241,12 +241,10 @@ public class MessageNotifier {
private static void sendInThreadNotification(Context context) {
try {
SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(context);
if (!sp.getBoolean(ApplicationPreferencesActivity.IN_THREAD_NOTIFICATION_PREF, true)) {
return;
if (!TextSecurePreferences.isInThreadNotifications(context)) {
return;
}
String ringtone = TextSecurePreferences.getNotificationRingtone(context);
if (ringtone == null)