Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Signal-Android
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
GitHub Mirror
Signal
Signal-Android
Commits
c86ee333
Commit
c86ee333
authored
4 years ago
by
Greyson Parrelli
Browse files
Options
Downloads
Patches
Plain Diff
Skip new validations in old storage sync job.
parent
60690208
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
app/src/main/java/org/thoughtcrime/securesms/jobs/StorageSyncJob.java
+2
-2
2 additions, 2 deletions
.../java/org/thoughtcrime/securesms/jobs/StorageSyncJob.java
with
2 additions
and
2 deletions
app/src/main/java/org/thoughtcrime/securesms/jobs/StorageSyncJob.java
+
2
−
2
View file @
c86ee333
...
...
@@ -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
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment