diff options
author | Daniel Gultsch <daniel@gultsch.de> | 2016-06-14 17:11:31 +0200 |
---|---|---|
committer | Christian Schneppe <christian@pix-art.de> | 2016-06-14 21:29:20 +0200 |
commit | 7099c55a67caf7466dd43bf5c1c1553916770cbc (patch) | |
tree | beab73b78673afdef325ab82ef9a9319bdd874a3 /src/main | |
parent | b951a2894a9ab4cbed9aa93359502481f9275d9e (diff) |
clear muc tiles when avatar of member changes
Diffstat (limited to 'src/main')
3 files changed, 19 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/entities/MucOptions.java b/src/main/java/eu/siacs/conversations/entities/MucOptions.java index cafcf14fd..bdbe94146 100644 --- a/src/main/java/eu/siacs/conversations/entities/MucOptions.java +++ b/src/main/java/eu/siacs/conversations/entities/MucOptions.java @@ -448,7 +448,7 @@ public class MucOptions { return null; } - public User findUserByRealJid(Jid jid) { + private User findUserByRealJid(Jid jid) { if (jid == null) { return null; } @@ -462,6 +462,10 @@ public class MucOptions { return null; } + public boolean isContactInRoom(Contact contact) { + return findUserByRealJid(contact.getJid().toBareJid()) != null; + } + public boolean isUserInRoom(Jid jid) { return findUserByFullJid(jid) != null; } diff --git a/src/main/java/eu/siacs/conversations/services/AvatarService.java b/src/main/java/eu/siacs/conversations/services/AvatarService.java index 88071f500..ea71ff047 100644 --- a/src/main/java/eu/siacs/conversations/services/AvatarService.java +++ b/src/main/java/eu/siacs/conversations/services/AvatarService.java @@ -99,6 +99,9 @@ public class AvatarService implements OnAdvancedStreamFeaturesLoaded { key(contact, size)); } } + for(Conversation conversation : mXmppConnectionService.findAllConferencesWith(contact)) { + clear(conversation); + } } private String key(Contact contact, int size) { diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java index 3072a9aad..6f173ba25 100644 --- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java +++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java @@ -1347,6 +1347,17 @@ public class XmppConnectionService extends Service { return this.accounts; } + public List<Conversation> findAllConferencesWith(Contact contact) { + ArrayList<Conversation> results = new ArrayList<>(); + for(Conversation conversation : conversations) { + if (conversation.getMode() == Conversation.MODE_MULTI + && conversation.getMucOptions().isContactInRoom(contact)) { + results.add(conversation); + } + } + return results; + } + public Conversation find(final Iterable<Conversation> haystack, final Contact contact) { for (final Conversation conversation : haystack) { if (conversation.getContact() == contact) { |