From 5dd83a5fe685dd3268986ca0a73f21c4dcbc6af5 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Sat, 11 Jul 2015 21:23:58 +0200
Subject: null check otr fingerprint before display

---
 src/main/java/eu/siacs/conversations/utils/CryptoHelper.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/main/java/eu/siacs')

diff --git a/src/main/java/eu/siacs/conversations/utils/CryptoHelper.java b/src/main/java/eu/siacs/conversations/utils/CryptoHelper.java
index 466bc409..2dec203d 100644
--- a/src/main/java/eu/siacs/conversations/utils/CryptoHelper.java
+++ b/src/main/java/eu/siacs/conversations/utils/CryptoHelper.java
@@ -91,7 +91,9 @@ public final class CryptoHelper {
 	}
 
 	public static String prettifyFingerprint(String fingerprint) {
-		if (fingerprint.length() < 40) {
+		if (fingerprint==null) {
+			return "";
+		} else if (fingerprint.length() < 40) {
 			return fingerprint;
 		}
 		StringBuilder builder = new StringBuilder(fingerprint);
-- 
cgit v1.2.3