diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2013-09-08 18:30:22 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2013-09-08 18:30:22 +0200 |
| commit | 11103623c5e2508153a7f3d0c3f521b2768c0387 (patch) | |
| tree | 0d1ca0225f00e79bb9f093f9c8f883c380d8d53c /OpenPGP-Keychain/src | |
| parent | 03d9afffce3f12d51311cb697fc19df200196355 (diff) | |
| download | open-keychain-11103623c5e2508153a7f3d0c3f521b2768c0387.tar.gz open-keychain-11103623c5e2508153a7f3d0c3f521b2768c0387.tar.bz2 open-keychain-11103623c5e2508153a7f3d0c3f521b2768c0387.zip | |
api: handle passphrase entering correctly
Diffstat (limited to 'OpenPGP-Keychain/src')
2 files changed, 16 insertions, 7 deletions
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/CryptoServiceActivity.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/CryptoServiceActivity.java index 9487a34c5..2ea3f530a 100644 --- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/CryptoServiceActivity.java +++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/CryptoServiceActivity.java @@ -161,7 +161,7 @@ public class CryptoServiceActivity extends SherlockFragmentActivity { try { mServiceCallback.onRegistered(true, packageName); } catch (RemoteException e) { - Log.e(Constants.TAG, "ServiceActivity"); + Log.e(Constants.TAG, "ServiceActivity", e); } finish(); } @@ -174,7 +174,7 @@ public class CryptoServiceActivity extends SherlockFragmentActivity { try { mServiceCallback.onRegistered(false, packageName); } catch (RemoteException e) { - Log.e(Constants.TAG, "ServiceActivity"); + Log.e(Constants.TAG, "ServiceActivity", e); } finish(); } @@ -205,7 +205,7 @@ public class CryptoServiceActivity extends SherlockFragmentActivity { mServiceCallback.onSelectedPublicKeys(mSelectFragment .getSelectedMasterKeyIds()); } catch (RemoteException e) { - Log.e(Constants.TAG, "ServiceActivity"); + Log.e(Constants.TAG, "ServiceActivity", e); } finish(); } @@ -219,7 +219,7 @@ public class CryptoServiceActivity extends SherlockFragmentActivity { mServiceCallback.onSelectedPublicKeys(mSelectFragment .getSelectedMasterKeyIds()); } catch (RemoteException e) { - Log.e(Constants.TAG, "ServiceActivity"); + Log.e(Constants.TAG, "ServiceActivity", e); } finish(); } @@ -266,14 +266,14 @@ public class CryptoServiceActivity extends SherlockFragmentActivity { try { mServiceCallback.onCachedPassphrase(true); } catch (RemoteException e) { - Log.e(Constants.TAG, "ServiceActivity"); + Log.e(Constants.TAG, "ServiceActivity", e); } finish(); } else { try { mServiceCallback.onCachedPassphrase(false); } catch (RemoteException e) { - Log.e(Constants.TAG, "ServiceActivity"); + Log.e(Constants.TAG, "ServiceActivity", e); } finish(); } diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/dialog/PassphraseDialogFragment.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/dialog/PassphraseDialogFragment.java index cbb663f15..80b6e5834 100644 --- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/dialog/PassphraseDialogFragment.java +++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/dialog/PassphraseDialogFragment.java @@ -60,6 +60,7 @@ public class PassphraseDialogFragment extends DialogFragment implements OnEditor private static final String ARG_SECRET_KEY_ID = "secret_key_id"; public static final int MESSAGE_OKAY = 1; + public static final int MESSAGE_CANCEL = 2; private Messenger mMessenger; private EditText mPassphraseEditText; @@ -215,7 +216,7 @@ public class PassphraseDialogFragment extends DialogFragment implements OnEditor @Override public void onClick(DialogInterface dialog, int id) { - dismiss(); + dialog.cancel(); } }); @@ -235,6 +236,14 @@ public class PassphraseDialogFragment extends DialogFragment implements OnEditor } } + @Override + public void onCancel(DialogInterface dialog) { + super.onCancel(dialog); + + dismiss(); + sendMessageToHandler(MESSAGE_CANCEL); + } + /** * Associate the "done" button on the soft keyboard with the okay button in the view */ |