Store your own PNI.

app/src/main/java/org/thoughtcrime/securesms/migrations/ApplicationMigrations.java

@@ -91,9 +91,10 @@ public class ApplicationMigrations {
     static final int DEFAULT_REACTIONS_SYNC        = 47;
     static final int DB_REACTIONS_MIGRATION        = 48;
     //static final int CHANGE_NUMBER_CAPABILITY_3  = 49;
+    static final int PNI                           = 50;
   }
 
-  public static final int CURRENT_VERSION = 49;
+  public static final int CURRENT_VERSION = 50;
 
   /**
    * This *must* be called after the {@link JobManager} has been instantiated, but *before* the call
@@ -395,6 +396,10 @@ public class ApplicationMigrations {
       jobs.put(Version.DB_REACTIONS_MIGRATION, new DatabaseMigrationJob());
     }
 
+    if (lastSeenVersion < Version.PNI) {
+      jobs.put(Version.PNI, new PniMigrationJob());
+    }
+
     return jobs;
   }
 

app/src/main/java/org/thoughtcrime/securesms/migrations/PniMigrationJob.java

@@ -0,0 +1,74 @@
+package org.thoughtcrime.securesms.migrations;
+
+import androidx.annotation.NonNull;
+
+import org.signal.core.util.logging.Log;
+import org.thoughtcrime.securesms.database.SignalDatabase;
+import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.jobmanager.Data;
+import org.thoughtcrime.securesms.jobmanager.Job;
+import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint;
+import org.thoughtcrime.securesms.keyvalue.SignalStore;
+import org.thoughtcrime.securesms.recipients.Recipient;
+import org.thoughtcrime.securesms.recipients.RecipientId;
+import org.whispersystems.signalservice.api.push.PNI;
+
+import java.io.IOException;
+
+/**
+ * Migration to fetch our own PNI from the service.
+ */
+public class PniMigrationJob extends MigrationJob {
+
+  public static final String KEY = "PniMigrationJob";
+
+  private static final String TAG = Log.tag(PniMigrationJob.class);
+
+  PniMigrationJob() {
+    this(new Parameters.Builder().addConstraint(NetworkConstraint.KEY).build());
+  }
+
+  private PniMigrationJob(@NonNull Parameters parameters) {
+    super(parameters);
+  }
+
+  @Override
+  public @NonNull String getFactoryKey() {
+    return KEY;
+  }
+
+  @Override
+  boolean isUiBlocking() {
+    return false;
+  }
+
+  @Override
+  void performMigration() throws Exception {
+    if (!SignalStore.account().isRegistered() || SignalStore.account().getAci() == null) {
+      Log.w(TAG, "Not registered! Skipping migration, as it wouldn't do anything.");
+      return;
+    }
+
+    RecipientId self = Recipient.self().getId();
+    PNI         pni  = PNI.parseOrNull(ApplicationDependencies.getSignalServiceAccountManager().getWhoAmI().getPni());
+
+    if (pni == null) {
+      throw new IOException("Invalid PNI!");
+    }
+
+    SignalDatabase.recipients().setPni(self, pni);
+    SignalStore.account().setPni(pni);
+  }
+
+  @Override
+  boolean shouldRetry(@NonNull Exception e) {
+    return e instanceof IOException;
+  }
+
+  public static class Factory implements Job.Factory<PniMigrationJob> {
+    @Override
+    public @NonNull PniMigrationJob create(@NonNull Parameters parameters, @NonNull Data data) {
+      return new PniMigrationJob(parameters);
+    }
+  }
+}

app/src/main/java/org/thoughtcrime/securesms/migrations/UuidMigrationJob.java

@@ -71,7 +71,11 @@ public class UuidMigrationJob extends MigrationJob {
 
   private static void fetchOwnUuid(@NonNull Context context) throws IOException {
     RecipientId self      = Recipient.self().getId();
-    ACI         localUuid = ApplicationDependencies.getSignalServiceAccountManager().getOwnAci();
+    ACI         localUuid = ACI.parseOrNull(ApplicationDependencies.getSignalServiceAccountManager().getWhoAmI().getAci());
+
+    if (localUuid == null) {
+      throw new IOException("Invalid UUID!");
+    }
 
     SignalDatabase.recipients().markRegisteredOrThrow(self, localUuid);
     SignalStore.account().setAci(localUuid);