luckyimnotanigger/Aegis
1
0
Fork 0
mirror of https://github.com/beemdevelopment/Aegis.git synced 2025-05-14 14:02:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Add support for predictive back gesture

Browse source
This commit is contained in:
Alexander Bakker 2022-10-10 22:32:30 +02:00
parent c6888b11df
commit ad77bd687f
15 changed files with 395 additions and 212 deletions
Download patch file Download diff file Expand all files Collapse all files

25
app/src/main/java/com/beemdevelopment/aegis/ui/AuthActivity.java
View file

@ -19,6 +19,7 @@ import android.widget.PopupWindow;
import android.widget.TextView;
import android.widget.Toast;
import androidx.activity.OnBackPressedCallback;
import androidx.annotation.NonNull;
import androidx.appcompat.app.AlertDialog;
import androidx.biometric.BiometricPrompt;
@ -76,6 +77,8 @@ public class AuthActivity extends AegisActivity {
Button decryptButton = findViewById(R.id.button_decrypt);
TextView biometricsButton = findViewById(R.id.button_biometrics);
getOnBackPressedDispatcher().addCallback(this, new BackPressHandler());
_textPassword.setOnEditorActionListener((v, actionId, event) -> {
if ((event != null && (event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) || (actionId == EditorInfo.IME_ACTION_DONE)) {
decryptButton.performClick();
@ -102,7 +105,9 @@ public class AuthActivity extends AegisActivity {
}
if (_vaultManager.getVaultFileError() != null) {
Dialogs.showErrorDialog(this, R.string.vault_load_error, _vaultManager.getVaultFileError(), (dialog, which) -> onBackPressed());
Dialogs.showErrorDialog(this, R.string.vault_load_error, _vaultManager.getVaultFileError(), (dialog, which) -> {
getOnBackPressedDispatcher().onBackPressed();
});
return;
}
@ -179,11 +184,6 @@ public class AuthActivity extends AegisActivity {
imm.toggleSoftInput(InputMethodManager.SHOW_FORCED, 0);
}
@Override
public void onBackPressed() {
finishAffinity();
}
@Override
public void onResume() {
super.onResume();
@ -301,6 +301,19 @@ public class AuthActivity extends AegisActivity {
}
}
private class BackPressHandler extends OnBackPressedCallback {
public BackPressHandler() {
super(true);
}
@Override
public void handleOnBackPressed() {
// This breaks predictive back gestures, but it doesn't make sense
// to go back to MainActivity when cancelling auth
finishAffinity();
}
}
private class PasswordDerivationListener implements PasswordSlotDecryptTask.Callback {
@Override
public void onTaskFinished(PasswordSlotDecryptTask.Result result) {