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

fix(android): Fix Chrome version ranges for Keyman engine functionality

Browse source
This commit is contained in:
Darcy Wong 2021-08-24 14:07:35 +07:00
parent d628291868
commit 2e36fb8acf
4 changed files with 38 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/MainActivity.java
View file

@ -40,7 +40,6 @@ import com.keyman.android.DownloadIntentService;
import com.tavultesoft.kmea.util.KMLog;
import com.tavultesoft.kmea.util.KMPLink;
import com.tavultesoft.kmea.util.KMString;
import com.tavultesoft.kmea.util.WebViewUtils;
import com.tavultesoft.kmea.util.WebViewUtils.EngineWebViewVersionStatus;
import android.Manifest;
@ -780,7 +779,7 @@ public class MainActivity extends BaseActivity implements OnKeyboardEventListene
}
private void checkChromeVersion(WebView webView) {
if (WebViewUtils.getEngineWebViewVersionStatus(context, webView, "") != EngineWebViewVersionStatus.FULL) {
if (KMManager.getEngineWebViewVersionStatus() != EngineWebViewVersionStatus.FULL) {
LinearLayout updateChromeLayout = (LinearLayout) findViewById(R.id.updateChromeLayout);
updateChromeLayout.setVisibility(View.VISIBLE);

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

@ -179,6 +179,8 @@ public final class KMManager {
protected static KMKeyboard InAppKeyboard = null;
protected static KMKeyboard SystemKeyboard = null;
protected static HashMap<String, String> currentLexicalModel = null;
protected static WebViewUtils.EngineWebViewVersionStatus engineWebViewVersionStatus =
WebViewUtils.EngineWebViewVersionStatus.UNDETERMINED;
public final static String predictionPrefSuffix = ".mayPredict";
public final static String correctionPrefSuffix = ".mayCorrect";
@ -371,13 +373,20 @@ public final class KMManager {
}
/**
* Get the Keyman Engine mode based on the Chrome version
* @param aContext
* @param webView - If provided, the Chrome version of webView is deterermined
* Get the Keyman Engine mode.
* @return WebViewUtils.EngineWebViewVersionStatus
*/
public static WebViewUtils.EngineWebViewVersionStatus getEngineWebViewVersionStatus(Context aContext, WebView webView) {
return WebViewUtils.getEngineWebViewVersionStatus(aContext, webView, "");
public static WebViewUtils.EngineWebViewVersionStatus getEngineWebViewVersionStatus() {
return engineWebViewVersionStatus;
}
/**
* Set the Keyman Engine mode based on the Chrome version
* @param aContext
* @param webView - If provided, the Chrome version of the WebView is determined
*/
public static void setEngineWebViewVersionStatus(Context aContext, WebView webView) {
engineWebViewVersionStatus = WebViewUtils.getEngineWebViewVersionStatus(aContext, webView, "");
}
// Check if a keyboard namespace is reserved
@ -515,6 +524,8 @@ public final class KMManager {
InAppKeyboard.setWebViewClient(new KMInAppKeyboardWebViewClient(appContext));
InAppKeyboard.addJavascriptInterface(new KMInAppKeyboardJSHandler(appContext, InAppKeyboard), "jsInterface");
InAppKeyboard.loadKeyboard();
setEngineWebViewVersionStatus(appContext, InAppKeyboard);
}
}
@ -528,6 +539,8 @@ public final class KMManager {
SystemKeyboard.setWebViewClient(new KMSystemKeyboardWebViewClient(appContext));
SystemKeyboard.addJavascriptInterface(new KMSystemKeyboardJSHandler(appContext, SystemKeyboard), "jsInterface");
SystemKeyboard.loadKeyboard();
setEngineWebViewVersionStatus(appContext, SystemKeyboard);
}
}

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

@ -16,9 +16,10 @@ public final class WebViewUtils {
// Keyman Engine functionality based on Chrome version
public enum EngineWebViewVersionStatus {
DISABLED, // WebView doesn't support touch keyboard features
DEGRADED, // WebView supports touch keyboards but not LDML keyboards
FULL; // WebView supports touch keyboards and LDML keyboards
UNDETERMINED, // Functionality not determined yet
DISABLED, // WebView doesn't support touch keyboard features
DEGRADED, // WebView supports touch keyboards but not LDML keyboards
FULL; // WebView supports touch keyboards and LDML keyboards
}
private static final String CHROME_INSTALL_PATTERN_FORMATSTR = "^.*Chrome/([\\d.]+).*$";
@ -41,13 +42,13 @@ public final class WebViewUtils {
chromeVersion = getChromeVersion(context, webView);
}
if (FileUtils.compareVersions(chromeVersion, "57.0") == FileUtils.VERSION_GREATER) {
return EngineWebViewVersionStatus.FULL;
} else if (FileUtils.compareVersions(chromeVersion, "37.0") == FileUtils.VERSION_GREATER) {
if (FileUtils.compareVersions("37.0", chromeVersion) == FileUtils.VERSION_GREATER) {
return EngineWebViewVersionStatus.DISABLED;
} else if (FileUtils.compareVersions("57.0", chromeVersion) == FileUtils.VERSION_GREATER) {
return EngineWebViewVersionStatus.DEGRADED;
}
return EngineWebViewVersionStatus.DISABLED;
return EngineWebViewVersionStatus.FULL;
}
// Inject a meta viewport tag into the head of the file if it doesn't exist

15
android/KMEA/app/src/test/java/com/tavultesoft/kmea/util/WebViewUtilsTest.java
View file

@ -38,15 +38,22 @@ public class WebViewUtilsTest {
}
@Test
public void test_Chrome57_EngineWebViewVersionStatusDegraded() {
String chromeVersion = "57.0";
public void test_Chrome37_EngineWebViewVersionStatusDegraded() {
String chromeVersion = "37.0";
Assert.assertEquals(WebViewUtils.getEngineWebViewVersionStatus(context, null, chromeVersion),
WebViewUtils.EngineWebViewVersionStatus.DEGRADED);
}
@Test
public void test_Chrome58_EngineWebViewVersionStatusFull() {
String chromeVersion = "58.0";
public void test_Chrome56_EngineWebViewVersionStatusDegraded() {
String chromeVersion = "56.0";
Assert.assertEquals(WebViewUtils.getEngineWebViewVersionStatus(context, null, chromeVersion),
WebViewUtils.EngineWebViewVersionStatus.DEGRADED);
}
@Test
public void test_Chrome57_EngineWebViewVersionStatusFull() {
String chromeVersion = "57.0";
Assert.assertEquals(WebViewUtils.getEngineWebViewVersionStatus(context, null, chromeVersion),
WebViewUtils.EngineWebViewVersionStatus.FULL);
}