From e06a4b94c6e367fb4f12d70f1add9a0cc17fd460 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Tue, 27 Jun 2023 20:26:27 +0200 Subject: [PATCH] [merge] Fix crash on disabling wysiwyg from dev quick option Fixes https://github.com/SchildiChat/SchildiChat-android-rageshakes/issues/1095 Change-Id: Ie8e2e41a0e162a785bc99d1083632f0d1e6cb227 --- .../im/vector/app/features/home/room/detail/AutoCompleter.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git 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 index 962de6532c..8b125d9ed6 100644 --- 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(editText) .with(CharPolicy(TRIGGER_AUTO_COMPLETE_EMOJIS, false)) .with(autocompleteEmojiPresenter)