From 3f81a9417644b3f3cc4c19e8af330dc2d2fd55a6 Mon Sep 17 00:00:00 2001 From: Greyson Parrelli Date: Fri, 10 Feb 2023 15:44:18 -0500 Subject: [PATCH] Fix case where we were performing remote inserts. --- .../thoughtcrime/securesms/jobs/StorageForcePushJob.java | 6 +++--- .../org/thoughtcrime/securesms/jobs/StorageSyncJob.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/StorageForcePushJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/StorageForcePushJob.java index 96db300eb..177cef625 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/StorageForcePushJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/StorageForcePushJob.java @@ -88,8 +88,8 @@ public class StorageForcePushJob extends BaseJob { StorageKey storageServiceKey = SignalStore.storageService().getOrCreateStorageKey(); SignalServiceAccountManager accountManager = ApplicationDependencies.getSignalServiceAccountManager(); - RecipientTable recipientTable = SignalDatabase.recipients(); - UnknownStorageIdTable storageIdDatabase = SignalDatabase.unknownStorageIds(); + RecipientTable recipientTable = SignalDatabase.recipients(); + UnknownStorageIdTable storageIdTable = SignalDatabase.unknownStorageIds(); long currentVersion = accountManager.getStorageManifestVersion(); Map oldContactStorageIds = recipientTable.getContactStorageSyncIdsMap(); @@ -134,7 +134,7 @@ public class StorageForcePushJob extends BaseJob { SignalStore.storageService().setManifest(manifest); recipientTable.applyStorageIdUpdates(newContactStorageIds); recipientTable.applyStorageIdUpdates(Collections.singletonMap(Recipient.self().getId(), accountRecord.getId())); - storageIdDatabase.deleteAll(); + storageIdTable.deleteAll(); } @Override diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/StorageSyncJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/StorageSyncJob.java index 27899880d..b019c9dce 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/StorageSyncJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/StorageSyncJob.java @@ -331,7 +331,7 @@ public class StorageSyncJob extends BaseJob { Log.i(TAG, "Removed " + removedUnregistered + " recipients from storage service that have been unregistered for longer than 30 days."); } - List localStorageIds = getAllLocalStorageIds(self); + List localStorageIds = getAllLocalStorageIds(self).stream().filter(it -> !it.isUnknown()).collect(Collectors.toList()); IdDifferenceResult idDifference = StorageSyncHelper.findIdDifference(remoteManifest.getStorageIds(), localStorageIds); List remoteInserts = buildLocalStorageRecords(context, self, idDifference.getLocalOnlyIds()); List remoteDeletes = Stream.of(idDifference.getRemoteOnlyIds()).map(StorageId::getRaw).toList();