Skip to content

Commit 55b0ea0

Browse files
committed
do not show invalid notification message
1 parent bae3709 commit 55b0ea0

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

chat/src/main/java/cn/wildfire/chat/kit/conversation/message/viewholder/SimpleNotificationMessageContentViewHolder.java

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,13 @@
33
import android.view.View;
44
import android.widget.TextView;
55

6-
import androidx.annotation.Nullable;
76
import androidx.fragment.app.FragmentActivity;
87
import androidx.recyclerview.widget.RecyclerView;
98
import butterknife.Bind;
109
import cn.wildfire.chat.kit.annotation.LayoutRes;
1110
import cn.wildfire.chat.kit.annotation.MessageContentType;
1211
import cn.wildfire.chat.kit.conversation.message.model.UiMessage;
1312
import cn.wildfirechat.chat.R;
14-
import cn.wildfirechat.message.notification.RecallMessageContent;
1513
import cn.wildfirechat.message.notification.AddGroupMemberNotificationContent;
1614
import cn.wildfirechat.message.notification.ChangeGroupNameNotificationContent;
1715
import cn.wildfirechat.message.notification.ChangeGroupPortraitNotificationContent;
@@ -21,6 +19,7 @@
2119
import cn.wildfirechat.message.notification.ModifyGroupAliasNotificationContent;
2220
import cn.wildfirechat.message.notification.NotificationMessageContent;
2321
import cn.wildfirechat.message.notification.QuitGroupNotificationContent;
22+
import cn.wildfirechat.message.notification.RecallMessageContent;
2423
import cn.wildfirechat.message.notification.TipNotificationContent;
2524
import cn.wildfirechat.message.notification.TransferGroupOwnerNotificationContent;
2625

@@ -47,7 +46,6 @@
4746
*/
4847
public class SimpleNotificationMessageContentViewHolder extends MessageContentViewHolder {
4948

50-
@Nullable
5149
@Bind(R.id.notificationTextView)
5250
TextView notificationTextView;
5351

@@ -67,7 +65,11 @@ public boolean contextMenuItemFilter(UiMessage uiMessage, String tag) {
6765
}
6866

6967
protected void onBind(UiMessage message) {
70-
String notification = ((NotificationMessageContent) message.message.content).formatNotification();
71-
notificationTextView.setText(notification);
68+
try {
69+
String notification = ((NotificationMessageContent) message.message.content).formatNotification();
70+
notificationTextView.setText(notification);
71+
} catch (Exception e) {
72+
e.printStackTrace();
73+
}
7274
}
7375
}

0 commit comments

Comments
 (0)