From 2fb9806f36bc9fffbff5c7879dcf3fdfe2c067c7 Mon Sep 17 00:00:00 2001 From: Moxie Marlinspike Date: Thu, 18 Jun 2015 11:10:11 -0700 Subject: [PATCH] Null check for corner case NPE. Fixes #3441 // FREEBIE --- .../thoughtcrime/securesms/notifications/MessageNotifier.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/org/thoughtcrime/securesms/notifications/MessageNotifier.java b/src/org/thoughtcrime/securesms/notifications/MessageNotifier.java index c66ef99e55..711f6e3ae4 100644 --- a/src/org/thoughtcrime/securesms/notifications/MessageNotifier.java +++ b/src/org/thoughtcrime/securesms/notifications/MessageNotifier.java @@ -313,7 +313,7 @@ public class MessageNotifier { return; } - Uri uri = recipients.getRingtone(); + Uri uri = recipients != null ? recipients.getRingtone() : null; if (uri == null) { String ringtone = TextSecurePreferences.getNotificationRingtone(context);