diff options
author | Daniel Gultsch <daniel@gultsch.de> | 2015-12-09 10:30:26 +0100 |
---|---|---|
committer | Daniel Gultsch <daniel@gultsch.de> | 2015-12-09 10:30:26 +0100 |
commit | 11e58607c93f152aad82cfe7951355e03274bf47 (patch) | |
tree | 0a6bd88218489a7b3c9c0e011fb67510da83f51e /src/main/java/eu/siacs/conversations/entities | |
parent | aea664a0eca8c6f4c2c7113563d7bb5201787c61 (diff) |
when no avatar found show avatar of contact and not the muc user in conferences
Diffstat (limited to 'src/main/java/eu/siacs/conversations/entities')
-rw-r--r-- | src/main/java/eu/siacs/conversations/entities/MucOptions.java | 6 |
1 files changed, 3 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 853a8408..014a4c98 100644 --- a/src/main/java/eu/siacs/conversations/entities/MucOptions.java +++ b/src/main/java/eu/siacs/conversations/entities/MucOptions.java @@ -302,15 +302,15 @@ public class MucOptions { return hasFeature("muc_moderated"); } - public void deleteUser(String name) { + public User deleteUser(String name) { synchronized (this.users) { for (int i = 0; i < users.size(); ++i) { if (users.get(i).getName().equals(name)) { - users.remove(i); - return; + return users.remove(i); } } } + return null; } public void addUser(User user) { |