From 8f4fd9bf7e21aed7143e1a9722c4514348bfffff Mon Sep 17 00:00:00 2001
From: max <mxruan@163.com>
Date: Thu, 23 May 2024 15:36:42 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8Dgoogle=E6=A3=80=E6=B5=8B?=
 =?UTF-8?q?=E5=88=B0=E7=9A=84=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../viewholder/MsgViewHolderAudio.java        |  2 +-
 .../session/viewholder/MsgViewHolderBase.java | 22 ++++++++++++++-----
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/nim_uikit/src/com/netease/nim/uikit/business/session/viewholder/MsgViewHolderAudio.java b/nim_uikit/src/com/netease/nim/uikit/business/session/viewholder/MsgViewHolderAudio.java
index b1f8696c0..576e76255 100644
--- a/nim_uikit/src/com/netease/nim/uikit/business/session/viewholder/MsgViewHolderAudio.java
+++ b/nim_uikit/src/com/netease/nim/uikit/business/session/viewholder/MsgViewHolderAudio.java
@@ -65,7 +65,7 @@ public class MsgViewHolderAudio extends MsgViewHolderBase {
 
     @Override
     protected void onItemClick() {
-        if (audioControl != null) {
+        if (audioControl != null && message != null) {
             if (message.getDirect() == MsgDirectionEnum.In && message.getAttachStatus() != AttachStatusEnum.transferred) {
                 return;
             }
diff --git a/nim_uikit/src/com/netease/nim/uikit/business/session/viewholder/MsgViewHolderBase.java b/nim_uikit/src/com/netease/nim/uikit/business/session/viewholder/MsgViewHolderBase.java
index 6ae7a4fb0..e4f0d93f0 100644
--- a/nim_uikit/src/com/netease/nim/uikit/business/session/viewholder/MsgViewHolderBase.java
+++ b/nim_uikit/src/com/netease/nim/uikit/business/session/viewholder/MsgViewHolderBase.java
@@ -271,7 +271,9 @@ public abstract class MsgViewHolderBase extends RecyclerViewHolder<BaseMultiItem
 
                 @Override
                 public void onClick(View v) {
-                    getMsgAdapter().getEventListener().onFailedBtnClick(message);
+                    if (getMsgAdapter() != null && getMsgAdapter().getEventListener() != null) {
+                        getMsgAdapter().getEventListener().onFailedBtnClick(message);
+                    }
                 }
             });
         }
@@ -289,18 +291,26 @@ public abstract class MsgViewHolderBase extends RecyclerViewHolder<BaseMultiItem
             View.OnClickListener portraitListener = new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
+                    if (message == null) {
+                        return;
+                    }
                     String sessionId = message.getSessionId();
 
                     if (!TextUtils.isEmpty(sessionId)) {
                         AvatarClickListener avatarClickListener = NimUIKitImpl.getAvatarClickListener(sessionId);
 
-                        if (avatarClickListener != null)
+                        if (avatarClickListener != null) {
                             avatarClickListener.avatarClick(message.getFromAccount());
-                        else
+                        } else {
+                            if (NimUIKitImpl.getSessionListener() != null) {
+                                NimUIKitImpl.getSessionListener().onAvatarClicked(context, message);
+                            }
+                        }
+                    } else {
+                        if (NimUIKitImpl.getSessionListener() != null) {
                             NimUIKitImpl.getSessionListener().onAvatarClicked(context, message);
-
-                    } else
-                        NimUIKitImpl.getSessionListener().onAvatarClicked(context, message);
+                        }
+                    }
                 }
             };
             avatarLeft.setOnClickListener(portraitListener);