TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-12-22 07:57:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix for notification NPE on unknown sender.

Browse Source
This commit is contained in:
Moxie Marlinspike 2013-02-20 20:44:21 -08:00
parent f73adfc8f5
commit 5bf5b404a1
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -292,7 +292,7 @@ public class MessageNotifier {
private static Recipients getSmsRecipient(Context context, Cursor cursor) private static Recipients getSmsRecipient(Context context, Cursor cursor)
throws RecipientFormattingException throws RecipientFormattingException
{ {
String address = cursor.getString(cursor.getColumnIndexOrThrow(SmsDatabase.ADDRESS)); String address = cursor.getString(cursor.getColumnIndexOrThrow(SmsDatabase.ADDRESS));
return RecipientFactory.getRecipientsFromString(context, address, false); return RecipientFactory.getRecipientsFromString(context, address, false);
} }
@ -305,19 +305,27 @@ public class MessageNotifier {
} }
private static Recipients getRecipients(Context context, Cursor cursor) { private static Recipients getRecipients(Context context, Cursor cursor) {
String type = cursor.getString(cursor.getColumnIndexOrThrow(MmsSmsDatabase.TRANSPORT)); String type = cursor.getString(cursor.getColumnIndexOrThrow(MmsSmsDatabase.TRANSPORT));
Recipients recipients = null;
try { try {
if (type.equals("sms")) { if (type.equals("sms")) {
return getSmsRecipient(context, cursor); recipients = getSmsRecipient(context, cursor);
} else { } else {
return getMmsRecipient(context, cursor); recipients = getMmsRecipient(context, cursor);
} }
} catch (RecipientFormattingException e) { } catch (RecipientFormattingException e) {
Log.w("MessageNotifier", e); Log.w("MessageNotifier", e);
return new Recipients(new Recipient("Unknown", "Unknown", null, return new Recipients(new Recipient("Unknown", "Unknown", null,
ContactPhotoFactory.getDefaultContactPhoto(context))); ContactPhotoFactory.getDefaultContactPhoto(context)));
} }
if (recipients == null || recipients.isEmpty()) {
recipients = new Recipients(new Recipient("Unknown", "Unknown", null,
ContactPhotoFactory.getDefaultContactPhoto(context)));
}
return recipients;
} }
private static void setNotificationAlarms(Context context, private static void setNotificationAlarms(Context context,