diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-07-03 15:24:04 +0200 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-07-03 15:24:04 +0200 |
commit | 9cbf78f7add8a0ea263c9485c58c848b10a0678c (patch) | |
tree | 3c45a45edb2443a3f857bbeefe089660ea925761 /OpenKeychain/src | |
parent | 42cc8b687b60254396450a07814ffee8d10b3224 (diff) | |
download | open-keychain-9cbf78f7add8a0ea263c9485c58c848b10a0678c.tar.gz open-keychain-9cbf78f7add8a0ea263c9485c58c848b10a0678c.tar.bz2 open-keychain-9cbf78f7add8a0ea263c9485c58c848b10a0678c.zip |
cleanup
Diffstat (limited to 'OpenKeychain/src')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java | 4 | ||||
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SubkeysAddedAdapter.java | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java index e651ed269..9d5a7e4ff 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java @@ -287,6 +287,7 @@ public class EditKeyFragment extends LoaderFragment implements .getString(SetPassphraseDialogFragment.MESSAGE_NEW_PASSPHRASE); mSaveKeyringParcel.newPassphrase = newPassphrase; + Log.d(Constants.TAG, "newPassphrase set"); } } }; @@ -385,6 +386,9 @@ public class EditKeyFragment extends LoaderFragment implements super.handleMessage(message); if (message.arg1 == KeychainIntentServiceHandler.MESSAGE_OKAY) { + getActivity().finish(); + + // TODO below // get returned data bundle Bundle returnData = message.getData(); if (returnData == null) { diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SubkeysAddedAdapter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SubkeysAddedAdapter.java index e42140ee6..25509fee5 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SubkeysAddedAdapter.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SubkeysAddedAdapter.java @@ -291,6 +291,7 @@ public class SubkeysAddedAdapter extends ArrayAdapter<SaveKeyringParcel.SubkeyAd return properKeyLength; } + // TODO: make this an error message on the field // private boolean setOkButtonAvailability(AlertDialog alertDialog) { // final Choice selectedAlgorithm = (Choice) mAlgorithmSpinner.getSelectedItem(); // final int selectedKeySize = getSelectedKeyLength(); //Integer.parseInt((String) mKeySizeSpinner.getSelectedItem()); |