mirror
/
Signal-Android
kopia lustrzana https://github.com/ryukoposting/Signal-Android
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Disable additional storage service validations for internal users.

fork-5.53.8
Greyson Parrelli 2021-04-26 16:22:00 -04:00 zatwierdzone przez Cody Henthorne
rodzic c9d1fb8533
commit a0e787e424
1 zmienionych plików z 2 dodań i 2 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

4
app/src/main/java/org/thoughtcrime/securesms/jobs/StorageSyncJobV2.java
Wyświetl plik

@ -217,7 +217,7 @@ public class StorageSyncJobV2 extends BaseJob {
boolean needsMultiDeviceSync = false;
boolean needsForcePush = false;
long localManifestVersion = TextSecurePreferences.getStorageManifestVersion(context);
Optional<SignalStorageManifest> remoteManifest = FeatureFlags.internalUser() ? accountManager.getStorageManifest(storageServiceKey) : accountManager.getStorageManifestIfDifferentVersion(storageServiceKey, localManifestVersion);
Optional<SignalStorageManifest> 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<SignalStorageManifest> conflict = accountManager.writeStorageRecords(storageServiceKey, localWrite.getManifest(), localWrite.getInserts(), localWrite.getDeletes());