From 6cd5100530dd23e045a9a047b624706c4cb8007f Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Thu, 21 Nov 2019 13:24:54 -0500
Subject: [PATCH] Ensure Recipient.self() is available.

---
 .../securesms/migrations/UuidMigrationJob.java           | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/org/thoughtcrime/securesms/migrations/UuidMigrationJob.java b/src/org/thoughtcrime/securesms/migrations/UuidMigrationJob.java
index 1ee62307ff..a01f4de347 100644
--- a/src/org/thoughtcrime/securesms/migrations/UuidMigrationJob.java
+++ b/src/org/thoughtcrime/securesms/migrations/UuidMigrationJob.java
@@ -5,9 +5,7 @@ import android.text.TextUtils;
 
 import androidx.annotation.NonNull;
 
-import org.thoughtcrime.securesms.contacts.sync.DirectoryHelper;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
-import org.thoughtcrime.securesms.database.RecipientDatabase;
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
 import org.thoughtcrime.securesms.jobmanager.Data;
 import org.thoughtcrime.securesms.jobmanager.Job;
@@ -57,7 +55,8 @@ public class UuidMigrationJob extends MigrationJob {
       Log.w(TAG, "Not registered! Skipping migration, as it wouldn't do anything.");
       return;
     }
-    
+
+    ensureSelfRecipientExists(context);
     fetchOwnUuid(context);
     rotateSealedSenderCerts(context);
   }
@@ -67,6 +66,10 @@ public class UuidMigrationJob extends MigrationJob {
     return e instanceof IOException;
   }
 
+  private static void ensureSelfRecipientExists(@NonNull Context context) {
+    DatabaseFactory.getRecipientDatabase(context).getOrInsertFromE164(TextSecurePreferences.getLocalNumber(context));
+  }
+
   private static void fetchOwnUuid(@NonNull Context context) throws IOException {
     RecipientId self      = Recipient.self().getId();
     UUID        localUuid = ApplicationDependencies.getSignalServiceAccountManager().getOwnUuid();