Fix for NPE when MMS From is absent

Fixes #6115 // FREEBIE
8 years ago · 4fb8d1fa49
parent 67cab3ce86
commit 4fb8d1fa49
1 changed files with 4 additions and 1 deletions
--- a/src/org/thoughtcrime/securesms/database/MmsDatabase.java
+++ b/src/org/thoughtcrime/securesms/database/MmsDatabase.java
@ -832,7 +832,10 @@ public class MmsDatabase extends MessagingDatabase {
      contentValues.put(DATE_SENT, contentValues.getAsLong(DATE_RECEIVED));

    long messageId = db.insert(TABLE_NAME, null, contentValues);
-    addressDatabase.insertAddressesForId(messageId, MmsAddresses.forFrom(Util.toIsoString(notification.getFrom().getTextString())));
+
+    if (headers.getEncodedStringValue(PduHeaders.FROM) != null) {
+      addressDatabase.insertAddressesForId(messageId, MmsAddresses.forFrom(Util.toIsoString(notification.getFrom().getTextString())));
+    }

    return new Pair<>(messageId, threadId);
  }