moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-11-23 17:22:16 -05:00
Code Issues Releases Wiki Activity

enable passphrase changing for subkey only keychains

Browse Source
This commit is contained in:
Ash Hughes 2013-05-13 16:10:11 +01:00
parent 5db08b9bdc
commit 723a89079c
3 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
OpenPGP-Keychain/libs/scpg-jdk15on-1.47.0.3-SNAPSHOT.jar
View File

Binary file not shown.

6
OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/KeychainIntentService.java
View File

@ -540,9 +540,9 @@ public class KeychainIntentService extends IntentService implements ProgressDial
long masterKeyId = data.getLong(SAVE_KEYRING_MASTER_KEY_ID); long masterKeyId = data.getLong(SAVE_KEYRING_MASTER_KEY_ID);
/* Operation */ /* Operation */
if (!canSign) { //library fails, fix later if (!canSign) {
//PgpMain.changeSecretKeyPassphrase(this, ProviderHelper.getPGPSecretKeyRingByKeyId(this, masterKeyId), PgpMain.changeSecretKeyPassphrase(this, ProviderHelper.getPGPSecretKeyRingByKeyId(this, masterKeyId),
//oldPassPhrase, newPassPhrase, this); oldPassPhrase, newPassPhrase, this);
} else { } else {
PgpMain.buildSecretKey(this, userIds, keys, keysUsages, masterKeyId, oldPassPhrase, PgpMain.buildSecretKey(this, userIds, keys, keysUsages, masterKeyId, oldPassPhrase,
newPassPhrase, this); newPassPhrase, this);

7
OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/EditKeyActivity.java
View File

@ -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) { if (mBuildLayout) {
buildLayout(); buildLayout();
} }