From 906c1f7529360ddb075740cc2283430e750fd1fa Mon Sep 17 00:00:00 2001
From: Marcel Hibbe <dev@mhibbe.de>
Date: Sun, 2 Apr 2023 21:41:27 +0200
Subject: [PATCH] fix to show avatar, fix onClick listener

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
---
 app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt | 4 ++--
 1 file changed, 2 insertions(+), 2 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 549135347..32b498923 100644
--- a/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt
+++ b/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt
@@ -352,7 +352,7 @@ class ChatActivity :
         if (conversationUser?.userId != "?" &&
             CapabilitiesUtilNew.hasSpreedFeatureCapability(conversationUser, "mention-flag")
         ) {
-            findViewById<View>(R.id.toolbar)?.setOnClickListener { v -> showConversationInfoScreen() }
+            binding.chatToolbar.setOnClickListener { v -> showConversationInfoScreen() }
         }
 
         val smileyButton = binding?.messageInputView?.findViewById<ImageButton>(R.id.smileyButton)
@@ -948,7 +948,7 @@ class ChatActivity :
             val target = object : Target {
 
                 private fun setIcon(drawable: Drawable?) {
-                    actionBar?.let {
+                    supportActionBar?.let {
                         val avatarSize = (it.height / TOOLBAR_AVATAR_RATIO).roundToInt()
 
                         if (drawable != null && avatarSize > 0) {