when no avatar found show avatar of contact and not the muc user in conferences

This commit is contained in:
Daniel Gultsch 2015-12-09 10:30:26 +01:00
parent aea664a0ec
commit 11e58607c9
3 changed files with 13 additions and 5 deletions

View File

@ -302,15 +302,15 @@ public class MucOptions {
return hasFeature("muc_moderated"); return hasFeature("muc_moderated");
} }
public void deleteUser(String name) { public User deleteUser(String name) {
synchronized (this.users) { synchronized (this.users) {
for (int i = 0; i < users.size(); ++i) { for (int i = 0; i < users.size(); ++i) {
if (users.get(i).getName().equals(name)) { if (users.get(i).getName().equals(name)) {
users.remove(i); return users.remove(i);
return;
} }
} }
} }
return null;
} }
public void addUser(User user) { public void addUser(User user) {

View File

@ -110,7 +110,10 @@ public class PresenceParser extends AbstractParser implements
mucOptions.setError(MucOptions.ERROR_UNKNOWN); mucOptions.setError(MucOptions.ERROR_UNKNOWN);
} }
} else if (!from.isBareJid()){ } else if (!from.isBareJid()){
mucOptions.deleteUser(from.getResourcepart()); MucOptions.User user = mucOptions.deleteUser(from.getResourcepart());
if (user != null) {
mXmppConnectionService.getAvatarService().clear(user);
}
} }
} else if (type.equals("error")) { } else if (type.equals("error")) {
Element error = packet.findChild("error"); Element error = packet.findChild("error");

View File

@ -77,8 +77,13 @@ public class AvatarService {
avatar = mXmppConnectionService.getFileBackend().getAvatar(user.getAvatar(), size); avatar = mXmppConnectionService.getFileBackend().getAvatar(user.getAvatar(), size);
} }
if (avatar == null) { if (avatar == null) {
Contact contact = user.getContact();
if (contact != null) {
avatar = get(contact, size, cachedOnly);
} else {
avatar = get(user.getName(), size, cachedOnly); avatar = get(user.getName(), size, cachedOnly);
} }
}
this.mXmppConnectionService.getBitmapCache().put(KEY, avatar); this.mXmppConnectionService.getBitmapCache().put(KEY, avatar);
return avatar; return avatar;
} }