diff options
| author | Ash Hughes <spirit.returned@googlemail.com> | 2013-05-13 16:10:11 +0100 |
|---|---|---|
| committer | Ash Hughes <spirit.returned@googlemail.com> | 2013-05-13 16:10:11 +0100 |
| commit | 723a89079ca96f4af537f2a5f2a8b73c2bbb5704 (patch) | |
| tree | e11e793c132c654b859d4c56b54e15b57f09244d | |
| parent | 5db08b9bdc3fe93347c1ecc35147dbcb8f98e2be (diff) | |
| download | open-keychain-723a89079ca96f4af537f2a5f2a8b73c2bbb5704.tar.gz open-keychain-723a89079ca96f4af537f2a5f2a8b73c2bbb5704.tar.bz2 open-keychain-723a89079ca96f4af537f2a5f2a8b73c2bbb5704.zip | |
enable passphrase changing for subkey only keychains
| -rw-r--r-- | OpenPGP-Keychain/libs/scpg-jdk15on-1.47.0.3-SNAPSHOT.jar | bin | 279065 -> 279076 bytes | |||
| -rw-r--r-- | OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/KeychainIntentService.java | 6 | ||||
| -rw-r--r-- | OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/EditKeyActivity.java | 7 |
3 files changed, 3 insertions, 10 deletions
diff --git a/OpenPGP-Keychain/libs/scpg-jdk15on-1.47.0.3-SNAPSHOT.jar b/OpenPGP-Keychain/libs/scpg-jdk15on-1.47.0.3-SNAPSHOT.jar Binary files differindex b96389952..55c28d5b7 100644 --- a/OpenPGP-Keychain/libs/scpg-jdk15on-1.47.0.3-SNAPSHOT.jar +++ b/OpenPGP-Keychain/libs/scpg-jdk15on-1.47.0.3-SNAPSHOT.jar diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/KeychainIntentService.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/KeychainIntentService.java index 48afdff5c..1d48278eb 100644 --- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/KeychainIntentService.java +++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/KeychainIntentService.java @@ -540,9 +540,9 @@ public class KeychainIntentService extends IntentService implements ProgressDial long masterKeyId = data.getLong(SAVE_KEYRING_MASTER_KEY_ID); /* Operation */ - if (!canSign) { //library fails, fix later - //PgpMain.changeSecretKeyPassphrase(this, ProviderHelper.getPGPSecretKeyRingByKeyId(this, masterKeyId), - //oldPassPhrase, newPassPhrase, this); + if (!canSign) { + PgpMain.changeSecretKeyPassphrase(this, ProviderHelper.getPGPSecretKeyRingByKeyId(this, masterKeyId), + oldPassPhrase, newPassPhrase, this); } else { PgpMain.buildSecretKey(this, userIds, keys, keysUsages, masterKeyId, oldPassPhrase, newPassPhrase, this); diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/EditKeyActivity.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/EditKeyActivity.java index 3d819a824..bc4467967 100644 --- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/EditKeyActivity.java +++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/EditKeyActivity.java @@ -194,13 +194,6 @@ public class EditKeyActivity extends SherlockFragmentActivity { } }); - //disable key passhphrase changing with empty private keys for no - //library fails, fix later - if (!masterCanSign) { - mChangePassPhrase.setEnabled(false); - mNoPassphrase.setEnabled(false); - } - if (mBuildLayout) { buildLayout(); } |