empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Skip new validations in old storage sync job.

Browse source
This commit is contained in:
Greyson Parrelli 2021-04-15 09:54:18 -04:00
parent 60690208de
commit c86ee33371
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/org/thoughtcrime/securesms/jobs/StorageSyncJob.java
View file

@ -192,7 +192,7 @@ public class StorageSyncJob extends BaseJob {
needsForcePush = true; needsForcePush = true;
} }
StorageSyncValidations.validate(writeOperationResult, remoteManifest, needsForcePush); StorageSyncValidations.validate(writeOperationResult, Optional.absent(), needsForcePush);
Log.i(TAG, "[Remote Newer] MergeResult :: " + mergeResult); 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())); 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(); WriteOperationResult localWrite = localWriteResult.get().getWriteResult();
StorageSyncValidations.validate(localWrite, remoteManifest, needsForcePush); StorageSyncValidations.validate(localWrite, Optional.absent(), needsForcePush);
Log.i(TAG, "[Local Changes] WriteOperationResult :: " + localWrite); Log.i(TAG, "[Local Changes] WriteOperationResult :: " + localWrite);