From 723a89079ca96f4af537f2a5f2a8b73c2bbb5704 Mon Sep 17 00:00:00 2001 From: Ash Hughes Date: Mon, 13 May 2013 16:10:11 +0100 Subject: [PATCH] enable passphrase changing for subkey only keychains --- .../libs/scpg-jdk15on-1.47.0.3-SNAPSHOT.jar | Bin 279065 -> 279076 bytes .../service/KeychainIntentService.java | 6 +++--- .../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 index b963899525d23f606743db3496bf99eec319db80..55c28d5b7ec6891f16f22d88c5407304060ebd9b 100644 GIT binary patch delta 11900 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 Na~Ldc6?a~+{{qb|*JuC$ delta 11771 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 J)_~Kj{|Bw{w_X4M 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(); }