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

more npe checks in muc packet parser

Browse source
This commit is contained in:
iNPUTmice 2014-11-13 14:27:10 +01:00
parent 61f046a675
commit 77ba68d61f
1 changed files with 35 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
src/main/java/eu/siacs/conversations/entities/MucOptions.java
View file

@ -151,39 +151,42 @@ public class MucOptions {
String type = packet.getAttribute("type");
if (type == null) {
User user = new User();
Element item = packet.findChild("x",
"http://jabber.org/protocol/muc#user")
.findChild("item");
user.setName(name);
user.setAffiliation(item.getAttribute("affiliation"));
user.setRole(item.getAttribute("role"));
user.setJid(item.getAttribute("jid"));
user.setName(name);
if (name.equals(this.joinnick)) {
this.isOnline = true;
this.error = ERROR_NO_ERROR;
self = user;
if (aboutToRename) {
if (renameListener != null) {
renameListener.onRename(true);
}
aboutToRename = false;
}
} else {
addUser(user);
}
if (pgp != null) {
Element x = packet.findChild("x", "jabber:x:signed");
if (x != null) {
Element status = packet.findChild("status");
String msg;
if (status != null) {
msg = status.getContent();
Element x = packet.findChild("x","http://jabber.org/protocol/muc#user");
if (x != null) {
Element item = x.findChild("item");
if (item != null) {
user.setName(name);
user.setAffiliation(item.getAttribute("affiliation"));
user.setRole(item.getAttribute("role"));
user.setJid(item.getAttribute("jid"));
user.setName(name);
if (name.equals(this.joinnick)) {
this.isOnline = true;
this.error = ERROR_NO_ERROR;
self = user;
if (aboutToRename) {
if (renameListener != null) {
renameListener.onRename(true);
}
aboutToRename = false;
}
} else {
msg = "";
addUser(user);
}
if (pgp != null) {
Element signed = packet.findChild("x", "jabber:x:signed");
if (signed != null) {
Element status = packet.findChild("status");
String msg;
if (status != null) {
msg = status.getContent();
} else {
msg = "";
}
user.setPgpKeyId(pgp.fetchKeyId(account, msg,
signed.getContent()));
}
}
user.setPgpKeyId(pgp.fetchKeyId(account, msg,
x.getContent()));
}
}
} else if (type.equals("unavailable") && name.equals(this.joinnick)) {
@ -366,4 +369,4 @@ public class MucOptions {
public Conversation getConversation() {
return this.conversation;
}
}
}