diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2013-01-18 00:33:20 +0100 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2013-01-18 00:33:20 +0100 |
commit | 9e5aab34830c5b821e3a47d6d3d4f0a637139e2b (patch) | |
tree | 0420a69ab6e583ae67279b4cebd4d8f18e2e1467 /OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui | |
parent | 39ab2c4bb04d8748312a4da18b006a9de4e711aa (diff) | |
download | open-keychain-9e5aab34830c5b821e3a47d6d3d4f0a637139e2b.tar.gz open-keychain-9e5aab34830c5b821e3a47d6d3d4f0a637139e2b.tar.bz2 open-keychain-9e5aab34830c5b821e3a47d6d3d4f0a637139e2b.zip |
Fix edit key intent, api improvements
Diffstat (limited to 'OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui')
-rw-r--r-- | OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/EditKeyActivity.java | 6 | ||||
-rw-r--r-- | OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/KeyListSecretActivity.java | 20 |
2 files changed, 13 insertions, 13 deletions
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/EditKeyActivity.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/EditKeyActivity.java index 8c5bd6879..42f559b1d 100644 --- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/EditKeyActivity.java +++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/EditKeyActivity.java @@ -74,7 +74,7 @@ public class EditKeyActivity extends SherlockFragmentActivity { public static final String EXTRA_USER_IDS = "userIds"; public static final String EXTRA_NO_PASSPHRASE = "noPassphrase"; public static final String EXTRA_GENERATE_DEFAULT_KEYS = "generateDefaultKeys"; - public static final String EXTRA_KEY_ID = "keyId"; + public static final String EXTRA_MASTER_KEY_ID = "masterKeyId"; // results when saving key public static final String RESULT_EXTRA_MASTER_KEY_ID = "masterKeyId"; @@ -317,8 +317,8 @@ public class EditKeyActivity extends SherlockFragmentActivity { } if (extras != null) { - if (extras.containsKey(EXTRA_KEY_ID)) { - long keyId = extras.getLong(EXTRA_KEY_ID); + if (extras.containsKey(EXTRA_MASTER_KEY_ID)) { + long keyId = extras.getLong(EXTRA_MASTER_KEY_ID); if (keyId != 0) { PGPSecretKey masterKey = null; diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/KeyListSecretActivity.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/KeyListSecretActivity.java index 63d06edaf..0e6cdd6a1 100644 --- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/KeyListSecretActivity.java +++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/KeyListSecretActivity.java @@ -70,26 +70,26 @@ public class KeyListSecretActivity extends KeyListActivity { } } - public void checkPassPhraseAndEdit(long keyId) { - String passPhrase = PassphraseCacheService.getCachedPassphrase(this, keyId); + public void checkPassPhraseAndEdit(long masterKeyId) { + String passPhrase = PassphraseCacheService.getCachedPassphrase(this, masterKeyId); if (passPhrase == null) { - showPassphraseDialog(keyId); + showPassphraseDialog(masterKeyId); } else { PgpMain.setEditPassPhrase(passPhrase); - editKey(keyId); + editKey(masterKeyId); } } - private void showPassphraseDialog(final long secretKeyId) { + private void showPassphraseDialog(final long masterKeyId) { // Message is received after passphrase is cached Handler returnHandler = new Handler() { @Override public void handleMessage(Message message) { if (message.what == PassphraseDialogFragment.MESSAGE_OKAY) { String passPhrase = PassphraseCacheService.getCachedPassphrase( - KeyListSecretActivity.this, secretKeyId); + KeyListSecretActivity.this, masterKeyId); PgpMain.setEditPassPhrase(passPhrase); - editKey(secretKeyId); + editKey(masterKeyId); } } }; @@ -99,7 +99,7 @@ public class KeyListSecretActivity extends KeyListActivity { try { PassphraseDialogFragment passphraseDialog = PassphraseDialogFragment.newInstance( - KeyListSecretActivity.this, messenger, secretKeyId); + KeyListSecretActivity.this, messenger, masterKeyId); passphraseDialog.show(getSupportFragmentManager(), "passphraseDialog"); } catch (PgpMain.PgpGeneralException e) { @@ -115,9 +115,9 @@ public class KeyListSecretActivity extends KeyListActivity { startActivityForResult(intent, 0); } - private void editKey(long keyId) { + private void editKey(long masterKeyId) { Intent intent = new Intent(EditKeyActivity.ACTION_EDIT_KEY); - intent.putExtra(EditKeyActivity.EXTRA_KEY_ID, keyId); + intent.putExtra(EditKeyActivity.EXTRA_MASTER_KEY_ID, masterKeyId); startActivityForResult(intent, 0); } |