wzray/tt9
1
0
Fork 0
Code Activity

11th attempt to fix the Priviliged options crash: constant heartbeat checks while we are visible

Browse source
This commit is contained in:
sspanak 2025-06-23 14:54:51 +03:00 • committed by Dimo Karaivanov
parent 98eac9da51
commit 525f6fbf65
2 changed files with 42 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

50
app/src/main/java/io/github/sspanak/tt9/ime/TraditionalT9.java
View file

@ -28,6 +28,7 @@ public class TraditionalT9 extends MainViewHandler {
@NonNull private final Handler backgroundTasks = new Handler(Looper.getMainLooper()); @NonNull private final Handler backgroundTasks = new Handler(Looper.getMainLooper());
@NonNull private final Handler zombieDetector = new Handler(Looper.getMainLooper()); @NonNull private final Handler zombieDetector = new Handler(Looper.getMainLooper());
@NonNull private final Handler heartbeatDetector = new Handler(Looper.getMainLooper());
private boolean isDead = false; private boolean isDead = false;
private int zombieChecks = 0; private int zombieChecks = 0;
@ -131,12 +132,17 @@ public class TraditionalT9 extends MainViewHandler {
@Override @Override
protected boolean onStart(EditorInfo field) { protected boolean onStart(EditorInfo field) {
AppHacks.onStart(settings, field); if (SystemSettings.isTT9Selected(this)) {
if (zombieChecks == 0 && !SystemSettings.isTT9Selected(this)) { startHeartbeatCheck();
} else {
if (zombieChecks == 0) {
startZombieCheck(); startZombieCheck();
}
return false; return false;
} }
AppHacks.onStart(settings, field);
if (isDead || !super.onStart(field)) { if (isDead || !super.onStart(field)) {
setStatusIcon(mInputMode, mLanguage); setStatusIcon(mInputMode, mLanguage);
return false; return false;
@ -188,6 +194,8 @@ public class TraditionalT9 extends MainViewHandler {
if (zombieChecks == 0) { if (zombieChecks == 0) {
startZombieCheck(); startZombieCheck();
} }
stopHeartbeatCheck();
} }
@ -207,10 +215,31 @@ public class TraditionalT9 extends MainViewHandler {
/** /**
* On Android 11+ the IME is sometimes not killed when the user switches to a different one. * On Android 11+ onStop() and onDestroy() are sometimes not called when the user switches to a
* Here we attempt to detect if we are disabled, then hide and kill ourselves. * different IME. Here we attempt to detect if we are disabled, then hide and kill ourselves.
*/ */
protected void startZombieCheck() { private void startHeartbeatCheck() {
if (!SystemSettings.isTT9Selected(this)) {
onZombie();
} else if (!isDead && !InputModeKind.isPassthrough(mInputMode)) {
heartbeatDetector.postDelayed(this::startHeartbeatCheck, SettingsStore.ZOMBIE_HEARTBEAT_INTERVAL);
Logger.v(LOG_TAG, "===> Heart is beating");
}
}
private void stopHeartbeatCheck() {
if (!DeviceInfo.AT_LEAST_ANDROID_10 || heartbeatDetector.hasCallbacks(this::startHeartbeatCheck)) {
heartbeatDetector.removeCallbacksAndMessages(null);
Logger.d(LOG_TAG, "===> Heartbeat check stopped");
}
}
/**
* Similar to the heartbeat check, but detects if we are on when invisible or after re-init.
*/
private void startZombieCheck() {
if (zombieChecks > 0 && !SystemSettings.isTT9Selected(this)) { if (zombieChecks > 0 && !SystemSettings.isTT9Selected(this)) {
zombieChecks = 0; zombieChecks = 0;
onZombie(); onZombie();
@ -226,7 +255,7 @@ public class TraditionalT9 extends MainViewHandler {
} }
protected void onZombie() { private void onZombie() {
if (isDead) { if (isDead) {
Logger.w(LOG_TAG, "===> Already dead. Cannot kill self."); Logger.w(LOG_TAG, "===> Already dead. Cannot kill self.");
return; return;
@ -241,13 +270,12 @@ public class TraditionalT9 extends MainViewHandler {
protected void cleanUp() { protected void cleanUp() {
stopHeartbeatCheck();
zombieDetector.removeCallbacksAndMessages(null);
zombieChecks = SettingsStore.ZOMBIE_CHECK_MAX;
backgroundTasks.removeCallbacksAndMessages(null);
super.cleanUp(); super.cleanUp();
setInputField(null); setInputField(null);
backgroundTasks.removeCallbacksAndMessages(null);
zombieChecks = SettingsStore.ZOMBIE_CHECK_MAX;
zombieDetector.removeCallbacksAndMessages(null);
LanguageCollection.destroy();
DataStore.destroy();
Logger.d(LOG_TAG, "===> Final cleanup completed"); Logger.d(LOG_TAG, "===> Final cleanup completed");
} }

3
app/src/main/java/io/github/sspanak/tt9/preferences/settings/SettingsStore.java
View file

@ -43,8 +43,9 @@ public class SettingsStore extends SettingsHotkeys {
public final static int WORD_FREQUENCY_NORMALIZATION_DIVIDER = 100; // normalized frequency = WORD_FREQUENCY_MAX / WORD_FREQUENCY_NORMALIZATION_DIVIDER public final static int WORD_FREQUENCY_NORMALIZATION_DIVIDER = 100; // normalized frequency = WORD_FREQUENCY_MAX / WORD_FREQUENCY_NORMALIZATION_DIVIDER
public final static int WORD_PAIR_MAX = 1000; public final static int WORD_PAIR_MAX = 1000;
public final static int WORD_PAIR_MAX_WORD_LENGTH = 6; public final static int WORD_PAIR_MAX_WORD_LENGTH = 6;
public final static int ZOMBIE_CHECK_INTERVAL = 1500; // ms public final static int ZOMBIE_CHECK_INTERVAL = 5000; // ms
public final static int ZOMBIE_CHECK_MAX = 2; public final static int ZOMBIE_CHECK_MAX = 2;
public final static int ZOMBIE_HEARTBEAT_INTERVAL = 2000; // ms
/************* hacks *************/ /************* hacks *************/
public final static int PREFERENCES_CLICK_DEBOUNCE_TIME = 250; // ms public final static int PREFERENCES_CLICK_DEBOUNCE_TIME = 250; // ms