mirror of
https://github.com/moparisthebest/open-keychain
synced 2024-11-27 19:22:14 -05:00
Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychain
This commit is contained in:
commit
750aaead8e
@ -256,7 +256,7 @@ public class EditKeyActivity extends SherlockFragmentActivity {
|
|||||||
// get master key id using row id
|
// get master key id using row id
|
||||||
long masterKeyId = ProviderHelper.getSecretMasterKeyId(this, keyRingRowId);
|
long masterKeyId = ProviderHelper.getSecretMasterKeyId(this, keyRingRowId);
|
||||||
|
|
||||||
boolean masterCanSign = ProviderHelper.getSecretMasterKeyCanSign(this, keyRingRowId);
|
masterCanSign = ProviderHelper.getSecretMasterKeyCanSign(this, keyRingRowId);
|
||||||
|
|
||||||
String passphrase = PassphraseCacheService.getCachedPassphrase(this, masterKeyId);
|
String passphrase = PassphraseCacheService.getCachedPassphrase(this, masterKeyId);
|
||||||
if (passphrase == null) {
|
if (passphrase == null) {
|
||||||
|
Loading…
Reference in New Issue
Block a user