Fix NPE: consider unknown keys UNDECIDED

2015-07-29 02:56:47 +02:00 · 2015-07-29 02:56:47 +02:00 · e10a6c5b87
parent 77920c7aa6
commit e10a6c5b87
1 changed files with 2 additions and 1 deletions
--- 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