From ad6db9ded81a214e235ff543d9c956d9ebf39482 Mon Sep 17 00:00:00 2001
From: jahorton <jahorton@sil.org>
Date: Thu, 24 Jun 2021 08:10:21 +0700
Subject: [PATCH] fix(android): nextlayer for subkeys with customized layer
 setting

---
 android/KMEA/app/src/main/assets/keyboard.html                | 2 +-
 .../app/src/main/java/com/tavultesoft/kmea/KMKeyboard.java    | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/android/KMEA/app/src/main/assets/keyboard.html b/android/KMEA/app/src/main/assets/keyboard.html
index 5ff51d6930..3d6b75aec5 100644
--- a/android/KMEA/app/src/main/assets/keyboard.html
+++ b/android/KMEA/app/src/main/assets/keyboard.html
@@ -272,7 +272,7 @@
         var keyPos = x.toString() + ',' + y.toString();
         for(i=0; i<obj.length; i++)
         {
-          s=s+obj[i].layer+'-'+obj[i].id;
+          s=s+obj[i].layer+'-'+obj[i].coreID;
           if(obj[i].sp == 1 || obj[i].sp == 2) shift = true;
           if(typeof(obj[i].text) != 'undefined' && obj[i].text != null && obj[i].text != '') s=s+':'+toHex(obj[i].text);
           if(i < (obj.length -1)) s=s+';'
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 4eca175ebd..969124025f 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
@@ -1042,6 +1042,10 @@ final class KMKeyboard extends WebView {
   private String getSubkeyText(String keyID, String keyText) {
     String text = keyText;
     if (text.isEmpty()) {
+      if(keyID.indexOf("U_") != -1 && keyID.indexOf("+") != -1 ) {
+        // Chop off any appended '+____' portion of the key ID.
+        keyID = keyID.substring(0, keyID.indexOf("+"));
+      }
       text = keyID.replaceAll("U_", "\\\\u");
     }
     return text;