diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-01-02 22:45:24 +0100 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-01-02 22:45:24 +0100 |
| commit | bc0edfda0bae21a567b9ea340cab323f9a15a086 (patch) | |
| tree | 2ef89f36083d719be9ce26e746e628cc741b3c7e /OpenPGP-Keychain | |
| parent | 7b9b3d07bbb507823ec4621d37e2723460124e0b (diff) | |
| download | open-keychain-bc0edfda0bae21a567b9ea340cab323f9a15a086.tar.gz open-keychain-bc0edfda0bae21a567b9ea340cab323f9a15a086.tar.bz2 open-keychain-bc0edfda0bae21a567b9ea340cab323f9a15a086.zip | |
fix nullpointer in EditKeyActivity
Diffstat (limited to 'OpenPGP-Keychain')
| -rw-r--r-- | OpenPGP-Keychain/res/values/strings.xml | 4 | ||||
| -rw-r--r-- | OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/EditKeyActivity.java | 22 |
2 files changed, 13 insertions, 13 deletions
diff --git a/OpenPGP-Keychain/res/values/strings.xml b/OpenPGP-Keychain/res/values/strings.xml index d900f5a71..bfc7434b2 100644 --- a/OpenPGP-Keychain/res/values/strings.xml +++ b/OpenPGP-Keychain/res/values/strings.xml @@ -19,8 +19,8 @@ <resources> <!-- title --> - <string name="title_manage_public_keys">Manage Public Keys</string> - <string name="title_manage_secret_keys">Manage Secret Keys</string> + <string name="title_manage_public_keys">Public Keys</string> + <string name="title_manage_secret_keys">Secret Keys</string> <string name="title_select_recipients">Select Public Key</string> <string name="title_select_secret_key">Select Secret Key</string> <string name="title_encrypt">Encrypt</string> diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/EditKeyActivity.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/EditKeyActivity.java index 7aeb51c8f..4dcaa6d73 100644 --- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/EditKeyActivity.java +++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/EditKeyActivity.java @@ -295,17 +295,6 @@ public class EditKeyActivity extends SherlockFragmentActivity { } private void finallyEdit(final long masterKeyId, final boolean masterCanSign) { - // TODO: ??? - if (mCurrentPassPhrase == null) { - mCurrentPassPhrase = ""; - } - - if (mCurrentPassPhrase.equals("")) { - // check "no passphrase" checkbox and remove button - mNoPassphrase.setChecked(true); - mChangePassPhrase.setVisibility(View.GONE); - } - if (masterKeyId != 0) { PGPSecretKey masterKey = null; mKeyRing = ProviderHelper.getPGPSecretKeyRingByMasterKeyId(this, masterKeyId); @@ -328,6 +317,17 @@ public class EditKeyActivity extends SherlockFragmentActivity { } buildLayout(); + + // TODO: ??? + if (mCurrentPassPhrase == null) { + mCurrentPassPhrase = ""; + } + + if (mCurrentPassPhrase.equals("")) { + // check "no passphrase" checkbox and remove button + mNoPassphrase.setChecked(true); + mChangePassPhrase.setVisibility(View.GONE); + } } /** |