From c86ee333710974c1ddadbdd5cfd511583acb4090 Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Thu, 15 Apr 2021 09:54:18 -0400
Subject: [PATCH] Skip new validations in old storage sync job.
---
.../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 3a394c01de..cff952758b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/StorageSyncJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/StorageSyncJob.java
@@ -192,7 +192,7 @@ public class StorageSyncJob extends BaseJob {
needsForcePush = true;
}
- StorageSyncValidations.validate(writeOperationResult, remoteManifest, needsForcePush);
+ StorageSyncValidations.validate(writeOperationResult, Optional.absent(), needsForcePush);
Log.i(TAG, "[Remote Newer] MergeResult :: " + mergeResult);
@@ -256,7 +256,7 @@ public class StorageSyncJob extends BaseJob {
Log.i(TAG, String.format(Locale.ENGLISH, "[Local Changes] Local changes present. %d updates, %d inserts, %d deletes, account update: %b, account insert: %b.", pendingUpdates.size(), pendingInsertions.size(), pendingDeletions.size(), pendingAccountUpdate.isPresent(), pendingAccountInsert.isPresent()));
WriteOperationResult localWrite = localWriteResult.get().getWriteResult();
- StorageSyncValidations.validate(localWrite, remoteManifest, needsForcePush);
+ StorageSyncValidations.validate(localWrite, Optional.absent(), needsForcePush);
Log.i(TAG, "[Local Changes] WriteOperationResult :: " + localWrite);
--
GitLab