Merge remote-tracking branch 'origin/master' into v/multi-decrypt

2015-06-26 02:44:59 +02:00
parent a990044fd9 51d35c7a83
commit dce4503ac5
23 changed files with 461 additions and 198 deletions
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java
@@ -219,7 +219,7 @@ public class UncachedKeyRing {
        Iterator<PGPPublicKey> it = mRing.getPublicKeys();
        while (it.hasNext()) {
            if (KeyFormattingUtils.convertFingerprintToHex(
-                    it.next().getFingerprint()).equals(expectedFingerprint)) {
+                    it.next().getFingerprint()).equalsIgnoreCase(expectedFingerprint)) {
                return true;
            }
        }