TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-11-23 18:15:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix for NPE when MMS From is absent

Browse Source 
Fixes #6115
// FREEBIE
This commit is contained in:
Moxie Marlinspike 2017-01-29 13:16:10 -08:00
parent 67cab3ce86
commit 4fb8d1fa49
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/org/thoughtcrime/securesms/database/MmsDatabase.java
View File

@ -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);
}