Fix for NPE on null FROM in MMS header.

11 years ago · 0534f9d95a
parent dda5bc8838
commit 0534f9d95a
1 changed files with 5 additions and 1 deletions
--- a/src/org/thoughtcrime/securesms/database/MmsDatabase.java
+++ b/src/org/thoughtcrime/securesms/database/MmsDatabase.java
@ -647,7 +647,11 @@ public class MmsDatabase extends Database implements MmsSmsColumns {
    cvb.add(DELIVERY_TIME, headers.getLongInteger(PduHeaders.DELIVERY_TIME));
    cvb.add(EXPIRY, headers.getLongInteger(PduHeaders.EXPIRY));
    cvb.add(MESSAGE_SIZE, headers.getLongInteger(PduHeaders.MESSAGE_SIZE));
-    cvb.add(ADDRESS, headers.getEncodedStringValue(PduHeaders.FROM).getTextString());
+
+    if (headers.getEncodedStringValue(PduHeaders.FROM) != null)
+      cvb.add(ADDRESS, headers.getEncodedStringValue(PduHeaders.FROM).getTextString());
+    else
+      cvb.add(ADDRESS, null);

    return cvb.getContentValues();
  }