From e81a1840560e302e75817f4b33297e460eeb002e Mon Sep 17 00:00:00 2001 From: Konrad Moesch Date: Sun, 3 Dec 2023 12:20:43 +0100 Subject: [PATCH 1/2] modify dialog lifecycle logic to be able to use autofill --- .../keychain/ui/PassphraseDialogActivity.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java index 0f58c8d06..7a90de557 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java @@ -129,6 +129,9 @@ public class PassphraseDialogActivity extends FragmentActivity { finish(); } + PassphraseDialogFragment frag = new PassphraseDialogFragment(); + frag.setArguments(getIntent().getExtras()); + frag.show(getSupportFragmentManager(), "passphraseDialog"); } @Override @@ -139,9 +142,9 @@ public class PassphraseDialogActivity extends FragmentActivity { * encryption. Based on mSecretKeyId it asks for a passphrase to open a private key or it asks * for a symmetric passphrase */ - PassphraseDialogFragment frag = new PassphraseDialogFragment(); + /*PassphraseDialogFragment frag = new PassphraseDialogFragment(); frag.setArguments(getIntent().getExtras()); - frag.show(getSupportFragmentManager(), "passphraseDialog"); + frag.show(getSupportFragmentManager(), "passphraseDialog");*/ } @Override @@ -149,9 +152,9 @@ public class PassphraseDialogActivity extends FragmentActivity { super.onPause(); DialogFragment dialog = (DialogFragment) getSupportFragmentManager().findFragmentByTag("passphraseDialog"); - if (dialog != null) { + /*if (dialog != null) { dialog.dismiss(); - } + }*/ } public static class PassphraseDialogFragment extends DialogFragment implements TextView.OnEditorActionListener { From 892dafb190a7b9fb98eb5563fba41c42c7e02d92 Mon Sep 17 00:00:00 2001 From: Konrad Moesch Date: Sun, 3 Dec 2023 12:36:34 +0100 Subject: [PATCH 2/2] Remove commented code --- .../keychain/ui/PassphraseDialogActivity.java | 23 ------------------- 1 file changed, 23 deletions(-) diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java index 7a90de557..24c431436 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java @@ -134,29 +134,6 @@ public class PassphraseDialogActivity extends FragmentActivity { frag.show(getSupportFragmentManager(), "passphraseDialog"); } - @Override - protected void onResumeFragments() { - super.onResumeFragments(); - - /* Show passphrase dialog to cache a new passphrase the user enters for using it later for - * encryption. Based on mSecretKeyId it asks for a passphrase to open a private key or it asks - * for a symmetric passphrase - */ - /*PassphraseDialogFragment frag = new PassphraseDialogFragment(); - frag.setArguments(getIntent().getExtras()); - frag.show(getSupportFragmentManager(), "passphraseDialog");*/ - } - - @Override - protected void onPause() { - super.onPause(); - - DialogFragment dialog = (DialogFragment) getSupportFragmentManager().findFragmentByTag("passphraseDialog"); - /*if (dialog != null) { - dialog.dismiss(); - }*/ - } - public static class PassphraseDialogFragment extends DialogFragment implements TextView.OnEditorActionListener { private EditText mPassphraseEditText; private TextView mPassphraseText;