From f52550be1ac16e1e82b5d3e7fbde361d7503719b Mon Sep 17 00:00:00 2001
From: sspanak <doftor.livain@gmail.com>
Date: Mon, 30 Jun 2025 14:49:13 +0300
Subject: [PATCH] attempting to fix the LanguageCollection crashes

---
 .../main/java/io/github/sspanak/tt9/ime/KeyPadHandler.java   | 5 -----
 .../io/github/sspanak/tt9/languages/LanguageCollection.java  | 5 -----
 .../sspanak/tt9/preferences/screens/BaseScreenFragment.java  | 2 ++
 3 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/io/github/sspanak/tt9/ime/KeyPadHandler.java b/app/src/main/java/io/github/sspanak/tt9/ime/KeyPadHandler.java
index 414e3229..eb1ffbf5 100644
--- a/app/src/main/java/io/github/sspanak/tt9/ime/KeyPadHandler.java
+++ b/app/src/main/java/io/github/sspanak/tt9/ime/KeyPadHandler.java
@@ -6,7 +6,6 @@ import io.github.sspanak.tt9.ime.helpers.Key;
 import io.github.sspanak.tt9.preferences.screens.debug.ItemInputHandlingMode;
 import io.github.sspanak.tt9.preferences.settings.SettingsStore;
 import io.github.sspanak.tt9.util.Timer;
-import io.github.sspanak.tt9.util.sys.SystemSettings;
 
 
 abstract class KeyPadHandler extends UiHandler {
@@ -29,10 +28,6 @@ abstract class KeyPadHandler extends UiHandler {
 	 */
 	@Override
 	public void onCreate() {
-		if (!SystemSettings.isTT9Selected(this)) {
-			return;
-		}
-
 		super.onCreate();
 		settings = new SettingsStore(getApplicationContext());
 
diff --git a/app/src/main/java/io/github/sspanak/tt9/languages/LanguageCollection.java b/app/src/main/java/io/github/sspanak/tt9/languages/LanguageCollection.java
index a107d05b..631749cd 100644
--- a/app/src/main/java/io/github/sspanak/tt9/languages/LanguageCollection.java
+++ b/app/src/main/java/io/github/sspanak/tt9/languages/LanguageCollection.java
@@ -37,11 +37,6 @@ public class LanguageCollection {
 	}
 
 
-	public static void destroy() {
-		self = null;
-	}
-
-
 	@Nullable
 	public static NaturalLanguage getLanguage(String langId) {
 		try {
diff --git a/app/src/main/java/io/github/sspanak/tt9/preferences/screens/BaseScreenFragment.java b/app/src/main/java/io/github/sspanak/tt9/preferences/screens/BaseScreenFragment.java
index 3416f583..15aa75d7 100644
--- a/app/src/main/java/io/github/sspanak/tt9/preferences/screens/BaseScreenFragment.java
+++ b/app/src/main/java/io/github/sspanak/tt9/preferences/screens/BaseScreenFragment.java
@@ -6,6 +6,7 @@ import android.view.MenuItem;
 import androidx.annotation.NonNull;
 import androidx.preference.PreferenceFragmentCompat;
 
+import io.github.sspanak.tt9.languages.LanguageCollection;
 import io.github.sspanak.tt9.preferences.PreferencesActivity;
 import io.github.sspanak.tt9.preferences.custom.ScreenPreferencesList;
 import io.github.sspanak.tt9.preferences.settings.SettingsUI;
@@ -47,6 +48,7 @@ abstract public class BaseScreenFragment extends PreferenceFragmentCompat {
 
 	@Override
 	public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
+		LanguageCollection.init(getContext());
 		setHasOptionsMenu(true); // enable "back" in "onOptionsItemSelected()"
 		setPreferencesFromResource(getXml(), rootKey);