aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2014-08-14 16:34:57 +0200
committerVincent Breitmoser <valodim@mugenguild.com>2014-08-14 16:34:57 +0200
commit2c408f679c691a29814ef7d53de7130e3aa22dfc (patch)
tree844ae44ccd6ec1f76d4b4b4d0a24c0527c3078a7 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java
parenta19784ed7e930055a6a1d0a537f2f4f1d3ea1f21 (diff)
downloadopen-keychain-2c408f679c691a29814ef7d53de7130e3aa22dfc.tar.gz
open-keychain-2c408f679c691a29814ef7d53de7130e3aa22dfc.tar.bz2
open-keychain-2c408f679c691a29814ef7d53de7130e3aa22dfc.zip
dem logix
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java')
-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 20e78d7fa..83c244d52 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java
@@ -694,7 +694,7 @@ public class UncachedKeyRing {
long masterKeyId = other.getMasterKeyId();
if (getMasterKeyId() != masterKeyId
- || Arrays.equals(getFingerprint(), other.getFingerprint())) {
+ || !Arrays.equals(getFingerprint(), other.getFingerprint())) {
log.add(LogLevel.ERROR, LogType.MSG_MG_HETEROGENEOUS, indent);
return null;
}