show contact avatar in muc users unless that contact has its own avatar
This commit is contained in:
		
							parent
							
								
									841e718d6a
								
							
						
					
					
						commit
						d9ff61ea2e
					
				| @ -64,7 +64,7 @@ public class AvatarService implements OnAdvancedStreamFeaturesLoaded { | |||||||
| 
 | 
 | ||||||
| 	public Bitmap get(final MucOptions.User user, final int size, boolean cachedOnly) { | 	public Bitmap get(final MucOptions.User user, final int size, boolean cachedOnly) { | ||||||
| 		Contact c = user.getContact(); | 		Contact c = user.getContact(); | ||||||
| 		if (c != null && (c.getProfilePhoto() != null || c.getAvatar() != null)) { | 		if (c != null && (c.getProfilePhoto() != null || c.getAvatar() != null || user.getAvatar() == null)) { | ||||||
| 			return get(c, size, cachedOnly); | 			return get(c, size, cachedOnly); | ||||||
| 		} else { | 		} else { | ||||||
| 			return getImpl(user, size, cachedOnly); | 			return getImpl(user, size, cachedOnly); | ||||||
|  | |||||||
		Loading…
	
		Reference in New Issue
	
	Block a user
	 Daniel Gultsch
						Daniel Gultsch