From 291dc4c36c72abda41cbfff9d665d0f95b1dbb5a Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Thu, 27 Mar 2014 11:09:50 +0100 Subject: [PATCH] fixed null pointer with missing status msg --- .../conversations/services/XmppConnectionService.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/eu/siacs/conversations/services/XmppConnectionService.java b/src/eu/siacs/conversations/services/XmppConnectionService.java index 90aac54ec..57a028e7d 100644 --- a/src/eu/siacs/conversations/services/XmppConnectionService.java +++ b/src/eu/siacs/conversations/services/XmppConnectionService.java @@ -278,9 +278,14 @@ public class XmppConnectionService extends Service { Element x = packet.findChild("x","jabber:x:signed"); if (x != null) { try { - contact.setPgpKeyId(pgp.fetchKeyId( - packet.findChild("status") - .getContent(), x + Element status = packet.findChild("status"); + String msg; + if (status!=null) { + msg = status.getContent(); + } else { + msg = ""; + } + contact.setPgpKeyId(pgp.fetchKeyId(msg, x .getContent())); } catch (OpenPgpException e) { Log.d(LOGTAG, "faulty pgp. just ignore");