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

Always get the storage manifest for internal users.

Browse source 
This will hopefully help us track down some of the validation issues
when writing local changes.
This commit is contained in:
Greyson Parrelli 2021-04-21 11:12:03 -04:00
parent 281630e751
commit b4d0dde129
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/StorageSyncJobV2.java
View file

@ -217,7 +217,7 @@ public class StorageSyncJobV2 extends BaseJob {
boolean needsMultiDeviceSync = false;
boolean needsForcePush = false;
long localManifestVersion = TextSecurePreferences.getStorageManifestVersion(context);
Optional<SignalStorageManifest> remoteManifest = accountManager.getStorageManifestIfDifferentVersion(storageServiceKey, localManifestVersion);
Optional<SignalStorageManifest> remoteManifest = FeatureFlags.internalUser() ? accountManager.getStorageManifest(storageServiceKey) : accountManager.getStorageManifestIfDifferentVersion(storageServiceKey, localManifestVersion);
long remoteManifestVersion = remoteManifest.transform(SignalStorageManifest::getVersion).or(localManifestVersion);
stopwatch.split("remote-manifest");
@ -347,7 +347,7 @@ public class StorageSyncJobV2 extends BaseJob {
Log.i(TAG, "[Remote Sync] Updating local manifest version to: " + remoteManifest.get().getVersion());
TextSecurePreferences.setStorageManifestVersion(context, remoteManifest.get().getVersion());
}
} else if (remoteManifest.isPresent()) {
} else if (remoteManifest.isPresent() && remoteManifestVersion < localManifestVersion) {
Log.w(TAG, "[Remote Sync] Remote version was older. User might have switched accounts. Making our version match.");
TextSecurePreferences.setStorageManifestVersion(context, remoteManifestVersion);
}