diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-10-03 02:20:38 +0200 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-10-03 02:20:38 +0200 |
commit | ef7eab2c8bf7eda281849d66f201070f5e142304 (patch) | |
tree | bf21540073f932b9e6d5c083af7569ddb58f1d5c /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog | |
parent | b9dc21969faa7c4cd7b10638a629690d0df20cf4 (diff) | |
parent | 4b4e885e55f788bd2cf05f3c83f5a4bccb6cd0c0 (diff) | |
download | open-keychain-ef7eab2c8bf7eda281849d66f201070f5e142304.tar.gz open-keychain-ef7eab2c8bf7eda281849d66f201070f5e142304.tar.bz2 open-keychain-ef7eab2c8bf7eda281849d66f201070f5e142304.zip |
Merge branch 'master' of github.com:open-keychain/open-keychain
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog')
3 files changed, 16 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/AddUserIdDialogFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/AddUserIdDialogFragment.java index 27339a02f..3eef04aa7 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/AddUserIdDialogFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/AddUserIdDialogFragment.java @@ -206,6 +206,9 @@ public class AddUserIdDialogFragment extends DialogFragment implements OnEditorA } private void hideKeyboard() { + if (getActivity() == null) { + return; + } InputMethodManager inputManager = (InputMethodManager) getActivity() .getSystemService(Context.INPUT_METHOD_SERVICE); diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/PassphraseDialogFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/PassphraseDialogFragment.java index a89d4be1c..43f869f02 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/PassphraseDialogFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/PassphraseDialogFragment.java @@ -209,6 +209,10 @@ public class PassphraseDialogFragment extends DialogFragment implements OnEditor mPassphraseEditText.post(new Runnable() { @Override public void run() { + // The activity might already be gone! Nvm in that case. + if (getActivity() == null) { + return; + } InputMethodManager imm = (InputMethodManager) getActivity() .getSystemService(Context.INPUT_METHOD_SERVICE); imm.showSoftInput(mPassphraseEditText, InputMethodManager.SHOW_IMPLICIT); @@ -342,13 +346,18 @@ public class PassphraseDialogFragment extends DialogFragment implements OnEditor } private void hideKeyboard() { + // The activity which called the dialog might no longer exist. Nvm in that case... + if (getActivity() == null) { + return; + } InputMethodManager inputManager = (InputMethodManager) getActivity() .getSystemService(Context.INPUT_METHOD_SERVICE); //check if no view has focus: View v = getActivity().getCurrentFocus(); - if (v == null) + if (v == null) { return; + } inputManager.hideSoftInputFromWindow(v.getWindowToken(), 0); } diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/SetPassphraseDialogFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/SetPassphraseDialogFragment.java index 5e2bec0e9..a05719072 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/SetPassphraseDialogFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/SetPassphraseDialogFragment.java @@ -200,6 +200,9 @@ public class SetPassphraseDialogFragment extends DialogFragment implements OnEdi } private void hideKeyboard() { + if (getActivity() == null) { + return; + } InputMethodManager inputManager = (InputMethodManager) getActivity() .getSystemService(Context.INPUT_METHOD_SERVICE); |