aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2015-06-26 02:44:59 +0200
committerVincent Breitmoser <valodim@mugenguild.com>2015-06-26 02:44:59 +0200
commitdce4503ac5223b7b8e3daa5ecd47c1438607885e (patch)
tree89f5cf9c40902e0db0f5353db5967437cf0c9373 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp
parenta990044fd9eab711e4de7c74aa453f362456050b (diff)
parent51d35c7a834bce7c49e74ded61b9434ffd94a911 (diff)
downloadopen-keychain-dce4503ac5223b7b8e3daa5ecd47c1438607885e.tar.gz
open-keychain-dce4503ac5223b7b8e3daa5ecd47c1438607885e.tar.bz2
open-keychain-dce4503ac5223b7b8e3daa5ecd47c1438607885e.zip
Merge remote-tracking branch 'origin/master' into v/multi-decrypt
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java
index ecf68890e..7be61d9c8 100644
--- 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;
}
}