From 71fd37e1acf74a4ced59f98356b18b951c964844 Mon Sep 17 00:00:00 2001 From: sspanak Date: Thu, 18 Jul 2024 14:55:20 +0300 Subject: [PATCH] Revert "attempting to fix the 'priviliged options must be set at most once' problem" This reverts commit 768efb6adaf1c36217090965d971363a2337cc49. --- .../io/github/sspanak/tt9/ime/TypingHandler.java | 12 +----------- .../java/io/github/sspanak/tt9/ime/UiHandler.java | 2 +- .../io/github/sspanak/tt9/util/SystemSettings.java | 3 ++- 3 files changed, 4 insertions(+), 13 deletions(-) diff --git a/app/src/main/java/io/github/sspanak/tt9/ime/TypingHandler.java b/app/src/main/java/io/github/sspanak/tt9/ime/TypingHandler.java index c6ccc968..cfc76270 100644 --- a/app/src/main/java/io/github/sspanak/tt9/ime/TypingHandler.java +++ b/app/src/main/java/io/github/sspanak/tt9/ime/TypingHandler.java @@ -22,7 +22,6 @@ import io.github.sspanak.tt9.ime.modes.ModePredictive; import io.github.sspanak.tt9.languages.Language; import io.github.sspanak.tt9.languages.LanguageCollection; import io.github.sspanak.tt9.ui.UI; -import io.github.sspanak.tt9.util.SystemSettings; import io.github.sspanak.tt9.util.Text; public abstract class TypingHandler extends KeyPadHandler { @@ -33,7 +32,6 @@ public abstract class TypingHandler extends KeyPadHandler { @NonNull protected TextField textField = new TextField(null, null); @NonNull protected TextSelection textSelection = new TextSelection(this,null); protected SuggestionOps suggestionOps; - boolean isEnabled = false; // input protected ArrayList allowedInputModes = new ArrayList<>(); @@ -51,19 +49,11 @@ public abstract class TypingHandler extends KeyPadHandler { protected boolean shouldBeOff() { - return !isEnabled || currentInputConnection == null || mInputMode.isPassthrough(); - } - - @Override - protected void onInit() { - super.onInit(); - isEnabled = SystemSettings.isTT9Enabled(this); + return currentInputConnection == null || mInputMode.isPassthrough(); } @Override protected boolean onStart(InputConnection connection, EditorInfo field) { - isEnabled = SystemSettings.isTT9Enabled(this); - boolean restart = textField.equals(connection, field); setInputField(connection, field); diff --git a/app/src/main/java/io/github/sspanak/tt9/ime/UiHandler.java b/app/src/main/java/io/github/sspanak/tt9/ime/UiHandler.java index 7a00f1a0..3148e6d4 100644 --- a/app/src/main/java/io/github/sspanak/tt9/ime/UiHandler.java +++ b/app/src/main/java/io/github/sspanak/tt9/ime/UiHandler.java @@ -78,7 +78,7 @@ abstract class UiHandler extends AbstractHandler { * on how much time the restart takes, this may erase the current user input. */ protected void forceShowWindow() { - if (isInputViewShown() || !shouldBeVisible() || shouldBeOff()) { + if (isInputViewShown() || !shouldBeVisible()) { return; } diff --git a/app/src/main/java/io/github/sspanak/tt9/util/SystemSettings.java b/app/src/main/java/io/github/sspanak/tt9/util/SystemSettings.java index fb151efe..763d3ae6 100644 --- a/app/src/main/java/io/github/sspanak/tt9/util/SystemSettings.java +++ b/app/src/main/java/io/github/sspanak/tt9/util/SystemSettings.java @@ -1,5 +1,6 @@ package io.github.sspanak.tt9.util; +import android.app.Activity; import android.content.Context; import android.os.Build; import android.os.LocaleList; @@ -13,7 +14,7 @@ public class SystemSettings { private static InputMethodManager inputManager; private static String packageName; - public static boolean isTT9Enabled(Context context) { + public static boolean isTT9Enabled(Activity context) { inputManager = inputManager == null ? (InputMethodManager) context.getSystemService(Context.INPUT_METHOD_SERVICE) : inputManager; packageName = packageName == null ? context.getPackageName() : packageName;