diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-02-01 19:50:01 +0100 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-02-01 19:50:01 +0100 |
| commit | 750aaead8e60fe9395d85451243d4d4705c9dea7 (patch) | |
| tree | 8856be1d7d3c8b75d15dacb0c129da5bc996cbcd /OpenPGP-Keychain | |
| parent | 0e53d901e6121eec420db5be16ea77e9869503fb (diff) | |
| parent | c07be572c216b32c1cd5996ab09633b01477c81d (diff) | |
| download | open-keychain-750aaead8e60fe9395d85451243d4d4705c9dea7.tar.gz open-keychain-750aaead8e60fe9395d85451243d4d4705c9dea7.tar.bz2 open-keychain-750aaead8e60fe9395d85451243d4d4705c9dea7.zip | |
Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychain
Diffstat (limited to 'OpenPGP-Keychain')
| -rw-r--r-- | OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyActivity.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyActivity.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyActivity.java index 09334fe6d..e7b1b4c23 100644 --- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyActivity.java +++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyActivity.java @@ -256,7 +256,7 @@ public class EditKeyActivity extends SherlockFragmentActivity { // get master key id using row id long masterKeyId = ProviderHelper.getSecretMasterKeyId(this, keyRingRowId); - boolean masterCanSign = ProviderHelper.getSecretMasterKeyCanSign(this, keyRingRowId); + masterCanSign = ProviderHelper.getSecretMasterKeyCanSign(this, keyRingRowId); String passphrase = PassphraseCacheService.getCachedPassphrase(this, masterKeyId); if (passphrase == null) { |