empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Ensure Recipient.self() is available.

Browse source
This commit is contained in:
Greyson Parrelli 2019-11-21 13:24:54 -05:00
parent 115a408b0b
commit 6cd5100530
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/org/thoughtcrime/securesms/migrations/UuidMigrationJob.java
View file

@ -5,9 +5,7 @@ import android.text.TextUtils;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import org.thoughtcrime.securesms.contacts.sync.DirectoryHelper;
import org.thoughtcrime.securesms.database.DatabaseFactory; import org.thoughtcrime.securesms.database.DatabaseFactory;
import org.thoughtcrime.securesms.database.RecipientDatabase;
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies; import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
import org.thoughtcrime.securesms.jobmanager.Data; import org.thoughtcrime.securesms.jobmanager.Data;
import org.thoughtcrime.securesms.jobmanager.Job; import org.thoughtcrime.securesms.jobmanager.Job;
@ -58,6 +56,7 @@ public class UuidMigrationJob extends MigrationJob {
return; return;
} }
ensureSelfRecipientExists(context);
fetchOwnUuid(context); fetchOwnUuid(context);
rotateSealedSenderCerts(context); rotateSealedSenderCerts(context);
} }
@ -67,6 +66,10 @@ public class UuidMigrationJob extends MigrationJob {
return e instanceof IOException; 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 { private static void fetchOwnUuid(@NonNull Context context) throws IOException {
RecipientId self = Recipient.self().getId(); RecipientId self = Recipient.self().getId();
UUID localUuid = ApplicationDependencies.getSignalServiceAccountManager().getOwnUuid(); UUID localUuid = ApplicationDependencies.getSignalServiceAccountManager().getOwnUuid();