Attempt to fix crash in processUpdateSuggestionStrip

futo-org · Jul 24, 2024 · e0bd7b2 · e0bd7b2
1 parent bdfa736
commit e0bd7b2
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/java/src/org/futo/inputmethod/latin/xlm/LanguageModelFacilitator.kt b/java/src/org/futo/inputmethod/latin/xlm/LanguageModelFacilitator.kt
@@ -237,19 +237,21 @@ public class LanguageModelFacilitator(
 
         computationSemaphore.acquire()
 
-        inputLogic.mWordComposer.setAutoCorrection(null)
+        try {
+            inputLogic.mWordComposer.setAutoCorrection(null)
 
-        if(values.composedData.mTypedWord.length > BinaryDictionary.DICTIONARY_MAX_WORD_LENGTH) {
-            inputLogic.mSuggestionStripViewAccessor.setNeutralSuggestionStrip()
-        }
+            if(values.composedData.mTypedWord.length > BinaryDictionary.DICTIONARY_MAX_WORD_LENGTH) {
+                inputLogic.mSuggestionStripViewAccessor.setNeutralSuggestionStrip()
+                return
+            }
 
-        try {
             var transformerWeight = context.getSetting(BinaryDictTransformerWeightSetting)
 
             val holder = AsyncResultHolder<SuggestedWords?>("Suggest")
+
             inputLogic.getSuggestedWords(
                 settings.current,
-                keyboardSwitcher.keyboard,
+                keyboardSwitcher.keyboard ?: return,
                 keyboardSwitcher.keyboardShiftMode,
                 values.inputStyle,
                 SuggestedWords.NOT_A_SEQUENCE_NUMBER