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

Merge pull request #5080 from keymanapp/cherrypick/android/5071-missing-model-file

Browse source 
fix(android/engine): Check lexical-model file exists before using 🍒
This commit is contained in:
Darcy Wong 2021-05-13 13:31:11 +07:00 • committed by GitHub
commit dceb6ed5c8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1049,7 +1049,16 @@ public final class KMManager {
String pkgID = lexicalModelInfo.get(KMKey_PackageID);
String modelID = lexicalModelInfo.get(KMKey_LexicalModelID);
String languageID = lexicalModelInfo.get(KMKey_LanguageID);
String path = "file://" + getLexicalModelsDir() + pkgID + File.separator + modelID + ".model.js";
boolean modelFileExists = true;
File modelFile = new File(getLexicalModelsDir(), pkgID + File.separator + modelID + ".model.js");
String path = "file://" + modelFile.getAbsolutePath();
// Disable sugestions if lexical-model file doesn't exist
if (!modelFile.exists()) {
modelFileExists = false;
setBannerOptions(false);
KMLog.LogError(TAG, modelFile.getAbsolutePath() + " does not exist");
}
JSONObject modelObj = new JSONObject();
JSONArray languageJSONArray = new JSONArray();
@ -1076,12 +1085,12 @@ public final class KMManager {
boolean mayCorrect = prefs.getBoolean(getLanguageCorrectionPreferenceKey(languageID), true);
RelativeLayout.LayoutParams params;
if (InAppKeyboard != null && InAppKeyboardLoaded && !InAppKeyboardShouldIgnoreTextChange) {
if (InAppKeyboard != null && InAppKeyboardLoaded && !InAppKeyboardShouldIgnoreTextChange && modelFileExists) {
params = getKeyboardLayoutParams();
InAppKeyboard.setLayoutParams(params);
InAppKeyboard.loadJavascript(KMString.format("enableSuggestions(%s, %s, %s)", model, mayPredict, mayCorrect));
}
if (SystemKeyboard != null && SystemKeyboardLoaded && !SystemKeyboardShouldIgnoreTextChange) {
if (SystemKeyboard != null && SystemKeyboardLoaded && !SystemKeyboardShouldIgnoreTextChange && modelFileExists) {
params = getKeyboardLayoutParams();
SystemKeyboard.setLayoutParams(params);
SystemKeyboard.loadJavascript(KMString.format("enableSuggestions(%s, %s, %s)", model, mayPredict, mayCorrect));