diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2014-11-24 11:53:28 +0100 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2014-11-24 11:53:28 +0100 |
| commit | 7a75a8bc5ae5e623160591196f782e0b960125a9 (patch) | |
| tree | 55adc9d5d46e91d5c19c4bf8b95e49aae5cade25 /src/main/java/eu/siacs/conversations/entities/MucOptions.java | |
| parent | 6f21dc84d5dc40777ffdc3182c1d2c692009baa3 (diff) | |
| parent | dbe8280662bbe90426931a465f767f2ff76f2cbc (diff) | |
Merge pull request #713 from betheg/muc
MUC: do not add yourself to the muc user list.
Diffstat (limited to 'src/main/java/eu/siacs/conversations/entities/MucOptions.java')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/entities/MucOptions.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/main/java/eu/siacs/conversations/entities/MucOptions.java b/src/main/java/eu/siacs/conversations/entities/MucOptions.java index 065b6ee4..beb9612d 100644 --- a/src/main/java/eu/siacs/conversations/entities/MucOptions.java +++ b/src/main/java/eu/siacs/conversations/entities/MucOptions.java @@ -190,6 +190,8 @@ public class MucOptions { this.onJoinListener.onSuccess(); this.onJoinListener = null; } + } else if (packet.getFrom().equals(this.conversation.getContactJid())) { + self = user; } else { addUser(user); } |