fixed null pointer with missing status msg

Daniel Gultsch created 12 years ago

Change summary

src/eu/siacs/conversations/services/XmppConnectionService.java | 11 ++-
1 file changed, 8 insertions(+), 3 deletions(-)

Detailed changes

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");