diff options
author | Daniel Gultsch <daniel.gultsch@rwth-aachen.de> | 2014-02-28 03:22:05 +0100 |
---|---|---|
committer | Daniel Gultsch <daniel.gultsch@rwth-aachen.de> | 2014-02-28 03:22:05 +0100 |
commit | 03d96266f8bbb76e25610e903d74a0afa7dcd03b (patch) | |
tree | 6373b7e74c6130ec4e80665b6781a0c1d4f175b1 /src/de/gultsch/chat | |
parent | 9581dfcde4720ede5c9fa5ca97210504b6609b3f (diff) |
fixed a small graphic glitch
Diffstat (limited to 'src/de/gultsch/chat')
-rw-r--r-- | src/de/gultsch/chat/services/XmppConnectionService.java | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/src/de/gultsch/chat/services/XmppConnectionService.java b/src/de/gultsch/chat/services/XmppConnectionService.java index 4e75f7aa..7ff09957 100644 --- a/src/de/gultsch/chat/services/XmppConnectionService.java +++ b/src/de/gultsch/chat/services/XmppConnectionService.java @@ -210,16 +210,18 @@ public class XmppConnectionService extends Service { } else if (show.getContent().equals("dnd")) { contact.updatePresence(fromParts[1], Presences.DND); } - Element x = packet.findChild("x"); - if ((x != null) - && (x.getAttribute("xmlns").equals("jabber:x:signed"))) { - try { - Log.d(LOGTAG,"pgp signature for contact" +packet.getAttribute("from")); - contact.setPgpKeyId(getPgpEngine().fetchKeyId(packet.findChild("status") - .getContent(), x.getContent())); - databaseBackend.updateContact(contact); - } catch (OpenPgpException e) { - Log.d(LOGTAG,"faulty pgp. just ignore"); + PgpEngine pgp = getPgpEngine(); + if (pgp!=null) { + Element x = packet.findChild("x"); + if ((x != null) + && (x.getAttribute("xmlns").equals("jabber:x:signed"))) { + try { + Log.d(LOGTAG,"pgp signature for contact" +packet.getAttribute("from")); + contact.setPgpKeyId(pgp.fetchKeyId(packet.findChild("status") + .getContent(), x.getContent())); + } catch (OpenPgpException e) { + Log.d(LOGTAG,"faulty pgp. just ignore"); + } } } databaseBackend.updateContact(contact); |