aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2014-12-20 16:01:28 +0100
committeriNPUTmice <daniel@gultsch.de>2014-12-20 16:01:28 +0100
commitce4848f74225a59ddc8469a2a3e3481519c0f0d5 (patch)
tree3742c7a5d56bec3cef17a9aad465400b9477b7ed
parent40335785aad5362b5ef0f2a377b28819c1435b19 (diff)
more null checks for otr fingerprints
-rw-r--r--src/main/java/eu/siacs/conversations/entities/Contact.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/entities/Contact.java b/src/main/java/eu/siacs/conversations/entities/Contact.java
index 1fb80b9b2..0820504fc 100644
--- a/src/main/java/eu/siacs/conversations/entities/Contact.java
+++ b/src/main/java/eu/siacs/conversations/entities/Contact.java
@@ -271,7 +271,7 @@ public class Contact implements ListItem {
if (this.keys.has("otr_fingerprints")) {
final JSONArray prints = this.keys.getJSONArray("otr_fingerprints");
for (int i = 0; i < prints.length(); ++i) {
- final String print = prints.getString(i);
+ final String print = prints.isNull(i) ? null : prints.getString(i);
if (print != null && !print.isEmpty()) {
fingerprints.add(prints.getString(i));
}