more npe checks in muc packet parser
This commit is contained in:
parent
88c8373553
commit
e6a4fa031b
|
@ -158,9 +158,10 @@ public class MucOptions {
|
||||||
String type = packet.getAttribute("type");
|
String type = packet.getAttribute("type");
|
||||||
if (type == null) {
|
if (type == null) {
|
||||||
User user = new User();
|
User user = new User();
|
||||||
Element item = packet.findChild("x",
|
Element x = packet.findChild("x","http://jabber.org/protocol/muc#user");
|
||||||
"http://jabber.org/protocol/muc#user")
|
if (x != null) {
|
||||||
.findChild("item");
|
Element item = x.findChild("item");
|
||||||
|
if (item != null) {
|
||||||
user.setName(name);
|
user.setName(name);
|
||||||
user.setAffiliation(item.getAttribute("affiliation"));
|
user.setAffiliation(item.getAttribute("affiliation"));
|
||||||
user.setRole(item.getAttribute("role"));
|
user.setRole(item.getAttribute("role"));
|
||||||
|
@ -180,8 +181,8 @@ public class MucOptions {
|
||||||
addUser(user);
|
addUser(user);
|
||||||
}
|
}
|
||||||
if (pgp != null) {
|
if (pgp != null) {
|
||||||
Element x = packet.findChild("x", "jabber:x:signed");
|
Element signed = packet.findChild("x", "jabber:x:signed");
|
||||||
if (x != null) {
|
if (signed != null) {
|
||||||
Element status = packet.findChild("status");
|
Element status = packet.findChild("status");
|
||||||
String msg;
|
String msg;
|
||||||
if (status != null) {
|
if (status != null) {
|
||||||
|
@ -190,7 +191,9 @@ public class MucOptions {
|
||||||
msg = "";
|
msg = "";
|
||||||
}
|
}
|
||||||
user.setPgpKeyId(pgp.fetchKeyId(account, msg,
|
user.setPgpKeyId(pgp.fetchKeyId(account, msg,
|
||||||
x.getContent()));
|
signed.getContent()));
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else if (type.equals("unavailable") && name.equals(this.joinnick)) {
|
} else if (type.equals("unavailable") && name.equals(this.joinnick)) {
|
||||||
|
|
Loading…
Reference in New Issue