From 1db048f1b9c99c4ed061663f620edc0c589f6852 Mon Sep 17 00:00:00 2001
From: darcywong00 <darcy_wong@sil.org>
Date: Wed, 29 Nov 2017 11:18:55 +0700
Subject: [PATCH] packageID fixes

Quote packageID for JS call. And assign undefined packageID to `cloud`
---
 .../app/src/main/java/com/tavultesoft/kmea/KMKeyboard.java | 4 ++--
 .../java/com/tavultesoft/kmea/KeyboardPickerActivity.java  | 7 ++++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/android/KMEA/app/src/main/java/com/tavultesoft/kmea/KMKeyboard.java b/android/KMEA/app/src/main/java/com/tavultesoft/kmea/KMKeyboard.java
index 9cee36e39d..3df90c4532 100644
--- a/android/KMEA/app/src/main/java/com/tavultesoft/kmea/KMKeyboard.java
+++ b/android/KMEA/app/src/main/java/com/tavultesoft/kmea/KMKeyboard.java
@@ -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()) {
diff --git a/android/KMEA/app/src/main/java/com/tavultesoft/kmea/KeyboardPickerActivity.java b/android/KMEA/app/src/main/java/com/tavultesoft/kmea/KeyboardPickerActivity.java
index d99ca3dbf6..aa051cc6a8 100644
--- a/android/KMEA/app/src/main/java/com/tavultesoft/kmea/KeyboardPickerActivity.java
+++ b/android/KMEA/app/src/main/java/com/tavultesoft/kmea/KeyboardPickerActivity.java
@@ -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;