mirrors/nextcloud-talk-android
1
0
Fork 0
mirror of https://github.com/nextcloud/talk-android.git synced 2024-11-27 08:55:54 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1355 from nextcloud/bugfix/noid/fix-avatar-handling

Browse source 
Fix avatar handling
This commit is contained in:
Joas Schilling 2021-06-23 15:40:47 +02:00 committed by GitHub
commit 8abe99fc5a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/src/main/java/com/nextcloud/talk/models/json/chat/ChatMessage.java
View file

@ -285,7 +285,10 @@ public class ChatMessage implements MessageContentType, MessageContentType.Image
public String getAvatar() {
if (getActorType().equals("users")) {
return ApiUtils.getUrlForAvatarWithName(getActiveUser().getBaseUrl(), actorId, R.dimen.avatar_size);
} else if (getActorType().equals("guests")) {
} else if (getActorType().equals("bridged")) {
return ApiUtils.getUrlForAvatarWithName(getActiveUser().getBaseUrl(), "bridge-bot",
R.dimen.avatar_size);
} else {
String apiId =
NextcloudTalkApplication.Companion.getSharedApplication().getString(R.string.nc_guest);
@ -293,8 +296,6 @@ public class ChatMessage implements MessageContentType, MessageContentType.Image
apiId = getActorDisplayName();
}
return ApiUtils.getUrlForAvatarWithNameForGuests(getActiveUser().getBaseUrl(), apiId, R.dimen.avatar_size);
} else {
return null;
}
}
};