chore: merge master into linux-mcompile 🐘

HISTORY.md

@@ -1,5 +1,61 @@
 # Keyman Version History
 
+## 17.0.226 alpha 2023-12-07
+
+* fix(web): accidental suggestion-banner retoggle when disabling predictions (#10014)
+* fix(web): Fix null error with legacy keyboards (#10141)
+
+## 17.0.225 alpha 2023-12-06
+
+* feat(developer): Multi-process model for projects (#10114)
+* fix(developer): prevent opening .kpj in multiple processes (#10137)
+* fix(android/app): InfoActivity pass external links to browser (#10153)
+
+## 17.0.224 alpha 2023-12-05
+
+* chore(linux): Update debian changelog (#10121)
+
+## 17.0.223 alpha 2023-12-04
+
+* chore(web): Add option to create test coverage report file (#10124)
+
+## 17.0.222 alpha 2023-12-02
+
+* fix(common): publish @keymanapp/developer-utils as npm module (#10118)
+
+## 17.0.221 alpha 2023-12-01
+
+* chore(windows): removed cached context windows engine (#10065)
+* change(android): flishy flashy mitigation, round 1 (#10017)
+* change(android): smoother keyboard initialization (#10022)
+* fix(android): no suggestions available when swapping pred-text target language (#10061)
+* chore(developer): require project file to exist (#10092)
+* chore(linux): Add support for loong64 architecture (#10109)
+* fix(web): Don't throw errors after detach (#10086)
+
+## 17.0.220 alpha 2023-11-30
+
+* fix(core): set_if_needed updates an empty cached context (#10098)
+* fix(core): check for null termination (#10101)
+
+## 17.0.219 alpha 2023-11-29
+
+* fix(developer): path separator for kmc-package (#10064)
+* fix(developer): projects 2.0 internal path enumeration (#10016)
+* fix(web): Fix attachment-api tests (#10085)
+* fix(web): Also move source map (#10089)
+
+## 17.0.218 alpha 2023-11-27
+
+* feat(developer): ldml: err/hint on illegal/pua chars (#10029)
+
+## 17.0.217 alpha 2023-11-24
+
+* feat(developer): warn on usage of virtual keys in rule output (#10062)
+* fix(core): memory management of options in action struct (#10073)
+* chore(linux): Update debian changelog (#10047)
+* chore(core): Add test keyboard for text selection tests (#10026)
+
 ## 17.0.216 alpha 2023-11-23
 
 * fix(common): kmx struct alignment (#9977)

VERSION.md

@@ -1 +1 @@
-17.0.217
+17.0.227

android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/InfoActivity.java

@@ -7,7 +7,9 @@
 import com.keyman.engine.BaseActivity;
 
 import android.content.Context;
+import android.content.Intent;
 import android.graphics.Bitmap;
+import android.net.Uri;
 import android.os.Bundle;
 import android.view.View;
 import android.webkit.WebChromeClient;
@@ -87,9 +89,20 @@ public void onReceivedError(WebView view, int errorCode, String description, Str
 
       @Override
       public boolean shouldOverrideUrlLoading(WebView view, String url) {
-        if (url != null && !url.toLowerCase().equals("about:blank")) {
+        String lowerURL = url.toLowerCase();
+        if (lowerURL.equals("about:blank")) {
+          return true; // never load a blank page, e.g. when the component initializes
+        }
+
+        Uri uri = Uri.parse(url);
+
+        // All links that aren't internal Keyman help links open in user's browser
+        if (!url.contains(htmlPath)) {
+          Intent intent = new Intent(Intent.ACTION_VIEW, uri);
+          startActivity(intent);
+        } else {
           view.loadUrl(url);
-         }
+        }
 
         return true;
       }

android/KMEA/app/src/main/assets/android-host.js

@@ -34,6 +34,10 @@ function init() {
   keyman.getOskHeight = getOskHeight;
   keyman.getOskWidth = getOskWidth;
   keyman.beepKeyboard = beepKeyboard;
+
+  // Readies the keyboard stub for instant loading during the init process.
+  KeymanWeb.registerStub(JSON.parse(jsInterface.initialKeyboard()));
+
   keyman.init({
     'embeddingApp':device,
     'fonts':'packages/',
@@ -102,7 +106,7 @@ function setBannerHeight(h) {
 
     if (keyman.osk) {
       keyman.osk.bannerView.activeBannerHeight = bannerHeight;
-    }  
+    }
   }
 
   // Refresh KMW's OSK
@@ -149,8 +153,8 @@ function onStateChange(change) {
   keyman.refreshOskLayout();
 
   fragmentToggle = (fragmentToggle + 1) % 100;
-  if(change != 'configured') { // doesn't change the display; only initiates suggestions.
-    window.location.hash = 'refreshBannerHeight-'+fragmentToggle+'+change='+change;
+  if(change != 'configured') {
+    window.location.hash = 'refreshBannerHeight-'+fragmentToggle;
   }
 }
 

android/KMEA/app/src/main/java/com/keyman/engine/KMKeyboard.java

@@ -66,7 +66,7 @@ final class KMKeyboard extends WebView {
   private boolean shouldIgnoreSelectionChange = false;
 
   protected KeyboardType keyboardType = KeyboardType.KEYBOARD_TYPE_UNDEFINED;
-  protected ArrayList<String> javascriptAfterLoad = new ArrayList<String>();
+  protected ArrayList<String> javascriptAfterLoad = new ArrayList<>();
 
   private static String currentKeyboard = null;
 
@@ -214,10 +214,8 @@ public boolean onConsoleMessage(ConsoleMessage cm) {
         }
 
         // Send console errors to Sentry in case they're missed by KMW sentryManager
-        // (Ignoring spurious message "No keyboard stubs exist = ...")
-        // TODO: Fix base error rather than trying to ignore it "No keyboard stubs exist"
 
-        if ((cm.messageLevel() == ConsoleMessage.MessageLevel.ERROR) && (!cm.message().startsWith("No keyboard stubs exist"))) {
+        if (cm.messageLevel() == ConsoleMessage.MessageLevel.ERROR) {
           // Make Toast notification of error and send log about falling back to default keyboard (ignore language ID)
           // Sanitize sourceId info
           String NAVIGATION_PATTERN = "^(.*)?(keyboard\\.html#[^-]+)-.*$";
@@ -302,15 +300,21 @@ public void callJavascriptAfterLoad() {
       this.postDelayed(new Runnable() {
         @Override
         public void run() {
-          if(javascriptAfterLoad.size() > 0) {
-            loadUrl("javascript:" + javascriptAfterLoad.get(0));
-            javascriptAfterLoad.remove(0);
-            // Make sure we didn't reset the page in the middle of the queue!
-            if(keyboardSet) {
-              if (javascriptAfterLoad.size() > 0) {
-                callJavascriptAfterLoad();
-              }
-            }
+          StringBuilder allCalls = new StringBuilder();
+          if(javascriptAfterLoad.size() == 0) {
+            return;
+          }
+
+          while(javascriptAfterLoad.size() > 0) {
+            String entry = javascriptAfterLoad.remove(0);
+            allCalls.append(entry);
+            allCalls.append(";");
+          }
+
+          loadUrl("javascript:" + allCalls.toString());
+
+          if(javascriptAfterLoad.size() > 0 && keyboardSet) {
+            callJavascriptAfterLoad();
           }
         }
       }, 1);

android/KMEA/app/src/main/java/com/keyman/engine/KMKeyboardJSHandler.java

@@ -1,6 +1,7 @@
 package com.keyman.engine;
 
 import android.content.Context;
+import android.content.SharedPreferences;
 import android.os.Build;
 import android.os.Handler;
 import android.os.Looper;
@@ -20,6 +21,7 @@
 import static android.content.Context.VIBRATOR_SERVICE;
 
 import com.keyman.engine.KMManager.KeyboardType;
+import com.keyman.engine.data.Keyboard;
 import com.keyman.engine.util.CharSequenceUtil;
 import com.keyman.engine.util.KMLog;
 
@@ -62,6 +64,21 @@ public int getKeyboardWidth() {
     return kbWidth;
   }
 
+  @JavascriptInterface
+  public String initialKeyboard() {
+    // Note:  KMManager.getCurrentKeyboard() (and similar) will throw errors until the host-page is first fully
+    // loaded and has set a keyboard.  To allow the host-page to have earlier access, we instead get the stored
+    // keyboard index directly.
+    SharedPreferences prefs = context.getSharedPreferences(context.getString(R.string.kma_prefs_name), Context.MODE_PRIVATE);
+    int index = prefs.getInt(KMManager.KMKey_UserKeyboardIndex, 0);
+    if (index < 0) {
+      index = 0;
+    }
+
+    Keyboard kbd = KMManager.getKeyboardInfo(this.context, index);
+    return kbd.toStub(context);
+  }
+
   // This annotation is required in Jelly Bean and later:
   @JavascriptInterface
   public void beepKeyboard() {

android/KMEA/app/src/main/java/com/keyman/engine/KMKeyboardWebViewClient.java

@@ -164,16 +164,13 @@ public boolean shouldOverrideUrlLoading(WebView view, String url) {
       // for the rest of the lifetime of this keyboard instance.
       kmKeyboard.setShouldShowHelpBubble(false);
     } else if (url.indexOf("refreshBannerHeight") >= 0) {
-      int start = url.indexOf("change=") + 7;
-      String change = url.substring(start);
-      boolean isModelActive = change.equals("active");
       // appContext instead of context?
       SharedPreferences prefs = context.getSharedPreferences(context.getString(R.string.kma_prefs_name), Context.MODE_PRIVATE);
       boolean modelPredictionPref = false;
       if (KMManager.currentLexicalModel != null) {
         modelPredictionPref = prefs.getBoolean(KMManager.getLanguagePredictionPreferenceKey(KMManager.currentLexicalModel.get(KMManager.KMKey_LanguageID)), true);
       }
-      KMManager.setBannerOptions(isModelActive && modelPredictionPref);
+      KMManager.setBannerOptions(modelPredictionPref);
       RelativeLayout.LayoutParams params = KMManager.getKeyboardLayoutParams();
       kmKeyboard.setLayoutParams(params);
     } else if (url.indexOf("suggestPopup") >= 0) {

android/KMEA/app/src/main/java/com/keyman/engine/KMManager.java

@@ -776,12 +776,10 @@ public static void onConfigurationChanged(Configuration newConfig) {
     // KMKeyboard
     if (InAppKeyboard != null) {
       RelativeLayout.LayoutParams params = getKeyboardLayoutParams();
-      InAppKeyboard.setLayoutParams(params);
       InAppKeyboard.onConfigurationChanged(newConfig);
     }
     if (SystemKeyboard != null) {
       RelativeLayout.LayoutParams params = getKeyboardLayoutParams();
-      SystemKeyboard.setLayoutParams(params);
       SystemKeyboard.onConfigurationChanged(newConfig);
     }
   }
@@ -1386,12 +1384,14 @@ public static boolean registerLexicalModel(HashMap<String, String> lexicalModelI
     RelativeLayout.LayoutParams params;
     if (isKeyboardLoaded(KeyboardType.KEYBOARD_TYPE_INAPP) && !InAppKeyboard.shouldIgnoreTextChange() && modelFileExists) {
       params = getKeyboardLayoutParams();
-      InAppKeyboard.setLayoutParams(params);
+
+      // Do NOT re-layout here; it'll be triggered once the banner loads.
       InAppKeyboard.loadJavascript(KMString.format("enableSuggestions(%s, %s, %s)", model, mayPredict, mayCorrect));
     }
     if (isKeyboardLoaded(KeyboardType.KEYBOARD_TYPE_SYSTEM) && !SystemKeyboard.shouldIgnoreTextChange() && modelFileExists) {
       params = getKeyboardLayoutParams();
-      SystemKeyboard.setLayoutParams(params);
+
+      // Do NOT re-layout here; it'll be triggered once the banner loads.
       SystemKeyboard.loadJavascript(KMString.format("enableSuggestions(%s, %s, %s)", model, mayPredict, mayCorrect));
     }
     return true;

android/KMEA/app/src/main/java/com/keyman/engine/KeyboardPickerActivity.java

@@ -51,6 +51,7 @@
 import androidx.appcompat.widget.Toolbar;
 
 public final class KeyboardPickerActivity extends BaseActivity {
+  private boolean hasDeleted = false;
 
   //TODO: view instances should not be static
   private static Toolbar toolbar = null;
@@ -123,7 +124,7 @@ public void onCreate(Bundle savedInstanceState) {
     listView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
       @Override
       public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-        switchKeyboard(position,dismissOnSelect && ! KMManager.isTestMode());
+        switchKeyboard(position);
         if (dismissOnSelect)
           finish();
       }
@@ -140,6 +141,7 @@ public boolean onItemLongClick(AdapterView<?> parent, View view, final int posit
             public boolean onMenuItemClick(MenuItem item) {
               if (item.getItemId() == R.id.popup_delete) {
                 deleteKeyboard(context, position);
+                KeyboardPickerActivity.this.hasDeleted = true;
                 return true;
               } else {
                 return false;
@@ -267,11 +269,16 @@ protected void onResume() {
   protected void onPause() {
     super.onPause();
 
-    if (KMManager.InAppKeyboard != null) {
-      KMManager.InAppKeyboard.loadKeyboard();
-    }
-    if (KMManager.SystemKeyboard != null) {
-      KMManager.SystemKeyboard.loadKeyboard();
+    if (this.hasDeleted) {
+      this.hasDeleted = false;
+
+      if (KMManager.InAppKeyboard != null) {
+        KMManager.InAppKeyboard.loadKeyboard();
+      }
+
+      if (KMManager.SystemKeyboard != null) {
+        KMManager.SystemKeyboard.loadKeyboard();
+      }
     }
   }
 
@@ -335,7 +342,7 @@ private static void setSelection(int position) {
    * @param position the keyboard index in list
    * @param aPrepareOnly prepare switch, it is executed on keyboard reload
    */
-  private static void switchKeyboard(int position, boolean aPrepareOnly) {
+  private static void switchKeyboard(int position) {
     setSelection(position);
     int size = KeyboardController.getInstance().get().size();
     int listPosition = (position >= size) ? size-1 : position;
@@ -344,10 +351,7 @@ private static void switchKeyboard(int position, boolean aPrepareOnly) {
     String kbId = kbInfo.getKeyboardID();
     String langId = kbInfo.getLanguageID();
     String kbName = kbInfo.getKeyboardName();
-    if(aPrepareOnly)
-      KMManager.prepareKeyboardSwitch(pkgId, kbId, langId, kbName);
-    else
-      KMManager.setKeyboard(kbInfo);
+    KMManager.setKeyboard(kbInfo);
   }
 
   protected static boolean addKeyboard(Context context, Keyboard keyboardInfo) {
@@ -449,7 +453,7 @@ protected static void deleteKeyboard(Context context, int position) {
         adapter.notifyDataSetChanged();
       }
       if (position == curKbPos) {
-        switchKeyboard(0,false);
+        switchKeyboard(0);
       } else if(listView != null) { // A bit of a hack, since LanguageSettingsActivity calls this method too.
         curKbPos = KeyboardController.getInstance().getKeyboardIndex(KMKeyboard.currentKeyboard());
         setSelection(curKbPos);