diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-09-24 01:42:17 +0200 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-09-24 01:42:17 +0200 |
commit | c871891f49e2d456c8b5848d12f9c81d3efd6bc7 (patch) | |
tree | 6446333ac0da12cc477721b54ea7aa5b2e792b1c /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java | |
parent | 7654cd54fbba9fa6ecaf47f5ffc5fc21669d6e56 (diff) | |
parent | 6e0938aa9300b3bc8fa5b9c8cfd9c52a97c78506 (diff) | |
download | open-keychain-c871891f49e2d456c8b5848d12f9c81d3efd6bc7.tar.gz open-keychain-c871891f49e2d456c8b5848d12f9c81d3efd6bc7.tar.bz2 open-keychain-c871891f49e2d456c8b5848d12f9c81d3efd6bc7.zip |
Merge remote-tracking branch 'origin/master'
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java index a508472d6..54877f676 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java @@ -135,7 +135,7 @@ public class EncryptAsymmetricFragment extends Fragment implements EncryptActivi try { CachedPublicKeyRing keyring = mProviderHelper.getCachedPublicKeyRing( KeyRings.buildUnifiedKeyRingUri(signatureKey)); - if(keyring.hasAnySecret()) { + if (keyring.hasAnySecret()) { setSignatureKeyId(keyring.getMasterKeyId()); mSign.setSelectedKeyId(mEncryptInterface.getSignatureKey()); } |