From de1c6cdd0c4b84053ee90df93354ed4eba578996 Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Tue, 15 Oct 2019 10:07:20 -0400
Subject: [PATCH] Fix crash when MMS messages have no 'from' address.

---
 .../thoughtcrime/securesms/database/MmsDatabase.java   |  2 ++
 .../database/helpers/SQLCipherOpenHelper.java          | 10 +++++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/org/thoughtcrime/securesms/database/MmsDatabase.java b/src/org/thoughtcrime/securesms/database/MmsDatabase.java
index 927c09399c..66f0a2e99b 100644
--- a/src/org/thoughtcrime/securesms/database/MmsDatabase.java
+++ b/src/org/thoughtcrime/securesms/database/MmsDatabase.java
@@ -921,6 +921,8 @@ public class MmsDatabase extends MessagingDatabase {
     if (notification.getFrom() != null) {
       Recipient recipient = Recipient.external(context, Util.toIsoString(notification.getFrom().getTextString()));
       contentValues.put(RECIPIENT_ID, recipient.getId().serialize());
+    } else {
+      contentValues.put(RECIPIENT_ID, RecipientId.UNKNOWN.serialize());
     }
 
     contentValues.put(MESSAGE_BOX, Types.BASE_INBOX_TYPE);
diff --git a/src/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java b/src/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java
index 32d8c25f8e..d9da46177a 100644
--- a/src/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java
+++ b/src/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java
@@ -75,8 +75,9 @@ public class SQLCipherOpenHelper extends SQLiteOpenHelper {
   private static final int RECIPIENT_IDS                    = 24;
   private static final int RECIPIENT_SEARCH                 = 25;
   private static final int RECIPIENT_CLEANUP                = 26;
+  private static final int MMS_RECIPIENT_CLEANUP            = 27;
 
-  private static final int    DATABASE_VERSION = 26;
+  private static final int    DATABASE_VERSION = 27;
   private static final String DATABASE_NAME    = "signal.db";
 
   private final Context        context;
@@ -514,6 +515,13 @@ public class SQLCipherOpenHelper extends SQLiteOpenHelper {
         RecipientIdCleanupHelper.execute(db);
       }
 
+      if (oldVersion < MMS_RECIPIENT_CLEANUP) {
+        ContentValues values = new ContentValues(1);
+        values.put("address", "-1");
+        int count = db.update("mms", values, "address = ?", new String[] { "0" });
+        Log.i(TAG, "MMS recipient cleanup updated " + count + " rows.");
+      }
+
       db.setTransactionSuccessful();
     } finally {
       db.endTransaction();