[merge] Fix crash on disabling wysiwyg from dev quick option

Fixes https://github.com/SchildiChat/SchildiChat-android-rageshakes/issues/1095 Change-Id: Ie8e2e41a0e162a785bc99d1083632f0d1e6cb227
2023-06-27 20:26:27 +02:00 · 2023-06-27 20:26:27 +02:00 · e06a4b94c6
parent d43b296140
commit e06a4b94c6
1 changed files with 2 additions and 2 deletions
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/AutoCompleter.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/AutoCompleter.kt
@ -198,11 +198,11 @@ class AutoCompleter @AssistedInject constructor(
    }

    private fun setupEmojis(backgroundDrawable: Drawable, editText: EditText) {
+        autocompleteEmojiPresenter = autocompleteEmojiPresenterFactory.create(roomId)
+
        // Rich text editor is not yet supported
        if (editText is EditorEditText) return

-        autocompleteEmojiPresenter = autocompleteEmojiPresenterFactory.create(roomId)
-
        autocompletes += Autocomplete.on<EmojiItem>(editText)
                .with(CharPolicy(TRIGGER_AUTO_COMPLETE_EMOJIS, false))
                .with(autocompleteEmojiPresenter)