Fix seeded MMS download messages being deleted by sync

Author: m4pl

src/com/android/messaging/datamodel/action/DownloadMmsAction.java

@@ -118,6 +118,11 @@ protected boolean queueAction(final String messageId, final Action processingAct
         final MessageData message = BugleDatabaseOperations.readMessage(db, messageId);
         if (message != null && message.canDownloadMessage()) {
             final Uri notificationUri = message.getSmsMessageUri();
+            if (notificationUri == null) {
+                LogUtil.w(TAG, "DownloadMmsAction: message " + messageId
+                        + " has no notification uri; skipping download");
+                return false;
+            }
             final String conversationId = message.getConversationId();
             final int status = message.getStatus();
 

src/com/android/messaging/debug/TestDataSeeder.kt

@@ -957,7 +957,6 @@ private fun insertMmsDownloadMessage(
             put(MessageColumns.RECEIVED_TIMESTAMP, timestamp)
             put(MessageColumns.SEEN, 1)
             put(MessageColumns.READ, 1)
-            put(MessageColumns.SMS_MESSAGE_URI, "content://mms/${900_000 + seedIndex}")
             put(MessageColumns.SMS_PRIORITY, 0)
             put(MessageColumns.SMS_MESSAGE_SIZE, messageSizeBytes)
             put(MessageColumns.MMS_TRANSACTION_ID, "seeded-transaction-$seedIndex")

src/com/android/messaging/sms/MmsUtils.java

@@ -1951,6 +1951,9 @@ public static StatusPlusUri updateSentMmsMessageStatus(final Context context,
     }
 
     public static void clearMmsStatus(final Context context, final Uri uri) {
+        if (uri == null) {
+            return;
+        }
         // Messaging application can leave invalid values in STATUS field of M-Notification.ind
         // messages.  Take this opportunity to clear it.
         // Downloading status just kept in local db and not reflected into telephony.