From 50f5d704b73a45120a42b03ddc11bfc6d4f6aafb Mon Sep 17 00:00:00 2001
From: Stephen Paul Weber <singpolyma@singpolyma.net>
Date: Fri, 4 Oct 2024 21:12:45 -0500
Subject: [PATCH] Fix NPE

---
 .../java/eu/siacs/conversations/ui/ConversationFragment.java | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
index 41fd92d0787dccc8535dc070b37b6fa620ba9a28..856ea956320a487b6e501abf06c6f6ec8f4635c4 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
@@ -1618,6 +1618,7 @@ public class ConversationFragment extends XmppFragment
 
                 @Override
                 protected Adapter instantiateAdapter() {
+                    setupEmojiSearch();
                     adapter = emojiSearch.makeAdapter(item -> dispatchClick(item));
                     return adapter;
                 }
@@ -1655,10 +1656,6 @@ public class ConversationFragment extends XmppFragment
 
     protected void setupEmojiSearch() {
         if (activity != null && activity.xmppConnectionService != null) {
-            if (!activity.xmppConnectionService.getBooleanPreference("message_autocomplete", R.bool.message_autocomplete)) {
-                emojiSearch = null;
-                return;
-            }
             if (emojiSearch == null) {
                 emojiSearch = activity.xmppConnectionService.emojiSearch();
             }