narayana/conversations-classic
3
2
Fork 0
Code Issues 3 Pull requests 2 Actions Packages Projects Releases 4 Wiki Activity

fixed null pointer with missing status msg

Browse source
This commit is contained in:
Daniel Gultsch 2014-03-27 11:09:50 +01:00
parent f99887d7ca
commit 291dc4c36c
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/eu/siacs/conversations/services/XmppConnectionService.java
View file

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