Merge branch 'master' into encrypted-export

OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignatureChecker.java

@@ -133,7 +133,7 @@ class PgpSignatureChecker {
                         KeyRings.buildUnifiedKeyRingsFindBySubkeyUri(sigKeyId)
                 );
                 CanonicalizedPublicKey keyCandidate = signingRing.getPublicKey(sigKeyId);
-                if ( ! signingKey.canSign()) {
+                if ( ! keyCandidate.canSign()) {
                     continue;
                 }
                 signatureIndex = i;
@@ -156,7 +156,7 @@ class PgpSignatureChecker {
                         KeyRings.buildUnifiedKeyRingsFindBySubkeyUri(sigKeyId)
                 );
                 CanonicalizedPublicKey keyCandidate = signingRing.getPublicKey(sigKeyId);
-                if ( ! signingKey.canSign()) {
+                if ( ! keyCandidate.canSign()) {
                     continue;
                 }
                 signatureIndex = i;