Fix NPE

Stephen Paul Weber created 1 year ago

Change summary

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

Detailed changes

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();
             }