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

Auto-dismiss PIN reminder dialog as you type.

Browse source
This commit is contained in:
Greyson Parrelli 2020-05-26 18:13:19 -04:00
parent f1233bfddc
commit 1268b26c1f
1 changed files with 15 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
app/src/main/java/org/thoughtcrime/securesms/lock/SignalPinReminderDialog.java
View file

@ -39,11 +39,17 @@ import org.thoughtcrime.securesms.util.ServiceUtil;
import org.thoughtcrime.securesms.util.TextSecurePreferences; import org.thoughtcrime.securesms.util.TextSecurePreferences;
import org.thoughtcrime.securesms.util.ThemeUtil; import org.thoughtcrime.securesms.util.ThemeUtil;
import java.util.Objects;
public final class SignalPinReminderDialog { public final class SignalPinReminderDialog {
private static final String TAG = Log.tag(SignalPinReminderDialog.class); private static final String TAG = Log.tag(SignalPinReminderDialog.class);
public static void show(@NonNull Context context, @NonNull Launcher launcher, @NonNull Callback mainCallback) { public static void show(@NonNull Context context, @NonNull Launcher launcher, @NonNull Callback mainCallback) {
if (!SignalStore.kbsValues().hasPin()) {
throw new AssertionError("Must have a PIN!");
}
Log.i(TAG, "Showing PIN reminder dialog."); Log.i(TAG, "Showing PIN reminder dialog.");
AlertDialog dialog = new AlertDialog.Builder(context, ThemeUtil.isDarkTheme(context) ? R.style.Theme_Signal_AlertDialog_Dark_Cornered_ColoredAccent : R.style.Theme_Signal_AlertDialog_Light_Cornered_ColoredAccent) AlertDialog dialog = new AlertDialog.Builder(context, ThemeUtil.isDarkTheme(context) ? R.style.Theme_Signal_AlertDialog_Dark_Cornered_ColoredAccent : R.style.Theme_Signal_AlertDialog_Light_Cornered_ColoredAccent)
@ -99,8 +105,7 @@ public final class SignalPinReminderDialog {
reminder.setMovementMethod(LinkMovementMethod.getInstance()); reminder.setMovementMethod(LinkMovementMethod.getInstance());
PinVerifier.Callback callback = getPinWatcherCallback(context, dialog, pinEditText, pinStatus, mainCallback); PinVerifier.Callback callback = getPinWatcherCallback(context, dialog, pinEditText, pinStatus, mainCallback);
PinVerifier verifier = SignalStore.kbsValues().hasPin() ? new V2PinVerifier() PinVerifier verifier = new V2PinVerifier();
: new V1PinVerifier(context);
skip.setOnClickListener(v -> { skip.setOnClickListener(v -> {
dialog.dismiss(); dialog.dismiss();
@ -115,10 +120,18 @@ public final class SignalPinReminderDialog {
}); });
pinEditText.addTextChangedListener(new SimpleTextWatcher() { pinEditText.addTextChangedListener(new SimpleTextWatcher() {
private final String localHash = Objects.requireNonNull(SignalStore.kbsValues().getLocalPinHash());
@Override @Override
public void onTextChanged(String text) { public void onTextChanged(String text) {
if (text.length() >= KbsConstants.MINIMUM_PIN_LENGTH) { if (text.length() >= KbsConstants.MINIMUM_PIN_LENGTH) {
submit.setEnabled(true); submit.setEnabled(true);
if (PinHashing.verifyLocalPinHash(localHash, text)) {
dialog.dismiss();
mainCallback.onReminderCompleted(callback.hadWrongGuess());
}
} else { } else {
submit.setEnabled(false); submit.setEnabled(false);
} }
@ -157,28 +170,6 @@ public final class SignalPinReminderDialog {
}; };
} }
private static final class V1PinVerifier implements PinVerifier {
private final String pinInPreferences;
private V1PinVerifier(@NonNull Context context) {
//noinspection deprecation Acceptable to check the old pin in a reminder on a non-migrated system.
this.pinInPreferences = TextSecurePreferences.getDeprecatedV1RegistrationLockPin(context);
}
@Override
public void verifyPin(@Nullable String pin, @NonNull Callback callback) {
if (pin != null && pin.replace(" ", "").equals(pinInPreferences)) {
callback.onPinCorrect();
Log.i(TAG, "Pin V1 successfully remembered, scheduling a migration to V2");
ApplicationDependencies.getJobManager().add(new RegistrationPinV2MigrationJob());
} else {
callback.onPinWrong();
}
}
}
private static final class V2PinVerifier implements PinVerifier { private static final class V2PinVerifier implements PinVerifier {
private final String localPinHash; private final String localPinHash;