Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-24 02:39:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Strongly type UUIDs as ACIs.

Browse Source
This commit is contained in:
Greyson Parrelli
2021-10-28 15:39:36 -04:00
parent 6c7d837964
commit 5bb48caafd
120 changed files with 1020 additions and 947 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/thoughtcrime/securesms/migrations/AccountRecordMigrationJob.java
View File

@@ -41,7 +41,7 @@ public class AccountRecordMigrationJob extends MigrationJob {
@Override
public void performMigration() {
if (!TextSecurePreferences.isPushRegistered(context) || TextSecurePreferences.getLocalUuid(context) == null) {
if (!TextSecurePreferences.isPushRegistered(context) || TextSecurePreferences.getLocalAci(context) == null) {
Log.w(TAG, "Not registered!");
return;
}

4
app/src/main/java/org/thoughtcrime/securesms/migrations/ApplyUnknownFieldsToSelfMigrationJob.java
View File

@@ -7,10 +7,8 @@ import com.google.protobuf.InvalidProtocolBufferException;
import org.signal.core.util.logging.Log;
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;
import org.thoughtcrime.securesms.jobs.StorageSyncJob;
import org.thoughtcrime.securesms.recipients.Recipient;
import org.thoughtcrime.securesms.storage.StorageSyncHelper;
import org.thoughtcrime.securesms.util.TextSecurePreferences;
@@ -47,7 +45,7 @@ public class ApplyUnknownFieldsToSelfMigrationJob extends MigrationJob {
@Override
public void performMigration() {
if (!TextSecurePreferences.isPushRegistered(context) || TextSecurePreferences.getLocalUuid(context) == null) {
if (!TextSecurePreferences.isPushRegistered(context) || TextSecurePreferences.getLocalAci(context) == null) {
Log.w(TAG, "Not registered!");
return;
}

2
app/src/main/java/org/thoughtcrime/securesms/migrations/DirectoryRefreshMigrationJob.java
View File

@@ -42,7 +42,7 @@ public final class DirectoryRefreshMigrationJob extends MigrationJob {
public void performMigration() throws IOException {
if (!TextSecurePreferences.isPushRegistered(context) ||
!SignalStore.registrationValues().isRegistrationComplete() ||
TextSecurePreferences.getLocalUuid(context) == null)
TextSecurePreferences.getLocalAci(context) == null)
{
Log.w(TAG, "Not registered! Skipping.");
return;

2
app/src/main/java/org/thoughtcrime/securesms/migrations/StorageServiceMigrationJob.java
View File

@@ -42,7 +42,7 @@ public class StorageServiceMigrationJob extends MigrationJob {
@Override
public void performMigration() {
if (TextSecurePreferences.getLocalUuid(context) == null) {
if (TextSecurePreferences.getLocalAci(context) == null) {
Log.w(TAG, "Self not yet available.");
return;
}

2
app/src/main/java/org/thoughtcrime/securesms/migrations/UserNotificationMigrationJob.java
View File

@@ -58,7 +58,7 @@ public class UserNotificationMigrationJob extends MigrationJob {
void performMigration() {
if (!TextSecurePreferences.isPushRegistered(context) ||
TextSecurePreferences.getLocalNumber(context) == null ||
TextSecurePreferences.getLocalUuid(context) == null)
TextSecurePreferences.getLocalAci(context) == null)
{
Log.w(TAG, "Not registered! Skipping.");
return;

5
app/src/main/java/org/thoughtcrime/securesms/migrations/UuidMigrationJob.java
View File

@@ -14,6 +14,7 @@ import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint;
import org.thoughtcrime.securesms.recipients.Recipient;
import org.thoughtcrime.securesms.recipients.RecipientId;
import org.thoughtcrime.securesms.util.TextSecurePreferences;
import org.whispersystems.signalservice.api.push.ACI;
import java.io.IOException;
import java.util.UUID;
@@ -70,10 +71,10 @@ public class UuidMigrationJob extends MigrationJob {
private static void fetchOwnUuid(@NonNull Context context) throws IOException {
RecipientId self = Recipient.self().getId();
UUID localUuid = ApplicationDependencies.getSignalServiceAccountManager().getOwnUuid();
ACI localUuid = ApplicationDependencies.getSignalServiceAccountManager().getOwnAci();
DatabaseFactory.getRecipientDatabase(context).markRegisteredOrThrow(self, localUuid);
TextSecurePreferences.setLocalUuid(context, localUuid);
TextSecurePreferences.setLocalAci(context, localUuid);
}
public static class Factory implements Job.Factory<UuidMigrationJob> {