From 63f0e2a4a43b7745b147f0bc14c2aa6be87b667e Mon Sep 17 00:00:00 2001
From: Stephen Paul Weber <singpolyma@singpolyma.net>
Date: Tue, 6 Feb 2024 17:13:36 -0500
Subject: [PATCH] If user *or* nick is null, try other way

---
 .../java/eu/siacs/conversations/ui/ConversationFragment.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
index 1885cd42a0c79dec9b5b8c287a2da24b1952e368..e839238086ec8b85d5dd6b711cbe9ac108be7087 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
@@ -4389,7 +4389,7 @@ public class ConversationFragment extends XmppFragment
                                             Toast.LENGTH_SHORT)
                                     .show();
                         }
-                        highlightInConference(mucUser == null ? (tcpMucUser == null ? user.getResource() : tcpMucUser.getNick()) : mucUser.getNick());
+                        highlightInConference(mucUser == null || mucUser.getNick() == null ? (tcpMucUser == null || tcpMucUser.getNick() == null ? user.getResource() : tcpMucUser.getNick()) : mucUser.getNick());
                     } else {
                         Toast.makeText(
                                         getActivity(),