Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-19 08:09:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Further simplify storage service syncing.

Browse Source
This commit is contained in:
Greyson Parrelli
2021-04-28 10:57:25 -04:00
committed by Alex Hart
parent 1493581a4d
commit cdc7f1565e
18 changed files with 261 additions and 507 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/thoughtcrime/securesms/pin/PinRestoreViewModel.java
View File

@@ -51,7 +51,7 @@ public class PinRestoreViewModel extends ViewModel {
switch (result.getResult()) {
case SUCCESS:
SignalStore.pinValues().setKeyboardType(pinKeyboardType);
SignalStore.storageServiceValues().setNeedsAccountRestore(false);
SignalStore.storageService().setNeedsAccountRestore(false);
event.postValue(Event.SUCCESS);
break;
case LOCKED:

6
app/src/main/java/org/thoughtcrime/securesms/pin/PinState.java
View File

@@ -126,7 +126,7 @@ public final class PinState {
Log.i(TAG, "Has a PIN to restore.");
SignalStore.kbsValues().clearRegistrationLockAndPin();
TextSecurePreferences.setV1RegistrationLockEnabled(context, false);
SignalStore.storageServiceValues().setNeedsAccountRestore(true);
SignalStore.storageService().setNeedsAccountRestore(true);
} else {
Log.i(TAG, "No registration lock or PIN at all.");
SignalStore.kbsValues().clearRegistrationLockAndPin();
@@ -145,7 +145,7 @@ public final class PinState {
SignalStore.kbsValues().setKbsMasterKey(kbsData, pin);
SignalStore.kbsValues().setV2RegistrationLockEnabled(false);
SignalStore.pinValues().resetPinReminders();
SignalStore.storageServiceValues().setNeedsAccountRestore(false);
SignalStore.storageService().setNeedsAccountRestore(false);
resetPinRetryCount(context, pin);
ClearFallbackKbsEnclaveJob.clearAll();
@@ -157,7 +157,7 @@ public final class PinState {
*/
public static synchronized void onPinRestoreForgottenOrSkipped() {
SignalStore.kbsValues().clearRegistrationLockAndPin();
SignalStore.storageServiceValues().setNeedsAccountRestore(false);
SignalStore.storageService().setNeedsAccountRestore(false);
updateState(buildInferredStateFromOtherFields());
}