aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAndreas Straub <andy@strb.org>2015-07-29 02:56:47 +0200
committerAndreas Straub <andy@strb.org>2015-07-29 02:59:41 +0200
commite10a6c5b87d5d4b4871fdf31bbc9a7ef8b8d6ff1 (patch)
treeaf8752a3587f700ea4040985dc7141d4ad5372aa /src
parent77920c7aa608bd92391ade653eb8971b977eb7d5 (diff)
Fix NPE: consider unknown keys UNDECIDED
Diffstat (limited to 'src')
-rw-r--r--src/main/java/eu/siacs/conversations/crypto/axolotl/XmppAxolotlSession.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/crypto/axolotl/XmppAxolotlSession.java b/src/main/java/eu/siacs/conversations/crypto/axolotl/XmppAxolotlSession.java
index b8d7dcba..d58b2dd8 100644
--- a/src/main/java/eu/siacs/conversations/crypto/axolotl/XmppAxolotlSession.java
+++ b/src/main/java/eu/siacs/conversations/crypto/axolotl/XmppAxolotlSession.java
@@ -64,7 +64,8 @@ public class XmppAxolotlSession {
}
protected SQLiteAxolotlStore.Trust getTrust() {
- return sqLiteAxolotlStore.getFingerprintTrust(fingerprint);
+ SQLiteAxolotlStore.Trust trust = sqLiteAxolotlStore.getFingerprintTrust(fingerprint);
+ return (trust == null)? SQLiteAxolotlStore.Trust.UNDECIDED : trust;
}
@Nullable