From 5193a5d30989b1278cf9ba8b84f7e177a73e07b5 Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Thu, 23 Apr 2020 22:25:41 -0400
Subject: [PATCH] Prevent some crash loops.

---
 .../org/thoughtcrime/securesms/jobs/MmsDownloadJob.java    | 7 +++++++
 .../thoughtcrime/securesms/jobs/RefreshAttributesJob.java  | 2 +-
 .../org/thoughtcrime/securesms/jobs/SmsReceiveJob.java     | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/MmsDownloadJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/MmsDownloadJob.java
index fc6fd73965..734e10a952 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/MmsDownloadJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/MmsDownloadJob.java
@@ -100,6 +100,10 @@ public class MmsDownloadJob extends BaseJob {
 
   @Override
   public void onRun() {
+    if (TextSecurePreferences.getLocalUuid(context) == null && TextSecurePreferences.getLocalNumber(context) == null) {
+      throw new NotReadyException();
+    }
+
     MmsDatabase                               database     = DatabaseFactory.getMmsDatabase(context);
     Optional<MmsDatabase.MmsNotificationInfo> notification = database.getNotification(messageId);
 
@@ -265,4 +269,7 @@ public class MmsDownloadJob extends BaseJob {
                                 data.getBoolean(KEY_AUTOMATIC));
     }
   }
+
+  private static class NotReadyException extends RuntimeException {
+  }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/RefreshAttributesJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/RefreshAttributesJob.java
index bea14b1741..2951a6ecc9 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/RefreshAttributesJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/RefreshAttributesJob.java
@@ -49,7 +49,7 @@ public class RefreshAttributesJob extends BaseJob {
 
   @Override
   public void onRun() throws IOException {
-    if (!TextSecurePreferences.isPushRegistered(context)) {
+    if (!TextSecurePreferences.isPushRegistered(context) || TextSecurePreferences.getLocalNumber(context) == null) {
       Log.w(TAG, "Not yet registered. Skipping.");
       return;
     }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/SmsReceiveJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/SmsReceiveJob.java
index 4b3afcdee7..08c9803db2 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/SmsReceiveJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/SmsReceiveJob.java
@@ -170,6 +170,6 @@ public class SmsReceiveJob extends BaseJob {
     }
   }
 
-  private class NotReadyException extends RuntimeException {
+  private static class NotReadyException extends RuntimeException {
   }
 }