erabo/spiegel-keyman
1
0
Fork 0
mirror of https://github.com/keymanapp/keyman.git synced 2026-10-06 14:07:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

packageID fixes

Browse source 
Quote packageID for JS call. And assign undefined packageID to `cloud`
This commit is contained in:
darcywong00 2017-11-29 11:18:55 +07:00
parent 7d6aa35486
commit 1db048f1b9
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
android/KMEA/app/src/main/java/com/tavultesoft/kmea/KMKeyboard.java
View file

@ -293,7 +293,7 @@ final class KMKeyboard extends WebView {
if (oFont.equals("''")) {
oFont = "undefined";
}
String jsFormat = "javascript:setKeymanLanguage('%s','%s','%s','%s','%s', %s, %s, %s)";
String jsFormat = "javascript:setKeymanLanguage('%s','%s','%s','%s','%s', %s, %s, '%s')";
String jsString = String.format(jsFormat, keyboardName, keyboardID, languageName, languageID, keyboardVersion, tFont, oFont, packageID);
loadUrl(jsString);
if (KMManager.isDebugMode()) {
@ -386,7 +386,7 @@ final class KMKeyboard extends WebView {
if (oFont.equals("''")) {
oFont = "undefined";
}
String jsFormat = "javascript:setKeymanLanguage('%s','%s','%s','%s','%s', %s, %s, %s)";
String jsFormat = "javascript:setKeymanLanguage('%s','%s','%s','%s','%s', %s, %s, '%s')";
String jsString = String.format(jsFormat, keyboardName.replace("'", "\\'"), keyboardID, languageName.replace("'", "\\'"), languageID, keyboardVersion, tFont, oFont, packageID);
loadUrl(jsString);
if (KMManager.isDebugMode()) {

7
android/KMEA/app/src/main/java/com/tavultesoft/kmea/KeyboardPickerActivity.java
View file

@ -487,7 +487,12 @@ public final class KeyboardPickerActivity extends Activity implements OnKeyboard
}
if (keyboardsList != null && index < keyboardsList.size()) {
return keyboardsList.get(index);
HashMap<String, String> kbInfo = keyboardsList.get(index);
String pkgID = kbInfo.get(KMManager.KMKey_PackageID);
if (pkgID == null || pkgID.isEmpty()) {
kbInfo.put(KMManager.KMKey_PackageID, KMManager.KMDefault_LegacyPackageID);
}
return kbInfo;
}
return null;