Prevent some crash loops.

signalapp · Apr 24, 2020 · 5193a5d · 5193a5d
1 parent 7db288b
commit 5193a5d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 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
@@ -100,6 +100,10 @@ public void onAdded() {
 
   @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 static final class Factory implements Job.Factory<MmsDownloadJob> {
                                 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
@@ -49,7 +49,7 @@ private RefreshAttributesJob(@NonNull Job.Parameters parameters) {
 
   @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
@@ -170,6 +170,6 @@ public static final class Factory implements Job.Factory<SmsReceiveJob> {
     }
   }
 
-  private class NotReadyException extends RuntimeException {
+  private static class NotReadyException extends RuntimeException {
   }
 }