From a0e787e42444df14fb0c0313c7edc76ec512a0be Mon Sep 17 00:00:00 2001 From: Greyson Parrelli Date: Mon, 26 Apr 2021 16:22:00 -0400 Subject: [PATCH] Disable additional storage service validations for internal users. --- .../org/thoughtcrime/securesms/jobs/StorageSyncJobV2.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/StorageSyncJobV2.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/StorageSyncJobV2.java index e7e332c53e..51ec9b22d0 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/StorageSyncJobV2.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/StorageSyncJobV2.java @@ -217,7 +217,7 @@ public class StorageSyncJobV2 extends BaseJob { boolean needsMultiDeviceSync = false; boolean needsForcePush = false; long localManifestVersion = TextSecurePreferences.getStorageManifestVersion(context); - Optional remoteManifest = FeatureFlags.internalUser() ? accountManager.getStorageManifest(storageServiceKey) : accountManager.getStorageManifestIfDifferentVersion(storageServiceKey, localManifestVersion); + Optional remoteManifest = accountManager.getStorageManifestIfDifferentVersion(storageServiceKey, localManifestVersion); long remoteManifestVersion = remoteManifest.transform(SignalStorageManifest::getVersion).or(localManifestVersion); stopwatch.split("remote-manifest"); @@ -395,7 +395,7 @@ public class StorageSyncJobV2 extends BaseJob { throw new AssertionError("Decided there were local writes, but our write result was empty!"); } - StorageSyncValidations.validate(localWrite, FeatureFlags.internalUser() ? remoteManifest : Optional.absent(), needsForcePush, self); + StorageSyncValidations.validate(localWrite, Optional.absent(), needsForcePush, self); Optional conflict = accountManager.writeStorageRecords(storageServiceKey, localWrite.getManifest(), localWrite.getInserts(), localWrite.getDeletes());