aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2014-12-03 01:46:26 +0100
committeriNPUTmice <daniel@gultsch.de>2014-12-03 01:46:26 +0100
commitc2736371560ea377e199cd4b8ffe722e84045972 (patch)
tree98eeb07044efb94cae6f38f8f421df951dab54a9 /src/main/java/eu/siacs
parent605998c966d96823233f98cc43883d040aa810d7 (diff)
made muc parser more compatible with legacy mucs?! (whatever that is exactly)
Diffstat (limited to 'src/main/java/eu/siacs')
-rw-r--r--src/main/java/eu/siacs/conversations/entities/MucOptions.java4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/main/java/eu/siacs/conversations/entities/MucOptions.java b/src/main/java/eu/siacs/conversations/entities/MucOptions.java
index 2244645b..c8706fc9 100644
--- a/src/main/java/eu/siacs/conversations/entities/MucOptions.java
+++ b/src/main/java/eu/siacs/conversations/entities/MucOptions.java
@@ -179,7 +179,7 @@ public class MucOptions {
user.setAffiliation(item.getAttribute("affiliation"));
user.setRole(item.getAttribute("role"));
user.setJid(item.getAttributeAsJid("jid"));
- if (codes.contains(STATUS_CODE_SELF_PRESENCE)) {
+ if (codes.contains(STATUS_CODE_SELF_PRESENCE) || packet.getFrom().equals(this.conversation.getContactJid())) {
this.isOnline = true;
this.error = ERROR_NO_ERROR;
self = user;
@@ -190,8 +190,6 @@ public class MucOptions {
this.onJoinListener.onSuccess();
this.onJoinListener = null;
}
- } else if (packet.getFrom().equals(this.conversation.getContactJid())) {
- self = user;
} else {
addUser(user);
}