From 71507838486041fbd52f507c8f36f42e693a0441 Mon Sep 17 00:00:00 2001 From: Alex Hart Date: Thu, 14 Dec 2023 14:58:20 -0400 Subject: [PATCH] Revert "Fix case where we delete unknown remote records. " This reverts commit ab29d194bb677ac51c2ad225e894e37f10cf6599. --- .../java/org/thoughtcrime/securesms/jobs/StorageSyncJob.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 cadb9f69f6..583a5fe21d 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/StorageSyncJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/StorageSyncJob.java @@ -331,9 +331,9 @@ 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().stream().filter(it -> !it.isUnknown()).collect(Collectors.toList())); + List remoteInserts = buildLocalStorageRecords(context, self, idDifference.getLocalOnlyIds()); List remoteDeletes = Stream.of(idDifference.getRemoteOnlyIds()).map(StorageId::getRaw).toList(); Log.i(TAG, "ID Difference :: " + idDifference);