diff options
| author | lookshe <github@lookshe.org> | 2015-08-11 17:35:53 +0200 |
|---|---|---|
| committer | lookshe <github@lookshe.org> | 2015-08-11 17:35:53 +0200 |
| commit | 8fd688ca96005152be754eeba1be72c7c0aab9ad (patch) | |
| tree | c4d2e3dfe7250a6794aaa3fa9816ad3da70a813e /src/main/java/eu/siacs/conversations/utils/CryptoHelper.java | |
| parent | 553f41a2dbc068a8a43f613e088713cd3ec7680e (diff) | |
Merge tag '1.5.2' into trz/rebasetrz/1.5.2.1
Diffstat (limited to 'src/main/java/eu/siacs/conversations/utils/CryptoHelper.java')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/utils/CryptoHelper.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/main/java/eu/siacs/conversations/utils/CryptoHelper.java b/src/main/java/eu/siacs/conversations/utils/CryptoHelper.java index eb7e2c3c..2dec203d 100644 --- a/src/main/java/eu/siacs/conversations/utils/CryptoHelper.java +++ b/src/main/java/eu/siacs/conversations/utils/CryptoHelper.java @@ -91,6 +91,11 @@ public final class CryptoHelper { } public static String prettifyFingerprint(String fingerprint) { + if (fingerprint==null) { + return ""; + } else if (fingerprint.length() < 40) { + return fingerprint; + } StringBuilder builder = new StringBuilder(fingerprint); builder.insert(8, " "); builder.insert(17, " "); |