From 1301d627dd00d3303496b636e9ac813c59e805f6 Mon Sep 17 00:00:00 2001 From: Marcel Hibbe <dev@mhibbe.de> Date: Mon, 1 May 2023 12:22:38 +0200 Subject: [PATCH] remove conversation avatar from chatActivity. only show users avatars. conversation avatars were removed again for now, because this would need more work to add custom view to the supportActionBar in order to show themed drawables. Signed-off-by: Marcel Hibbe <dev@mhibbe.de> --- .../com/nextcloud/talk/chat/ChatActivity.kt | 22 +++++-------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt b/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt index 108b4b016..f3d47a718 100644 --- a/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt @@ -991,22 +991,12 @@ class ChatActivity : } private fun loadAvatarForStatusBar() { - if (isOneToOneConversation() || isGroupConversation() || isPublicConversation()) { - var url = "" - if (isOneToOneConversation()) { - url = ApiUtils.getUrlForAvatar( - conversationUser!!.baseUrl, - currentConversation!!.name, - true - ) - } else if (isGroupConversation() || isPublicConversation()) { - url = ApiUtils.getUrlForConversationAvatarWithVersion( - 1, - conversationUser!!.baseUrl, - currentConversation!!.token, - currentConversation!!.avatarVersion - ) - } + if (isOneToOneConversation()) { + var url = ApiUtils.getUrlForAvatar( + conversationUser!!.baseUrl, + currentConversation!!.name, + true + ) if (DisplayUtils.isDarkModeOn(supportActionBar?.themedContext)) { url = "$url/dark"