erabo/spiegel-keyman
1
0
Fork 0
mirror of https://github.com/keymanapp/keyman.git synced 2026-08-09 10:25:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix(android): ensure keyboard is always set after pageLoaded

Browse source 
Fixes #4819.

If the web page reloads after KMManager is initialised, it now resets
the keyboard and lexical model so they remain in sync.
This commit is contained in:
Marc Durdin 2021-04-01 10:50:48 +11:00
parent 9ebcfedd64
commit 9a61eaef8d
1 changed files with 49 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

96
android/KMEA/app/src/main/java/com/tavultesoft/kmea/KMManager.java
View file

@ -1830,37 +1830,37 @@ public final class KMManager {
KMLog.LogError(TAG, "pageLoaded and InAppKeyboard null");
return;
}
InAppKeyboard.keyboardSet = false;
currentLexicalModel = null;
if (url.startsWith("file")) { //endsWith(KMFilename_KeyboardHtml)) {
if (url.startsWith("file")) { // TODO: is this test necessary?
InAppKeyboardLoaded = true;
if (!InAppKeyboard.keyboardSet) {
SharedPreferences prefs = context.getSharedPreferences(context.getString(R.string.kma_prefs_name), Context.MODE_PRIVATE);
int index = prefs.getInt(KMManager.KMKey_UserKeyboardIndex, 0);
if (index < 0) {
index = 0;
SharedPreferences prefs = context.getSharedPreferences(context.getString(R.string.kma_prefs_name), Context.MODE_PRIVATE);
int index = prefs.getInt(KMManager.KMKey_UserKeyboardIndex, 0);
if (index < 0) {
index = 0;
}
Keyboard keyboardInfo = KMManager.getKeyboardInfo(context, index);
String langId = null;
if (keyboardInfo != null) {
langId = keyboardInfo.getLanguageID();
InAppKeyboard.setKeyboard(keyboardInfo);
} else {
// Revert to default (index 0) or fallback keyboard
keyboardInfo = KMManager.getKeyboardInfo(context, 0);
if (keyboardInfo == null) {
// Not logging to Sentry because some keyboard apps like FV don't install keyboards until the user chooses
keyboardInfo = KMManager.getDefaultKeyboard(context);
}
Keyboard keyboardInfo = KMManager.getKeyboardInfo(context, index);
String langId = null;
if (keyboardInfo != null) {
langId = keyboardInfo.getLanguageID();
InAppKeyboard.setKeyboard(keyboardInfo);
} else {
// Revert to default (index 0) or fallback keyboard
keyboardInfo = KMManager.getKeyboardInfo(context, 0);
if (keyboardInfo == null) {
// Not logging to Sentry because some keyboard apps like FV don't install keyboards until the user chooses
keyboardInfo = KMManager.getDefaultKeyboard(context);
}
if (keyboardInfo != null) {
langId = keyboardInfo.getLanguageID();
InAppKeyboard.setKeyboard(keyboardInfo);
}
}
registerAssociatedLexicalModel(langId);
}
registerAssociatedLexicalModel(langId);
Handler handler = new Handler();
handler.postDelayed(new Runnable() {
@Override
@ -2076,34 +2076,36 @@ public final class KMManager {
return;
}
if (url.startsWith("file:")) {
SystemKeyboardLoaded = true;
if (!SystemKeyboard.keyboardSet) {
SharedPreferences prefs = context.getSharedPreferences(context.getString(R.string.kma_prefs_name), Context.MODE_PRIVATE);
int index = prefs.getInt(KMManager.KMKey_UserKeyboardIndex, 0);
if (index < 0) {
index = 0;
}
Keyboard keyboardInfo = KMManager.getKeyboardInfo(context, index);
String langId = null;
if (keyboardInfo != null) {
langId = keyboardInfo.getLanguageID();
SystemKeyboard.setKeyboard(keyboardInfo);
} else {
// Revert to default (index 0) or fallback keyboard
keyboardInfo = KMManager.getKeyboardInfo(context, 0);
if (keyboardInfo == null) {
KMLog.LogError(TAG, "No keyboards installed. Reverting to fallback");
keyboardInfo = KMManager.getDefaultKeyboard(context);
}
if (keyboardInfo != null) {
langId = keyboardInfo.getLanguageID();
SystemKeyboard.setKeyboard(keyboardInfo);
}
}
SystemKeyboard.keyboardSet = false;
currentLexicalModel = null;
registerAssociatedLexicalModel(langId);
if (url.startsWith("file:")) { // TODO: is this test necessary?
SystemKeyboardLoaded = true;
SharedPreferences prefs = context.getSharedPreferences(context.getString(R.string.kma_prefs_name), Context.MODE_PRIVATE);
int index = prefs.getInt(KMManager.KMKey_UserKeyboardIndex, 0);
if (index < 0) {
index = 0;
}
Keyboard keyboardInfo = KMManager.getKeyboardInfo(context, index);
String langId = null;
if (keyboardInfo != null) {
langId = keyboardInfo.getLanguageID();
SystemKeyboard.setKeyboard(keyboardInfo);
} else {
// Revert to default (index 0) or fallback keyboard
keyboardInfo = KMManager.getKeyboardInfo(context, 0);
if (keyboardInfo == null) {
KMLog.LogError(TAG, "No keyboards installed. Reverting to fallback");
keyboardInfo = KMManager.getDefaultKeyboard(context);
}
if (keyboardInfo != null) {
langId = keyboardInfo.getLanguageID();
SystemKeyboard.setKeyboard(keyboardInfo);
}
}
registerAssociatedLexicalModel(langId);
Handler handler = new Handler();