From e9066b3d52cff0be51eb68cb570797f2ca098a24 Mon Sep 17 00:00:00 2001
From: Joshua Horton <jahorton@sil.org>
Date: Wed, 5 Feb 2025 14:00:41 +0700
Subject: [PATCH 01/76] change(ios): relocates the "enter foreground"
 kbd-reload trigger

Addresses part of #12216
---
 .../Classes/Keyboard/InputViewController.swift            | 2 +-
 .../Classes/Keyboard/KeymanWebViewController.swift        | 8 --------
 .../Classes/MainViewController/MainViewController.swift   | 8 ++++++++
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/ios/engine/KMEI/KeymanEngine/Classes/Keyboard/InputViewController.swift b/ios/engine/KMEI/KeymanEngine/Classes/Keyboard/InputViewController.swift
index 16acd10f9e..98f6290276 100644
--- a/ios/engine/KMEI/KeymanEngine/Classes/Keyboard/InputViewController.swift
+++ b/ios/engine/KMEI/KeymanEngine/Classes/Keyboard/InputViewController.swift
@@ -589,7 +589,7 @@ open class InputViewController: UIInputViewController, KeymanWebDelegate {
   }
 
   // KeymanWebViewController maintenance methods
-  func reload() {
+  public func reload() {
     keymanWeb.reloadKeyboard()
   }
 
diff --git a/ios/engine/KMEI/KeymanEngine/Classes/Keyboard/KeymanWebViewController.swift b/ios/engine/KMEI/KeymanEngine/Classes/Keyboard/KeymanWebViewController.swift
index a0c8c6d5e4..72822bbbfc 100644
--- a/ios/engine/KMEI/KeymanEngine/Classes/Keyboard/KeymanWebViewController.swift
+++ b/ios/engine/KMEI/KeymanEngine/Classes/Keyboard/KeymanWebViewController.swift
@@ -72,14 +72,6 @@ class KeymanWebViewController: UIViewController {
     super.init(nibName: nil, bundle: nil)
 
     _ = view
-
-    NotificationCenter.default.addObserver(
-      forName: UIApplication.willEnterForegroundNotification,
-      object: nil,
-      queue: OperationQueue.main
-    ) { _ in
-      self.reloadKeyboard()
-    }
   }
 
   required init?(coder aDecoder: NSCoder) {
diff --git a/ios/keyman/Keyman/Keyman/Classes/MainViewController/MainViewController.swift b/ios/keyman/Keyman/Keyman/Classes/MainViewController/MainViewController.swift
index 35ee78c5db..de6f00da63 100644
--- a/ios/keyman/Keyman/Keyman/Classes/MainViewController/MainViewController.swift
+++ b/ios/keyman/Keyman/Keyman/Classes/MainViewController/MainViewController.swift
@@ -112,6 +112,14 @@ class MainViewController: UIViewController, TextViewDelegate, UIActionSheetDeleg
       forName: Notifications.keyboardRemoved,
       observer: self,
       function: MainViewController.keyboardRemoved)
+    
+    NotificationCenter.default.addObserver(
+      forName: UIApplication.willEnterForegroundNotification,
+      object: nil,
+      queue: OperationQueue.main
+    ) { _ in
+      Manager.shared.inputViewController.reload()
+    }
 
     // Unfortunately, it's the main app with the file definitions.
     // We have to gerry-rig this so that the framework-based SettingsViewController

From b8aaab6ea21caafc8cb4784664c93ca6280f737c Mon Sep 17 00:00:00 2001
From: Joshua Horton <jahorton@sil.org>
Date: Wed, 5 Feb 2025 14:01:18 +0700
Subject: [PATCH 02/76] change(ios): relocates keyboard hide+show notification
 handling

Addresses part of #12216
---
 .../Keyboard/InputViewController.swift        | 10 +++++++-
 .../Keyboard/KeymanWebViewController.swift    | 20 ---------------
 .../KMEI/KeymanEngine/Classes/Manager.swift   | 25 +++++++++++++++++++
 3 files changed, 34 insertions(+), 21 deletions(-)

diff --git a/ios/engine/KMEI/KeymanEngine/Classes/Keyboard/InputViewController.swift b/ios/engine/KMEI/KeymanEngine/Classes/Keyboard/InputViewController.swift
index 98f6290276..87794aac3b 100644
--- a/ios/engine/KMEI/KeymanEngine/Classes/Keyboard/InputViewController.swift
+++ b/ios/engine/KMEI/KeymanEngine/Classes/Keyboard/InputViewController.swift
@@ -206,7 +206,7 @@ open class InputViewController: UIInputViewController, KeymanWebDelegate {
     keymanWeb = KeymanWebViewController(storage: Storage.active)
     super.init(nibName: nibNameOrNil, bundle: nibBundleOrNil)
 
-    var message = self.hasFullAccess ? "hasFullAccess: true" : "hasFullAccess: false"
+    let message = self.hasFullAccess ? "hasFullAccess: true" : "hasFullAccess: false"
     os_log("%{public}s", log: KeymanEngineLogger.settings, type: .default, message)
     SentryManager.breadcrumb(message)
 
@@ -623,10 +623,18 @@ open class InputViewController: UIInputViewController, KeymanWebDelegate {
   func showHelpBubble() {
     keymanWeb.showHelpBubble()
   }
+  
+  func dismissHelpBubble() {
+    keymanWeb.dismissHelpBubble()
+  }
 
   func showHelpBubble(afterDelay delay: TimeInterval) {
     keymanWeb.showHelpBubble(afterDelay: delay)
   }
+  
+  internal func enforceKeyboardSize() {
+    keymanWeb.resizeKeyboard()
+  }
 
   func clearText() {
     setContextState(text: nil, range: NSRange(location: 0, length: 0))
diff --git a/ios/engine/KMEI/KeymanEngine/Classes/Keyboard/KeymanWebViewController.swift b/ios/engine/KMEI/KeymanEngine/Classes/Keyboard/KeymanWebViewController.swift
index 72822bbbfc..c0e7cefd0c 100644
--- a/ios/engine/KMEI/KeymanEngine/Classes/Keyboard/KeymanWebViewController.swift
+++ b/ios/engine/KMEI/KeymanEngine/Classes/Keyboard/KeymanWebViewController.swift
@@ -146,11 +146,6 @@ class KeymanWebViewController: UIViewController {
 
     view = webView
 
-    NotificationCenter.default.addObserver(self, selector: #selector(self.keyboardWillShow),
-                                           name: UIResponder.keyboardWillShowNotification, object: nil)
-    NotificationCenter.default.addObserver(self, selector: #selector(self.keyboardWillHide),
-                                           name: UIResponder.keyboardWillHideNotification, object: nil)
-
     reloadKeyboard()
   }
 
@@ -982,18 +977,3 @@ extension KeymanWebViewController {
     return keyboardMenuView != nil
   }
 }
-
-// MARK: - Keyboard Notifications
-extension KeymanWebViewController {
-  @objc func keyboardWillShow(_ notification: Notification) {
-    resizeKeyboard()
-
-    if Manager.shared.isKeymanHelpOn {
-      showHelpBubble(afterDelay: 1.5)
-    }
-  }
-
-  @objc func keyboardWillHide(_ notification: Notification) {
-    dismissHelpBubble()
-  }
-}
diff --git a/ios/engine/KMEI/KeymanEngine/Classes/Manager.swift b/ios/engine/KMEI/KeymanEngine/Classes/Manager.swift
index 4ab0da660b..25b1f143cb 100644
--- a/ios/engine/KMEI/KeymanEngine/Classes/Manager.swift
+++ b/ios/engine/KMEI/KeymanEngine/Classes/Manager.swift
@@ -239,10 +239,35 @@ public class Manager: NSObject, UIGestureRecognizerDelegate {
         SentryManager.capture(error, message:message)
       }
     }
+    
+    // Keep these within our singleton Manager instance.  As we never remove these,
+    // setting them within something prone to replacement (like the keyboard when in
+    // app-extension mode) can lead to memory leaks.  See #12216.
+    NotificationCenter.default.addObserver(self, selector: #selector(self.keyboardWillShow), //
+                                           name: UIResponder.keyboardWillShowNotification, object: nil)
+    NotificationCenter.default.addObserver(self, selector: #selector(self.keyboardWillHide), //
+                                           name: UIResponder.keyboardWillHideNotification, object: nil)
 
     // We used to preload the old KeymanWebViewController, but now that it's embedded within the
     // InputViewController, that's not exactly viable.
   }
+  
+  // MARK: - Keyboard Notifications
+  // Do NOT place these anywhere within InputViewController or its children.
+  // So far as we can tell, the OS causes the app extension to sometimes throw
+  // instances away, and maintaining references via notification to them can
+  // cause memory leaks.  Refer to #12216.
+  @objc func keyboardWillShow(_ notification: Notification) {
+    inputViewController?.enforceKeyboardSize()
+
+    if Manager.shared.isKeymanHelpOn {
+      inputViewController?.showHelpBubble(afterDelay: 1.5)
+    }
+  }
+
+  @objc func keyboardWillHide(_ notification: Notification) {
+    inputViewController?.dismissHelpBubble()
+  }
 
   // MARK: - Keyboard management
   

From 95dae2079ea56b9e275228b12e063852d7af0436 Mon Sep 17 00:00:00 2001
From: Joshua Horton <jahorton@sil.org>
Date: Thu, 6 Feb 2025 14:34:10 +0700
Subject: [PATCH 03/76] change(web): drop 'dom' unit test concurrency when run
 in CI mode

---
 web/src/test/auto/dom/web-test-runner.CI.config.mjs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/web/src/test/auto/dom/web-test-runner.CI.config.mjs b/web/src/test/auto/dom/web-test-runner.CI.config.mjs
index d18a8a9cb0..2ce3711078 100644
--- a/web/src/test/auto/dom/web-test-runner.CI.config.mjs
+++ b/web/src/test/auto/dom/web-test-runner.CI.config.mjs
@@ -9,5 +9,6 @@ export default {
   reporters: [
     teamcityReporter(), /* custom-written, for CI-friendly reports */
     sessionStabilityReporter({ciMode: true})
-  ]
+  ],
+  concurrency: 1
 }
\ No newline at end of file

From 3e456bbf3b0637d2abb20cee35e530124a85435e Mon Sep 17 00:00:00 2001
From: Joshua Horton <jahorton@sil.org>
Date: Fri, 7 Feb 2025 10:02:31 +0700
Subject: [PATCH 04/76] chore(web): top-level clean affects predictive-text
 child projects

Addresses parts of #12735.
---
 web/build.sh                            | 2 +-
 web/src/engine/predictive-text/build.sh | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/web/build.sh b/web/build.sh
index e6d9a5feb8..5dd30f338f 100755
--- a/web/build.sh
+++ b/web/build.sh
@@ -35,7 +35,7 @@ builder_describe "Builds engine modules for Keyman Engine for Web (KMW)." \
   ":engine/keyboard-storage  Subset used to collate keyboards and request them from the cloud" \
   ":engine/main              Builds all common code used by KMW's app/-level targets" \
   ":engine/osk               Builds the Web OSK module" \
-  ":engine/predictive-text=src/engine/predictive-text/worker-main     Builds KMW's predictive text module" \
+  ":engine/predictive-text   Builds KMW's predictive text module" \
   ":help                     Online documentation" \
   ":samples                  Builds all needed resources for the KMW sample-page set" \
   ":tools                    Builds engine-related development resources" \
diff --git a/web/src/engine/predictive-text/build.sh b/web/src/engine/predictive-text/build.sh
index 677d8b2269..015c0ea3be 100755
--- a/web/src/engine/predictive-text/build.sh
+++ b/web/src/engine/predictive-text/build.sh
@@ -53,7 +53,6 @@ builder_run_child_actions configure
 ## Build actions
 
 builder_run_child_actions build:wordbreakers
-
 builder_run_child_actions build:templates
 builder_run_child_actions build:worker-thread
 builder_run_child_actions build:worker-main

From 6cad46fcf01db149655bd64c3e18791764b70952 Mon Sep 17 00:00:00 2001
From: Joshua Horton <jahorton@sil.org>
Date: Fri, 7 Feb 2025 15:19:54 +0700
Subject: [PATCH 05/76] fix(ios): make KeyboardMenuView ref to ancestor `weak`

---
 .../Keyboard/InputViewController.swift        | 24 +++++++++++++++----
 .../Classes/Keyboard/KeyboardMenuView.swift   |  4 +++-
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/ios/engine/KMEI/KeymanEngine/Classes/Keyboard/InputViewController.swift b/ios/engine/KMEI/KeymanEngine/Classes/Keyboard/InputViewController.swift
index 87794aac3b..7923e3eb93 100644
--- a/ios/engine/KMEI/KeymanEngine/Classes/Keyboard/InputViewController.swift
+++ b/ios/engine/KMEI/KeymanEngine/Classes/Keyboard/InputViewController.swift
@@ -165,6 +165,8 @@ open class InputViewController: UIInputViewController, KeymanWebDelegate {
   // For now, should be mostly upon keymanWeb.view.heightAnchor.
   var portraitConstraint: NSLayoutConstraint?
   var landscapeConstraint: NSLayoutConstraint?
+  
+  var outerWidthConstraint: NSLayoutConstraint?
 
   private var keymanWeb: KeymanWebViewController
   private var swallowBackspaceTextChange: Bool = false
@@ -300,6 +302,16 @@ open class InputViewController: UIInputViewController, KeymanWebDelegate {
       keymanWeb.shouldReload = true
     }
   }
+  
+  open override func viewDidDisappear(_ animated: Bool) {
+    super.viewDidDisappear(animated)
+    
+    if outerWidthConstraint != nil {
+      outerWidthConstraint?.isActive = false
+      self.inputView?.removeConstraint(self.outerWidthConstraint!)
+      outerWidthConstraint = nil
+    }
+  }
 
   open override func textDidChange(_ textInput: UITextInput?) {
     // Swallows self-triggered calls from emptying the context due to keyboard rules
@@ -527,11 +539,15 @@ open class InputViewController: UIInputViewController, KeymanWebDelegate {
   }
 
   // These require the view to appear - parent and our relationship with it must exist!
+  // ... wait, is THIS possibly a leak source?
   private func setOuterConstraints() {
-    var baseWidthConstraint: NSLayoutConstraint
-    baseWidthConstraint = self.inputView!.widthAnchor.constraint(equalTo: parent!.view.safeAreaLayoutGuide.widthAnchor)
-    baseWidthConstraint.priority = UILayoutPriority(rawValue: 999)
-    baseWidthConstraint.isActive = true
+    guard outerWidthConstraint == nil else {
+      outerWidthConstraint!.isActive = true
+      return
+    }
+    outerWidthConstraint = self.inputView!.widthAnchor.constraint(equalTo: parent!.view.safeAreaLayoutGuide.widthAnchor)
+    outerWidthConstraint!.priority = UILayoutPriority(rawValue: 999)
+    outerWidthConstraint!.isActive = true
   }
 
   public var kmwHeight: CGFloat {
diff --git a/ios/engine/KMEI/KeymanEngine/Classes/Keyboard/KeyboardMenuView.swift b/ios/engine/KMEI/KeymanEngine/Classes/Keyboard/KeyboardMenuView.swift
index 397697222c..1823b143b3 100644
--- a/ios/engine/KMEI/KeymanEngine/Classes/Keyboard/KeyboardMenuView.swift
+++ b/ios/engine/KMEI/KeymanEngine/Classes/Keyboard/KeyboardMenuView.swift
@@ -26,7 +26,9 @@ class KeyboardMenuView: UIView, UITableViewDelegate, UITableViewDataSource, UIGe
   private var tableView: UITableView?
   private let closeButtonTitle: String?
 
-  private var _inputViewController: InputViewController?
+  // Is populated during init from a weak ref by KeymanWebViewController,
+  // and instances of this class are owned by the same.
+  private weak var _inputViewController: InputViewController?
   override var inputViewController: InputViewController? {
     return _inputViewController
   }

From f36c54b6c641c539ab233529b6c61ab03ea4f4ca Mon Sep 17 00:00:00 2001
From: Joshua Horton <jahorton@sil.org>
Date: Mon, 10 Feb 2025 14:55:04 +0700
Subject: [PATCH 06/76] change(ios): mitigate keyboard input-view memory leak
 by force-discarding WebView

Related-to: #12216
---
 .../Keyboard/InputViewController.swift        | 60 ++++++++++++-------
 .../Keyboard/KeymanWebViewController.swift    | 12 ++++
 .../KMEI/KeymanEngine/Classes/Manager.swift   |  1 +
 3 files changed, 51 insertions(+), 22 deletions(-)

diff --git a/ios/engine/KMEI/KeymanEngine/Classes/Keyboard/InputViewController.swift b/ios/engine/KMEI/KeymanEngine/Classes/Keyboard/InputViewController.swift
index 7923e3eb93..a51db67141 100644
--- a/ios/engine/KMEI/KeymanEngine/Classes/Keyboard/InputViewController.swift
+++ b/ios/engine/KMEI/KeymanEngine/Classes/Keyboard/InputViewController.swift
@@ -41,6 +41,16 @@ private class CustomInputView: UIInputView, UIInputViewAudioFeedback {
     super.init(coder: coder)
   }
 
+  public func destroy() {
+    // In app-extension mode, there are scenarios in which this class does not properly
+    // deallocate!  We need to help that process along.  In particular, doing this allows
+    // us to guarantee that the WebView is allowed to be GC'd, even when Apple fails to GC
+    // this (`CustomInputView`) instance - which actually happens.  (Refer to #12216.)
+    keymanWeb.removeFromParent()
+    keymanWeb.destroy()
+    keymanWeb = nil
+  }
+
   public var enableInputClicksWhenVisible: Bool {
     get {
       // Implemented as noted by https://developer.apple.com/documentation/uikit/uidevice/1620050-playinputclick.
@@ -98,37 +108,37 @@ private class CustomInputView: UIInputView, UIInputViewAudioFeedback {
    */
   func keyboardHeightChanged() {
     os_log("CustomInputView keyboardHeightChanged", log: KeymanEngineLogger.ui, type: .info)
-    
+
     // deactivate constraints for both orientations (though one should already be inactive)
     landscapeConstraint?.isActive = false
     portraitConstraint?.isActive = false
- 
+
     // rebuild both portrait and landscape constraints
     self.buildKeyboardHeightConstraints(bannerHeight: InputViewController.topBarHeight)
-    
+
     // activate constraints for the current orientation
     if InputViewController.isPortrait {
       portraitConstraint?.isActive = true
     } else {
       landscapeConstraint?.isActive = true
     }
-    
+
     self.setNeedsLayout()
   }
-  
+
   private func buildKeyboardHeightConstraints(bannerHeight: CGFloat) {
     os_log("CustomInputView buildKeyboardHeightConstraints", log: KeymanEngineLogger.ui, type: .info)
     let innerView = keymanWeb.view!
-    
+
     // Cannot be met by the in-app keyboard, but helps to 'force' height for the system keyboard.
     let portraitHeightConstraint = innerView.heightAnchor.constraint(equalToConstant: bannerHeight +  keymanWeb.readKeyboardHeight(isPortrait: true)!)
     portraitHeightConstraint.identifier = "Height constraint for portrait mode"
     portraitHeightConstraint.priority = .defaultHigh
-    
+
     let landscapeHeightConstraint = innerView.heightAnchor.constraint(equalToConstant: bannerHeight + keymanWeb.readKeyboardHeight(isPortrait: false)!)
     landscapeHeightConstraint.identifier = "Height constraint for landscape mode"
     landscapeHeightConstraint.priority = .defaultHigh
-    
+
     portraitConstraint = portraitHeightConstraint
     landscapeConstraint = landscapeHeightConstraint
     // .isActive will be set according to the current portrait/landscape perspective.
@@ -165,7 +175,7 @@ open class InputViewController: UIInputViewController, KeymanWebDelegate {
   // For now, should be mostly upon keymanWeb.view.heightAnchor.
   var portraitConstraint: NSLayoutConstraint?
   var landscapeConstraint: NSLayoutConstraint?
-  
+
   var outerWidthConstraint: NSLayoutConstraint?
 
   private var keymanWeb: KeymanWebViewController
@@ -219,6 +229,12 @@ open class InputViewController: UIInputViewController, KeymanWebDelegate {
     fatalError("init(coder:) has not been implemented")
   }
 
+  deinit {
+    inputView?.removeFromSuperview()
+    (inputView as? CustomInputView)?.destroy()
+    inputView = nil
+  }
+
   open override func updateViewConstraints() {
     resetKeyboardState()
 
@@ -302,10 +318,10 @@ open class InputViewController: UIInputViewController, KeymanWebDelegate {
       keymanWeb.shouldReload = true
     }
   }
-  
+
   open override func viewDidDisappear(_ animated: Bool) {
     super.viewDidDisappear(animated)
-    
+
     if outerWidthConstraint != nil {
       outerWidthConstraint?.isActive = false
       self.inputView?.removeConstraint(self.outerWidthConstraint!)
@@ -380,7 +396,7 @@ open class InputViewController: UIInputViewController, KeymanWebDelegate {
       }
     }
   }
-  
+
   func deleteSelection() -> Bool {
     if let selected = textDocumentProxy.selectedText, selected.count > 0 {
       /*
@@ -393,23 +409,23 @@ open class InputViewController: UIInputViewController, KeymanWebDelegate {
       /*
         We have a problem to resolve here: we cannot simply delete the selection
         with either .deleteBackward() or .insertText(""):
-       
+
         - If there is selected text immediately following a space (U+0020),
           .deleteBackward() will delete that space IN ADDITION to the selected text.
         - Unlike .insertText("-any-string-here"), .insertText("") does nothing;
           it does not replace the selection with the new string.
-       
+
         Our policy (#9073) on handling the backspace key when there is a
         text selection is to just delete the selection. We have to override
         the special case of space being deleted by .deleteBackward() ourselves.
         Additionally, the internal Web engine cannot anticipate the special
         case and requires precise and consistent backspace handling in line
         with our policy in order to keep the context on both sides synchronized.
-       
+
         As .insertText() does not delete the selection if the string to
         be inserted is empty, we insert something that won't combine,
         like a ZWNJ, and then delete it.
-       
+
         iOS does not allow users to select text in a way that splits
         character clusters.  This implies that it's impossible for an
         inserted ZWNJ to combine with existing context, making this
@@ -417,14 +433,14 @@ open class InputViewController: UIInputViewController, KeymanWebDelegate {
       */
       textDocumentProxy.insertText("\u{200c}")
       textDocumentProxy.deleteBackward()
-      
+
       let afterManipulation = textDocumentProxy.documentContextBeforeInput ?? ""
-      
+
       // And now to finish our 'canary' check.
       if beforeManipulation != afterManipulation {
         os_log(.error, log: KeymanEngineLogger.engine, "Could not cleanly execute backspace for selected text")
       }
-      
+
       return true
     }
     return false
@@ -576,7 +592,7 @@ open class InputViewController: UIInputViewController, KeymanWebDelegate {
       customInputView.keyboardHeightChanged()
     }
   }
-  
+
   func fixLayout() {
     view.setNeedsLayout()
     view.layoutIfNeeded()
@@ -639,7 +655,7 @@ open class InputViewController: UIInputViewController, KeymanWebDelegate {
   func showHelpBubble() {
     keymanWeb.showHelpBubble()
   }
-  
+
   func dismissHelpBubble() {
     keymanWeb.dismissHelpBubble()
   }
@@ -647,7 +663,7 @@ open class InputViewController: UIInputViewController, KeymanWebDelegate {
   func showHelpBubble(afterDelay delay: TimeInterval) {
     keymanWeb.showHelpBubble(afterDelay: delay)
   }
-  
+
   internal func enforceKeyboardSize() {
     keymanWeb.resizeKeyboard()
   }
diff --git a/ios/engine/KMEI/KeymanEngine/Classes/Keyboard/KeymanWebViewController.swift b/ios/engine/KMEI/KeymanEngine/Classes/Keyboard/KeymanWebViewController.swift
index c0e7cefd0c..7e18751440 100644
--- a/ios/engine/KMEI/KeymanEngine/Classes/Keyboard/KeymanWebViewController.swift
+++ b/ios/engine/KMEI/KeymanEngine/Classes/Keyboard/KeymanWebViewController.swift
@@ -173,6 +173,18 @@ class KeymanWebViewController: UIViewController {
 
 // MARK: - JavaScript functions
 extension KeymanWebViewController {
+  // In app-extension mode, there are scenarios in which this class does not properly
+  // deallocate!  We need to help that process along.
+  func destroy() {
+    // Message handlers can maintain references.
+    if #available(iOSApplicationExtension 14.0, *) {
+      self.userContentController.removeAllScriptMessageHandlers()
+    } else {
+      self.userContentController.removeScriptMessageHandler(forName: keymanWebViewName)
+    }
+    view = nil
+  }
+  
   func languageMenuPosition(_ completion: @escaping (CGRect) -> Void) {
     webView!.evaluateJavaScript("langMenuPos();") { result, _ in
       guard let result = result as? String, !result.isEmpty else {
diff --git a/ios/engine/KMEI/KeymanEngine/Classes/Manager.swift b/ios/engine/KMEI/KeymanEngine/Classes/Manager.swift
index 25b1f143cb..adfdad596c 100644
--- a/ios/engine/KMEI/KeymanEngine/Classes/Manager.swift
+++ b/ios/engine/KMEI/KeymanEngine/Classes/Manager.swift
@@ -165,6 +165,7 @@ public class Manager: NSObject, UIGestureRecognizerDelegate {
     }
 
     set(value) {
+      // The system keyboard will set itself here when its `viewDidAppear` triggers.
       _inputViewController = value
     }
   }

From 342f216291a5608162098c3940f953bb44a6c493 Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Tue, 11 Feb 2025 14:14:15 +0700
Subject: [PATCH 07/76] chore: increment to alpha 19.0

---
 VERSION.md                                 |  2 +-
 android/docs/engine/guides/in-app/index.md |  6 ++--
 android/docs/engine/index.md               |  2 +-
 android/docs/engine/whatsnew.md            |  7 +---
 android/docs/help/about/whatsnew.md        |  7 ++--
 android/docs/help/index.md                 |  2 +-
 developer/docs/help/index.md               |  4 +--
 developer/docs/help/whats-new.md           | 42 ++--------------------
 developer/src/kmc/src/kmlmp.ts             |  2 +-
 docs/minimum-versions.md                   |  2 +-
 docs/minimum-versions.md.in                |  2 +-
 ios/docs/engine/index.md                   |  2 +-
 ios/docs/help/about/whatsnew.md            |  7 ++--
 ios/docs/help/index.md                     |  2 +-
 linux/docs/help/about/whatsnew.md          |  4 +--
 linux/docs/help/index.md                   |  2 +-
 mac/docs/help/about/whatsnew.md            |  4 +--
 mac/docs/help/index.md                     |  2 +-
 resources/build/minimum-versions.inc.sh    |  2 +-
 web/docs/engine/guide/index.md             |  6 ++--
 web/docs/engine/index.md                   | 12 +++----
 web/docs/engine/reference/core/version.md  |  2 +-
 web/docs/engine/reference/index.md         |  2 +-
 web/docs/engine/whats-new.md               |  2 +-
 windows/docs/engine/api/index.md           |  6 ++--
 windows/docs/engine/index.md               |  4 +--
 windows/docs/help/about/whatsnew.md        |  4 +--
 windows/docs/help/index.md                 |  2 +-
 28 files changed, 47 insertions(+), 96 deletions(-)

diff --git a/VERSION.md b/VERSION.md
index b9cdf8a8b6..b2c7e01f85 100644
--- a/VERSION.md
+++ b/VERSION.md
@@ -1 +1 @@
-18.0.189
\ No newline at end of file
+19.0.1
\ No newline at end of file
diff --git a/android/docs/engine/guides/in-app/index.md b/android/docs/engine/guides/in-app/index.md
index d788e267bb..538094ddbb 100644
--- a/android/docs/engine/guides/in-app/index.md
+++ b/android/docs/engine/guides/in-app/index.md
@@ -6,8 +6,8 @@ Keyman Engine for Android allows you to use any Keyman touch keyboard in your An
 system keyboard app for purchase in the Play Store.<br/>
 This guide will walk you through the steps for creating your first Android app with Keyman Engine for Android.
 
-If you are not familiar with Android development, you will find the 
-[Android Developer online training](https://developer.android.com/training/index.html) an invaluable 
+If you are not familiar with Android development, you will find the
+[Android Developer online training](https://developer.android.com/training/index.html) an invaluable
 resource, and working through some of their tutorials first will help you with the rest of this guide.
 
 ### 1. Install Free Tools
@@ -131,5 +131,5 @@ And there you have it: your first Keyman Engine for Android app!
 ## See Also
 * [Guide: Build a system keyboard app](../system-keyboard/)
 * [Keyman Developer Documentation](/developer/17.0/)
-* [Keyman Engine for Android Documentation](/developer/engine/android/18.0/)
+* [Keyman Engine for Android Documentation](/developer/engine/android/19.0/)
 * [Android Developer Home](https://developer.android.com/index.html)
diff --git a/android/docs/engine/index.md b/android/docs/engine/index.md
index fa549e4b34..38f255592b 100644
--- a/android/docs/engine/index.md
+++ b/android/docs/engine/index.md
@@ -4,7 +4,7 @@ title: Keyman Engine for Android
 
 ## Overview
 
-Keyman Engine for Android 18.0 is a Java library for Android 5.0 and later versions which enables a fully customisable keyboard layout, both within an app and system-wide.
+Keyman Engine for Android 19.0 is a Java library for Android 5.0 and later versions which enables a fully customisable keyboard layout, both within an app and system-wide.
 Keyboard layouts for Keyman Engine can be created with [Keyman Developer](/developer/17.0), and a [library of existing keyboard layouts](http://keyman.com/developer/keymanweb/keyboards)
 is also available.</p>
 
diff --git a/android/docs/engine/whatsnew.md b/android/docs/engine/whatsnew.md
index af3f8932d6..5d6f717f8a 100644
--- a/android/docs/engine/whatsnew.md
+++ b/android/docs/engine/whatsnew.md
@@ -1,11 +1,6 @@
 ---
-title: What's New in Keyman Engine 18.0 for Android
+title: What's New in Keyman Engine 19.0 for Android
 ---
 
-## Keyman Engine for Android Breaking Changes: ##
-
-* Change package name from `com.tavultesoft.kmea` to `com.keyman.engine` #7881
-* Update to Java 11 #8543
-
 ## See Also
 * [Keyman Engine for Android Documentation](index)
\ No newline at end of file
diff --git a/android/docs/help/about/whatsnew.md b/android/docs/help/about/whatsnew.md
index 0f0e891e42..d0ca85e93f 100644
--- a/android/docs/help/about/whatsnew.md
+++ b/android/docs/help/about/whatsnew.md
@@ -1,9 +1,6 @@
 ---
-title: What's New in Keyman 18.0 for Android
+title: What's New in Keyman 19.0 for Android
 ---
 
-Here are some of the new features we have added to Keyman 18.0 for Android:
+Here are some of the new features we have added to Keyman 19.0 for Android:
 
-* New menu to adjust longpress delay time (#12170, #12185)
-* Support localizations for right-to-left languages (#12215)
-* Handle additional actions for ENTER key (#12125, #12315)
diff --git a/android/docs/help/index.md b/android/docs/help/index.md
index 62df93195b..360af91e6d 100644
--- a/android/docs/help/index.md
+++ b/android/docs/help/index.md
@@ -1,5 +1,5 @@
 ---
-title: Keyman for Android 18.0 Help
+title: Keyman for Android 19.0 Help
 ---
 
 ## [About Keyman](about/)
diff --git a/developer/docs/help/index.md b/developer/docs/help/index.md
index 9e9c250abb..d7fbc4098d 100644
--- a/developer/docs/help/index.md
+++ b/developer/docs/help/index.md
@@ -1,5 +1,5 @@
 ---
-title: Keyman Developer 18.0 User Guide
+title: Keyman Developer 19.0 User Guide
 ---
 
 Need help using Keyman Developer to create your keyboard layouts? You'll
@@ -8,7 +8,7 @@ and tutorials, and full reference information.
 
 ## Guides and Tutorials
 -   [What is Keyman Developer?](guides/intro)
--   [What's new in 18.0](whats-new)
+-   [What's new in 19.0](whats-new)
 -   [Developing Keyman keyboard layouts](guides/develop)
 -   [Testing Keyman keyboards](guides/test)
 -   [Distributing Keyman keyboards](guides/distribute)
diff --git a/developer/docs/help/whats-new.md b/developer/docs/help/whats-new.md
index d1dce092c3..1005476c3d 100644
--- a/developer/docs/help/whats-new.md
+++ b/developer/docs/help/whats-new.md
@@ -1,43 +1,5 @@
 ---
-title: What's new in Keyman Developer 18.0
+title: What's new in Keyman Developer 19.0
 ---
 
-Keyman Developer 17 has a number of significant changes:
-
-* `kmcomp` has been removed and replaced with `kmc`. Learn more in our [kmcomp migration guide](reference/kmc/cli/kmcomp-migration).
-
-* Windows installer packages should now be built with
-  `kmc build windows-package-installer` and can no longer be built within
-  the Keyman Developer IDE. More details on how to use this are in the
-  [`kmc` reference documentation](reference/kmc/cli/reference#toc-kmc-build-windows-package-installer-additional-options).
-
-* `.keyboard_info` files are now generated entirely from the package and
-  keyboard files. Extra fields are available in packages for license file,
-  welcome file, typing examples, related packages (including deprecated
-  packages), and additional font files. Keyboards in the Keyman Cloud
-  keyboard repository have already been updated; if you are an author of
-  one of these keyboards, you should pull the changes from the repository
-  before submitting future updates.
-
-* Keyboard project files (.kpj) now have a new format which does not list
-  individual files, but instead includes all files in the same folder and
-  subfolders relative to the project file. This prevents projects from
-  including unrelated files, and reduces the number of files that change
-  when keyboards are updated.
-
-* Keyman Developer will now open each project in a new window, allowing
-  the user to rapidly switch between multiple projects at the same time.
-
-* The Keyman Keyboard and Lexical Model Cloud repositories have new build
-  scripts which run `kmc`. These run much, much faster than previously!
-
-* The [`&displayMap`](/developer/language/reference/displaymap) store allows
-  keyboard developers to specify a font mapping to PUA for the On Screen
-  Keyboard and Touch Layout to resolve diacritic rendering issues.
-
-* Keyman Developer has been updated to support Unicode 15.1.
-
-* Additional non-printing characters have been added to the Touch Layout Editor.
-
-* Virtual keys in output of rules have never worked properly or been officially
-  supported; Keyman Developer will now warn if you attempt to use this pattern.
+Keyman Developer 19 has the following significant changes:
diff --git a/developer/src/kmc/src/kmlmp.ts b/developer/src/kmc/src/kmlmp.ts
index bb0cda5e53..a1346ac0d3 100644
--- a/developer/src/kmc/src/kmlmp.ts
+++ b/developer/src/kmc/src/kmlmp.ts
@@ -3,7 +3,7 @@
  * kmlmp - Keyman Lexical Model Package Compiler
  */
 
-// Note: this is a deprecated package and will be removed in Keyman 18.0
+// Note: this is a deprecated package and will be removed in Keyman 19.0
 
 import { Command } from 'commander';
 import { KmpCompiler } from '@keymanapp/kmc-package';
diff --git a/docs/minimum-versions.md b/docs/minimum-versions.md
index 174f4b518e..beb542e408 100644
--- a/docs/minimum-versions.md
+++ b/docs/minimum-versions.md
@@ -4,7 +4,7 @@ title: Keyman Minimum Versions
 
 Changes in [minimum-versions.inc.sh](minimum-versions.inc.sh) should manually be propagated to the linked help files below:
 
-## Keyman 18.0
+## Keyman 19.0
 
 Target Operating System and Platform Versions
 
diff --git a/docs/minimum-versions.md.in b/docs/minimum-versions.md.in
index ffe508e12f..41a664d454 100644
--- a/docs/minimum-versions.md.in
+++ b/docs/minimum-versions.md.in
@@ -4,7 +4,7 @@ title: Keyman Minimum Versions
 
 Changes in [minimum-versions.inc.sh](minimum-versions.inc.sh) should manually be propagated to the linked help files below:
 
-## Keyman 18.0
+## Keyman 19.0
 
 Target Operating System and Platform Versions
 
diff --git a/ios/docs/engine/index.md b/ios/docs/engine/index.md
index b87af4e260..bdba88b741 100644
--- a/ios/docs/engine/index.md
+++ b/ios/docs/engine/index.md
@@ -4,7 +4,7 @@ title: Keyman for iPhone and iPad Developer Support
 
 ## Overview
 
-The Keyman Engine for iPhone and iPad 18.0 SDK is designed to provide
+The Keyman Engine for iPhone and iPad 19.0 SDK is designed to provide
 advanced international keyboard support to iOS apps.
 
 As a developer, you simply need to use (or subclass) TextView or
diff --git a/ios/docs/help/about/whatsnew.md b/ios/docs/help/about/whatsnew.md
index aa4cf6b333..b123b1f23c 100644
--- a/ios/docs/help/about/whatsnew.md
+++ b/ios/docs/help/about/whatsnew.md
@@ -1,8 +1,5 @@
 ---
-title: What's New in Keyman 18.0 for iPhone and iPad
+title: What's New in Keyman 19.0 for iPhone and iPad
 ---
-Here are some of the new features we have added to Keyman for iPhone and iPad 18.0:
 
-Additional changes:
-
-* Performance improvements
+Here are some of the new features we have added to Keyman for iPhone and iPad 19.0:
diff --git a/ios/docs/help/index.md b/ios/docs/help/index.md
index 994bbbda9e..cd0f81300e 100644
--- a/ios/docs/help/index.md
+++ b/ios/docs/help/index.md
@@ -1,5 +1,5 @@
 ---
-title: Keyman for iPhone and iPad 18.0 Help
+title: Keyman for iPhone and iPad 19.0 Help
 ---
 
 ## [About Keyman](about/)
diff --git a/linux/docs/help/about/whatsnew.md b/linux/docs/help/about/whatsnew.md
index 4a4d5a30e1..5521261b96 100644
--- a/linux/docs/help/about/whatsnew.md
+++ b/linux/docs/help/about/whatsnew.md
@@ -1,5 +1,5 @@
 ---
-title: What's New in Keyman 18.0 for Linux
+title: What's New in Keyman 19.0 for Linux
 ---
 
-Here are some of the new features we have added to Keyman for Linux 18.0:
+Here are some of the new features we have added to Keyman for Linux 19.0:
diff --git a/linux/docs/help/index.md b/linux/docs/help/index.md
index 58d245063a..329c66f69b 100644
--- a/linux/docs/help/index.md
+++ b/linux/docs/help/index.md
@@ -1,5 +1,5 @@
 ---
-title: Keyman for Linux 18.0 Help
+title: Keyman for Linux 19.0 Help
 ---
 
 Need help using Keyman for Linux? In time, this product documentation will grow and explain frequently asked questions.
diff --git a/mac/docs/help/about/whatsnew.md b/mac/docs/help/about/whatsnew.md
index 73ccb4d49b..8cc29bdadb 100644
--- a/mac/docs/help/about/whatsnew.md
+++ b/mac/docs/help/about/whatsnew.md
@@ -1,5 +1,5 @@
 ---
-title: What's New in Keyman 18.0 for macOS
+title: What's New in Keyman 19.0 for macOS
 ---
 
-Here are some of the new features we have added to Keyman 18.0 for macOS:
+Here are some of the new features we have added to Keyman 19.0 for macOS:
diff --git a/mac/docs/help/index.md b/mac/docs/help/index.md
index aa507a531e..12397a903d 100644
--- a/mac/docs/help/index.md
+++ b/mac/docs/help/index.md
@@ -1,5 +1,5 @@
 ---
-title: Keyman 18.0 for macOS Help
+title: Keyman 19.0 for macOS Help
 ---
 
 Need help using Keyman for macOS?  You'll find everything you need here, including product documentation,
diff --git a/resources/build/minimum-versions.inc.sh b/resources/build/minimum-versions.inc.sh
index 41a7c3690f..f57ebff419 100644
--- a/resources/build/minimum-versions.inc.sh
+++ b/resources/build/minimum-versions.inc.sh
@@ -1,4 +1,4 @@
-# Required minimum versions as of Keyman 18.0
+# Required minimum versions as of Keyman 19.0
 #
 # This is a list of minimum, maximum, and specific versions of any external
 # components or dependencies found in Keyman.
diff --git a/web/docs/engine/guide/index.md b/web/docs/engine/guide/index.md
index 26e2e42b47..4f59a4ebf0 100644
--- a/web/docs/engine/guide/index.md
+++ b/web/docs/engine/guide/index.md
@@ -1,8 +1,8 @@
 ---
-title: KeymanWeb 18.0 - The Guide
+title: KeymanWeb - The Guide
 ---
 
-Welcome to the guide for using KeymanWeb 18.0.
+Welcome to the guide for using KeymanWeb.
 
 -   [Getting Started with Keyman Web](get-started)
 -   [User Interface Design](user-interface-design)
@@ -10,4 +10,4 @@ Welcome to the guide for using KeymanWeb 18.0.
 -   [Installing Keyboards](adding-keyboards)
 -   [Additional Examples](examples/)
 
-[Return to the main KeymanWeb 18.0 page](../)
\ No newline at end of file
+[Return to the main KeymanWeb page](../)
\ No newline at end of file
diff --git a/web/docs/engine/index.md b/web/docs/engine/index.md
index 63d14e2fd1..5515112f88 100644
--- a/web/docs/engine/index.md
+++ b/web/docs/engine/index.md
@@ -1,27 +1,27 @@
 ---
-title: Keyman Engine for Web 18.0 Developer Help
+title: Keyman Engine for Web 19.0 Developer Help
 ---
-Keyman Engine for Web 18.0 is the current version of KeymanWeb and
+Keyman Engine for Web 19.0 is the current version of KeymanWeb and
 supports touch devices with custom touch-layouts as well as desktop
 computer browsers.
 
 [Download](https://keyman.com/developer/keymanweb/)
-:   Downloading Keyman Engine for Web 18.0
+:   Downloading Keyman Engine for Web
 
 <!-- -->
 
 [Guide](guide/)
-:   Keyman Engine for Web 18.0 Guide
+:   Keyman Engine for Web Guide
 
 <!-- -->
 
 [Reference](reference)
-:   Keyman Engine for Web 18.0 Developer Reference
+:   Keyman Engine for Web Developer Reference
 
 <!-- -->
 
 [What's New](whats-new)
-:   What's new in Keyman Engine for Web 18.0
+:   What's new in Keyman Engine for Web 19.0
 
 <!-- -->
 
diff --git a/web/docs/engine/reference/core/version.md b/web/docs/engine/reference/core/version.md
index 7df0978ac8..40b9db4529 100644
--- a/web/docs/engine/reference/core/version.md
+++ b/web/docs/engine/reference/core/version.md
@@ -22,7 +22,7 @@ Read only
 
 ### Return Value
 
-`'18.0'` (for KeymanWeb 18.0)
+`'19.0'` (for KeymanWeb 19.0)
 
 ## Description
 
diff --git a/web/docs/engine/reference/index.md b/web/docs/engine/reference/index.md
index 74d83c3931..f6e5a3a8de 100644
--- a/web/docs/engine/reference/index.md
+++ b/web/docs/engine/reference/index.md
@@ -1,5 +1,5 @@
 ---
-title: KeymanWeb 18.0 Reference
+title: KeymanWeb Reference
 ---
 
 [KeymanWeb Overview](overview)
diff --git a/web/docs/engine/whats-new.md b/web/docs/engine/whats-new.md
index 49fa337fe0..e220fb9c13 100644
--- a/web/docs/engine/whats-new.md
+++ b/web/docs/engine/whats-new.md
@@ -1,3 +1,3 @@
 ---
-title: What's New in KeymanWeb 18.0
+title: What's New in KeymanWeb 19.0
 ---
diff --git a/windows/docs/engine/api/index.md b/windows/docs/engine/api/index.md
index 7032aa0cd2..f95332c45a 100644
--- a/windows/docs/engine/api/index.md
+++ b/windows/docs/engine/api/index.md
@@ -1,13 +1,13 @@
 ---
-title: Keyman Engine for Windows 18.0 API
+title: Keyman Engine for Windows API
 ---
 
 ## Introduction
 
-The Keyman Engine for Windows 18.0 API is implemented in COM. It can be
+The Keyman Engine for Windows API is implemented in COM. It can be
 instantiated with `CreateObject("keymanapi.Keyman")`.
 
-> [!Note] 
+> [!Note]
 > This documentation applies to Keyman Engine for Windows versions 14.0 and up.
 
 ## Interface Hierarchy
diff --git a/windows/docs/engine/index.md b/windows/docs/engine/index.md
index acdd77d877..0687433412 100644
--- a/windows/docs/engine/index.md
+++ b/windows/docs/engine/index.md
@@ -1,8 +1,8 @@
 ---
-title: Keyman Engine for Windows 18.0
+title: Keyman Engine for Windows
 ---
 
-Keyman Engine for Windows 18.0 gives you the tools to build a customised
+Keyman Engine for Windows gives you the tools to build a customised
 desktop keyboarding product for Windows.
 
 **Note:** This documentation applies to Keyman Engine for Windows
diff --git a/windows/docs/help/about/whatsnew.md b/windows/docs/help/about/whatsnew.md
index 4f11c82ec2..ee917f3870 100644
--- a/windows/docs/help/about/whatsnew.md
+++ b/windows/docs/help/about/whatsnew.md
@@ -1,8 +1,8 @@
 ---
-title: What's New in Keyman 18.0 for Windows
+title: What's New in Keyman 19.0 for Windows
 ---
 
-Here are some of the new features we have added to Keyman 18.0 for Windows:
+Here are some of the new features we have added to Keyman 19.0 for Windows:
 
 ## Related Topics
 
diff --git a/windows/docs/help/index.md b/windows/docs/help/index.md
index c7cccc7695..231ed5fc7d 100644
--- a/windows/docs/help/index.md
+++ b/windows/docs/help/index.md
@@ -1,5 +1,5 @@
 ---
-title: Keyman for Windows 18.0 Help
+title: Keyman for Windows 19.0 Help
 ---
 
 Need help using Keyman for Windows? You'll find everything you need here, including product documentation,

From 7ab4c67383dac487e23818b9aebd6ad753ec354b Mon Sep 17 00:00:00 2001
From: Keyman Build Agent <buildagent@keyman.com>
Date: Tue, 11 Feb 2025 02:52:18 -0500
Subject: [PATCH 08/76] auto: increment master version to 19.0.2

---
 HISTORY.md | 5 +++++
 VERSION.md | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/HISTORY.md b/HISTORY.md
index ca5fe2101f..e907cc12dd 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,5 +1,10 @@
 # Keyman Version History
 
+## 19.0.1 alpha 2025-02-11
+
+* refactor(windows): rename `TKeymanMutex.MutexOwned` to `TakeOwnership` and add `ReleaseOwnership` (#13168)
+* chore: increment to alpha 19.0 (#13187)
+
 ## 18.0.188 alpha 2025-02-10
 
 * fix(windows): check the params status flag equals ucrsUpdateReady before attempting to download the keyman setup file (#13154)
diff --git a/VERSION.md b/VERSION.md
index b2c7e01f85..fc1a009252 100644
--- a/VERSION.md
+++ b/VERSION.md
@@ -1 +1 @@
-19.0.1
\ No newline at end of file
+19.0.2
\ No newline at end of file

From f2747be553bfc587226f847fb4ad193e839315e7 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Tue, 11 Feb 2025 19:24:22 +0100
Subject: [PATCH 09/76] chore(linux): remove support of Ubuntu 20.04 Focal

Ubuntu 20.04 Focal will reach EOL in April and GitHub removes the
runner images, so we no longer will be able to build packages for Focal.
---
 .github/workflows/deb-packaging.yml | 2 +-
 linux/scripts/launchpad.sh          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/deb-packaging.yml b/.github/workflows/deb-packaging.yml
index 52c485aa65..bf1bfca2fa 100644
--- a/.github/workflows/deb-packaging.yml
+++ b/.github/workflows/deb-packaging.yml
@@ -116,7 +116,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        dist: [focal, jammy, noble, oracular]
+        dist: [jammy, noble, oracular]
 
     steps:
     - name: Checkout
diff --git a/linux/scripts/launchpad.sh b/linux/scripts/launchpad.sh
index 98ab9238f0..4b89980994 100755
--- a/linux/scripts/launchpad.sh
+++ b/linux/scripts/launchpad.sh
@@ -33,7 +33,7 @@ else
 fi
 echo "ppa: ${ppa}"
 
-distributions="${DIST:-focal jammy noble oracular plucky}"
+distributions="${DIST:-jammy noble oracular plucky}"
 packageversion="${PACKAGEVERSION:-1~sil1}"
 
 BASEDIR=$(pwd)

From 02a3a1a66c121c1e42535ca943ec5a8b6c6d7f17 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Tue, 11 Feb 2025 19:32:29 +0100
Subject: [PATCH 10/76] chore(linux): cleanup code

Now that we no longer support Focal we can use more modern tools for
packaging.
---
 docs/linux/README.md | 2 +-
 linux/debian/rules   | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/docs/linux/README.md b/docs/linux/README.md
index 80c1a78434..64ef6c967f 100644
--- a/docs/linux/README.md
+++ b/docs/linux/README.md
@@ -147,7 +147,7 @@ Run `ibus restart` after installing any of them.
 Keyman tries to activate the keyboard automatically. If you want to activate
 it for a different language, you can do so by following the steps below.
 
-#### GNOME3 (focal and bionic default, also newer Ubuntu versions)
+#### GNOME3 (Ubuntu default)
 
 - Click the connection/sound/shutdown section in the top right. Then the tools
   icon for Settings.
diff --git a/linux/debian/rules b/linux/debian/rules
index 8da37f40e4..5138b58330 100755
--- a/linux/debian/rules
+++ b/linux/debian/rules
@@ -66,10 +66,7 @@ override_dh_auto_install:
 	rm $(CURDIR)/debian/keyman/usr/share/locale/*.po*
 	# Don't call `build.sh install` - dh_auto_install does some extra smarts
 	dh_auto_install --sourcedir=linux/keyman-config --buildsystem=pybuild $@
-	# Unfortunately bash-completion 2.10 (focal) doesn't yet provide dh-sequence-bash-completion,
-	# which we could add as build-dependency, so we'll have to explicitly call
-	# dh_bash_completion here instead of using `dh $@ --with-python3 --with bash-completion`
-	dh_bash-completion -O--buildsystem=pybuild
+	dh $@ --with-python3 --with bash-completion
 	dh_python3 -O--buildsystem=pybuild
 
 override_dh_missing:

From 0e48e44d2deb33cf3ab7123279ceb46cd5f523e6 Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Wed, 12 Feb 2025 13:14:42 +0700
Subject: [PATCH 11/76] chore(developer): add INFO messages for `kmc copy` and
 `kmc generate`

Note: these messages are in `kmc`, not in `kmc-copy` or `kmc-generate`,
matching the structure for existing `INFO_BuildingProject` and related
messages.

Fixes: #13127
---
 developer/src/kmc-copy/src/copier-messages.ts |  6 +--
 .../kmc-generate/src/generator-messages.ts    |  8 +---
 developer/src/kmc/src/commands/copy.ts        | 12 +++++
 developer/src/kmc/src/commands/generate.ts    | 11 ++++-
 .../src/messages/infrastructureMessages.ts    | 45 ++++++++++++++++++-
 5 files changed, 68 insertions(+), 14 deletions(-)

diff --git a/developer/src/kmc-copy/src/copier-messages.ts b/developer/src/kmc-copy/src/copier-messages.ts
index d4751474b9..976002a35f 100644
--- a/developer/src/kmc-copy/src/copier-messages.ts
+++ b/developer/src/kmc-copy/src/copier-messages.ts
@@ -25,11 +25,7 @@ export class CopierMessages {
     o.e ?? 'unknown error'
   );
 
-  static INFO_CopyingProject = SevInfo | 0x0002;
-  static Info_CopyingProject = (o:{type: string, id: string}) => m(
-    this.INFO_CopyingProject,
-    `Copying project of type ${def(o.type)} with id ${def(o.id)}`
-  );
+  // unused 0x0002 (was INFO_CopyingProject, now in InfrastructureMessages)
 
   static ERROR_CannotCreateFolder = SevError | 0x0003;
   static Error_CannotCreateFolder = (o:{folderName:string, e: any}) => CompilerMessageSpecWithException(
diff --git a/developer/src/kmc-generate/src/generator-messages.ts b/developer/src/kmc-generate/src/generator-messages.ts
index 185f68cbe6..fc8283763e 100644
--- a/developer/src/kmc-generate/src/generator-messages.ts
+++ b/developer/src/kmc-generate/src/generator-messages.ts
@@ -7,7 +7,7 @@
 import { CompilerErrorNamespace, CompilerErrorSeverity, CompilerMessageSpec as m, CompilerMessageDef as def, CompilerMessageSpecWithException } from "@keymanapp/developer-utils";
 
 const Namespace = CompilerErrorNamespace.Generator;
-const SevInfo = CompilerErrorSeverity.Info | Namespace;
+// const SevInfo = CompilerErrorSeverity.Info | Namespace;
 // const SevHint = CompilerErrorSeverity.Hint | Namespace;
 const SevWarn = CompilerErrorSeverity.Warn | Namespace;
 const SevError = CompilerErrorSeverity.Error | Namespace;
@@ -23,11 +23,7 @@ export class GeneratorMessages {
     o.e ?? 'unknown error',
   );
 
-  static INFO_GeneratingProject = SevInfo | 0x0002;
-  static Info_GeneratingProject = (o:{type: string, id: string}) => m(
-    this.INFO_GeneratingProject,
-    `Generating project of type ${def(o.type)} with id ${def(o.id)}`
-  );
+  // unused 0x0002 (was INFO_GeneratingProject, now in InfrastructureMessages)
 
   static ERROR_CannotCreateFolder = SevError | 0x0003;
   static Error_CannotCreateFolder = (o:{folderName:string, e: any}) => CompilerMessageSpecWithException(
diff --git a/developer/src/kmc/src/commands/copy.ts b/developer/src/kmc/src/commands/copy.ts
index b7d0aef12f..9cfef2b957 100644
--- a/developer/src/kmc/src/commands/copy.ts
+++ b/developer/src/kmc/src/commands/copy.ts
@@ -79,6 +79,18 @@ async function doCopy(callbacks: NodeCompilerCallbacks, sources: string | string
     return false;
   }
 
+  const dest = options.outPath;
+  callbacks.reportMessage(InfrastructureMessages.Info_CopyingProject({source, dest}));
+  const result = runCopier(callbacks, source, options);
+  if(result) {
+    callbacks.reportMessage(InfrastructureMessages.Info_ProjectCopiedSuccessfully({source, dest}));
+  } else {
+    callbacks.reportMessage(InfrastructureMessages.Info_ProjectNotCopiedSuccessfully({source, dest}));
+  }
+  return result;
+}
+
+async function runCopier(callbacks: NodeCompilerCallbacks, source: string, options: CopierOptions) {
   const copier = new KeymanProjectCopier();
   try {
     if(!await copier.init(callbacks, options)) {
diff --git a/developer/src/kmc/src/commands/generate.ts b/developer/src/kmc/src/commands/generate.ts
index b362d01125..695ced9d3c 100644
--- a/developer/src/kmc/src/commands/generate.ts
+++ b/developer/src/kmc/src/commands/generate.ts
@@ -113,9 +113,16 @@ async function generate(generator: KeymanCompiler, ids: string | string[], comma
   }
 
   const options = commanderOptionsToGeneratorOptions(id, commanderOptions);
-
+  const outPath = options.outPath;
   const callbacks = new NodeCompilerCallbacks(options);
-  if(!await doGenerate(callbacks, generator, options)) {
+  callbacks.reportMessage(InfrastructureMessages.Info_GeneratingProject({id, outPath}));
+
+  const result = await doGenerate(callbacks, generator, options);
+
+  if(result) {
+    callbacks.reportMessage(InfrastructureMessages.Info_ProjectGeneratedSuccessfully({id}));
+  } else {
+    callbacks.reportMessage(InfrastructureMessages.Info_ProjectNotGeneratedSuccessfully({id}));
     return await exitProcess(1);
   }
 }
diff --git a/developer/src/kmc/src/messages/infrastructureMessages.ts b/developer/src/kmc/src/messages/infrastructureMessages.ts
index bacadca545..304e1d5e9f 100644
--- a/developer/src/kmc/src/messages/infrastructureMessages.ts
+++ b/developer/src/kmc/src/messages/infrastructureMessages.ts
@@ -158,5 +158,48 @@ export class InfrastructureMessages {
     this.ERROR_CopyRequiresOutPath,
     `The copy command requires the --out-path, -o parameter`
   );
- }
+
+  // For this message, we override the filename with the passed-in file. A bit of a hack but does the job
+  static INFO_CopyingProject = SevInfo | 0x0023;
+  static Info_CopyingProject = (o:{source:string,dest:string}) => ({filename:o.source, ...m(
+    this.INFO_CopyingProject,
+    `Copying project '${def(o.source)}' to '${def(o.dest)}'`,
+  )});
+
+  // For this message, we override the filename with the passed-in file. A bit of a hack but does the job
+  static INFO_ProjectCopiedSuccessfully = SevInfo | 0x0024;
+  static Info_ProjectCopiedSuccessfully = (o:{source:string, dest:string}) => ({filename:o.source, ...m(
+    this.INFO_ProjectCopiedSuccessfully,
+    `'${def(o.source)}' copied to '${def(o.dest)}' successfully.`,
+  )});
+
+  // For this message, we override the filename with the passed-in file. A bit of a hack but does the job
+  static INFO_ProjectNotCopiedSuccessfully = SevInfo | 0x0025;
+  static Info_ProjectNotCopiedSuccessfully = (o:{source:string, dest:string}) => ({filename:o.source, ...m(
+    this.INFO_ProjectNotCopiedSuccessfully,
+    `'${def(o.source)}' was not successfully copied to '${def(o.dest)}'.`,
+  )});
+
+  // For this message, we override the filename with the passed-in file. A bit of a hack but does the job
+  static INFO_GeneratingProject = SevInfo | 0x0026;
+  static Info_GeneratingProject = (o:{id:string, outPath: string}) => ({filename:o.id, ...m(
+    this.INFO_GeneratingProject,
+    `Generating new project '${def(o.id)}' in '${def(o.outPath)}'.`,
+  )});
+
+  // For this message, we override the filename with the passed-in file. A bit of a hack but does the job
+  static INFO_ProjectGeneratedSuccessfully = SevInfo | 0x0027;
+  static Info_ProjectGeneratedSuccessfully = (o:{id:string}) => ({filename:o.id, ...m(
+    this.INFO_ProjectGeneratedSuccessfully,
+    `New project '${def(o.id)}' generated successfully.`,
+  )});
+
+  // For this message, we override the filename with the passed-in file. A bit of a hack but does the job
+  static INFO_ProjectNotGeneratedSuccessfully = SevInfo | 0x0028;
+  static Info_ProjectNotGeneratedSuccessfully = (o:{id:string}) => ({filename:o.id, ...m(
+    this.INFO_ProjectNotGeneratedSuccessfully,
+    `New project '${def(o.id)}' was not successfully generated.`,
+  )});
+
+}
 

From 37a5248810ea9d058bdc7b52c96f68289698f594 Mon Sep 17 00:00:00 2001
From: Shawn Schantz <shawn_schantz@sil.org>
Date: Wed, 12 Feb 2025 13:33:59 +0700
Subject: [PATCH 12/76] chore(ios): increase minimum ios version to 13

---
 .../KeymanEngine.xcodeproj/project.pbxproj    | 24 +++++++++----------
 .../Keyman/Keyman.xcodeproj/project.pbxproj   | 12 +++++-----
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/ios/engine/KMEI/KeymanEngine.xcodeproj/project.pbxproj b/ios/engine/KMEI/KeymanEngine.xcodeproj/project.pbxproj
index 045506b9af..7b21b6bc63 100644
--- a/ios/engine/KMEI/KeymanEngine.xcodeproj/project.pbxproj
+++ b/ios/engine/KMEI/KeymanEngine.xcodeproj/project.pbxproj
@@ -1805,7 +1805,7 @@
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				INFOPLIST_FILE = KeymanEngineTests/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 13;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -1849,7 +1849,7 @@
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				INFOPLIST_FILE = KeymanEngineTests/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 13;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -1900,7 +1900,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				INFOPLIST_FILE = KeymanEngine/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 12.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 13;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -1955,7 +1955,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				INFOPLIST_FILE = KeymanEngine/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 12.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 13;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -2021,7 +2021,7 @@
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				INFOPLIST_FILE = "KeymanEngine/resources/Keyman.bundle/Contents/Resources/KeymanEngine-Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 12.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 13;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -2058,7 +2058,7 @@
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				INFOPLIST_FILE = "KeymanEngine/resources/Keyman.bundle/Contents/Resources/KeymanEngine-Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 12.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 13;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -2151,7 +2151,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				INFOPLIST_FILE = KeymanEngine/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 12.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 13;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -2194,7 +2194,7 @@
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = 3YE4W86L3G;
 				ENABLE_BITCODE = NO;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 13;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -2292,7 +2292,7 @@
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				INFOPLIST_FILE = KeymanEngineTests/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 13;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -2333,7 +2333,7 @@
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				INFOPLIST_FILE = "KeymanEngine/resources/Keyman.bundle/Contents/Resources/KeymanEngine-Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 12.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 13;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -2449,7 +2449,7 @@
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = 3YE4W86L3G;
 				ENABLE_BITCODE = NO;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 13;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -2482,7 +2482,7 @@
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = 3YE4W86L3G;
 				ENABLE_BITCODE = NO;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 13;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
diff --git a/ios/keyman/Keyman/Keyman.xcodeproj/project.pbxproj b/ios/keyman/Keyman/Keyman.xcodeproj/project.pbxproj
index a8b4f8624b..b69c7f424d 100644
--- a/ios/keyman/Keyman/Keyman.xcodeproj/project.pbxproj
+++ b/ios/keyman/Keyman/Keyman.xcodeproj/project.pbxproj
@@ -1131,7 +1131,7 @@
 				GCC_PREFIX_HEADER = "Keyman/Keyman-Prefix.pch";
 				GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";
 				INFOPLIST_FILE = Keyman/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 13;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -1166,7 +1166,7 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "Keyman/Keyman-Prefix.pch";
 				INFOPLIST_FILE = Keyman/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 13;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -1319,7 +1319,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				INFOPLIST_FILE = SWKeyboard/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 13;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -1362,7 +1362,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				INFOPLIST_FILE = SWKeyboard/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 13;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -1456,7 +1456,7 @@
 				GCC_PREFIX_HEADER = "Keyman/Keyman-Prefix.pch";
 				GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";
 				INFOPLIST_FILE = Keyman/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 13;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -1500,7 +1500,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				INFOPLIST_FILE = SWKeyboard/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 13;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",

From b2598e76ba283cac1f36c0440d0f8a44c68e9b5f Mon Sep 17 00:00:00 2001
From: Joshua Horton <jahorton@sil.org>
Date: Tue, 11 Feb 2025 15:51:26 +0700
Subject: [PATCH 13/76] chore(web): fix coverage-reporting artifact

Fixes: #13195
---
 web/.c8rc.json                                | 12 ++++++++-
 web/build.sh                                  | 26 ++++++++++++++-----
 web/common.inc.sh                             | 11 --------
 web/src/app/browser/.c8rc.json                | 10 +++++++
 web/src/engine/attachment/.c8rc.json          |  2 +-
 web/src/engine/common/web-utils/.c8rc.json    |  2 +-
 web/src/engine/events/.c8rc.json              |  2 +-
 web/src/engine/interfaces/.c8rc.json          |  2 +-
 web/src/engine/keyboard-storage/.c8rc.json    |  2 +-
 web/src/engine/keyboard/.c8rc.json            |  2 +-
 .../engine/osk/gesture-processor/.c8rc.json   |  2 +-
 .../predictive-text/templates/.c8rc.json      |  2 +-
 .../predictive-text/wordbreakers/.c8rc.json   |  2 +-
 .../worker-main/src/node/worker.ts            |  4 +++
 .../predictive-text/worker-thread/.c8rc.json  |  2 +-
 .../engine/js-processor/basic-engine.tests.js |  5 +++-
 .../engine/js-processor/chirality.tests.js    |  5 +++-
 .../engine/js-processor/deadkeys.tests.js     |  5 +++-
 .../engine/unmatched_final_group.tests.js     |  5 +++-
 web/src/test/auto/headless/getKeymanRoot.mjs  | 12 +++++++++
 20 files changed, 83 insertions(+), 32 deletions(-)
 create mode 100644 web/src/app/browser/.c8rc.json
 create mode 100644 web/src/test/auto/headless/getKeymanRoot.mjs

diff --git a/web/.c8rc.json b/web/.c8rc.json
index f308b48487..070ef1b1d2 100644
--- a/web/.c8rc.json
+++ b/web/.c8rc.json
@@ -7,7 +7,17 @@
   "reporter": ["text", "text-summary"],
   "reports-dir": "build/coverage",
   "src": [
-    "**/src/",
+    "src/**",
     "../common/**/src"
+  ],
+  "include": [
+    "src/**"
+  ],
+  "exclude": [
+    "src/test/**",
+    "**/src/tests/**",
+    "**/build/**",
+    "src/tools/**",
+    "../node_modules/*"
   ]
 }
diff --git a/web/build.sh b/web/build.sh
index 5dd30f338f..0dd9b5ef53 100755
--- a/web/build.sh
+++ b/web/build.sh
@@ -141,12 +141,26 @@ test_action() {
 
 coverage_action() {
   builder_echo "Creating coverage report..."
-  cd "$KEYMAN_ROOT"
-  mkdir -p web/build/coverage/tmp
-  find . -type f -name coverage-\*.json -print0 | xargs -0 cp -t web/build/coverage/tmp
-  c8 report --config web/.c8rc.json ---reporter html --clean=false --reports-dir=web/build/coverage
-  rm -rf web/build/coverage/tmp
-  cd web
+
+  # Always ensure our collation folder is clean, just in case something went wrong on a prior run.
+  rm -rf build/coverage/tmp
+
+  # Also clean out the sub-report directories + main index.html; don't keep old ones if we fail!
+  rm -rf build/coverage/app
+  rm -rf build/coverage/engine
+  rm -f  build/coverage/index.html
+
+  # Collate the results into a single folder
+  mkdir build/coverage/tmp
+  find . -type f -name coverage-\*.json -print0 | xargs -0 cp -t build/coverage/tmp
+
+  # Note for maintainers:  the .c8rc.json config needs to be written from the perspective of
+  # the working directory - including its `include` and `exclude` entries.  All ignores and
+  # such must be redefined in whatever that top-level .c8rc.json is.
+  c8 report --reporter html
+
+  # No need to keep the collation folder around afterward; we can always redo that work.
+  rm -rf build/coverage/tmp
 }
 
 builder_run_child_actions build:engine/dom-utils
diff --git a/web/common.inc.sh b/web/common.inc.sh
index 429c9a9a8d..05c924d6ec 100644
--- a/web/common.inc.sh
+++ b/web/common.inc.sh
@@ -108,22 +108,11 @@ function test-headless() {
     TEST_CD_REQD=true
   fi
 
-  if [ $TEST_CD_REQD ]; then
-    # The mocha config needed to live-compile TS-based tests only applies
-    # if the command is started within the appropriate subfolder.
-    pushd "${TEST_BASE}" > /dev/null
-    TEST_BASE=
-  fi
-
   if [[ -e .c8rc.json ]]; then
     c8 mocha --recursive "${TEST_BASE}${TEST_FOLDER}" $TEST_OPTS
   else
     mocha --recursive "${TEST_BASE}${TEST_FOLDER}" $TEST_OPTS
   fi
-
-  if [ $TEST_CD_REQD ]; then
-    popd > /dev/null
-  fi
 }
 
 # Runs all headless tests (written in typescript) corresponding to the
diff --git a/web/src/app/browser/.c8rc.json b/web/src/app/browser/.c8rc.json
new file mode 100644
index 0000000000..3e9bef1df0
--- /dev/null
+++ b/web/src/app/browser/.c8rc.json
@@ -0,0 +1,10 @@
+{
+  "check-coverage": false,
+  "clean": true,
+  "exclude-after-remap": true,
+  "reporter": ["text", "text-summary"],
+  "reports-dir": "../../../build/coverage/raw/app/browser",
+  "src": [
+    "src/"
+  ]
+}
\ No newline at end of file
diff --git a/web/src/engine/attachment/.c8rc.json b/web/src/engine/attachment/.c8rc.json
index c789716cd5..eea63036d2 100644
--- a/web/src/engine/attachment/.c8rc.json
+++ b/web/src/engine/attachment/.c8rc.json
@@ -3,7 +3,7 @@
   "clean": true,
   "exclude-after-remap": true,
   "reporter": ["text", "text-summary"],
-  "reports-dir": "build/coverage",
+  "reports-dir": "../../../build/coverage/raw/engine/attachment",
   "src": [
     "src/"
   ]
diff --git a/web/src/engine/common/web-utils/.c8rc.json b/web/src/engine/common/web-utils/.c8rc.json
index 16a4e93b9c..4c652ff892 100644
--- a/web/src/engine/common/web-utils/.c8rc.json
+++ b/web/src/engine/common/web-utils/.c8rc.json
@@ -10,7 +10,7 @@
   ],
   "exclude-after-remap": true,
   "reporter": ["text", "text-summary"],
-  "reports-dir": "build/coverage",
+  "reports-dir": "../../../build/coverage/raw/raw/engine/common/web-utils",
   "src": [
     "src/"
   ]
diff --git a/web/src/engine/events/.c8rc.json b/web/src/engine/events/.c8rc.json
index c789716cd5..65dd2858d4 100644
--- a/web/src/engine/events/.c8rc.json
+++ b/web/src/engine/events/.c8rc.json
@@ -3,7 +3,7 @@
   "clean": true,
   "exclude-after-remap": true,
   "reporter": ["text", "text-summary"],
-  "reports-dir": "build/coverage",
+  "reports-dir": "../../../build/coverage/raw/engine/events",
   "src": [
     "src/"
   ]
diff --git a/web/src/engine/interfaces/.c8rc.json b/web/src/engine/interfaces/.c8rc.json
index c42b096f68..ebcb215dba 100644
--- a/web/src/engine/interfaces/.c8rc.json
+++ b/web/src/engine/interfaces/.c8rc.json
@@ -3,7 +3,7 @@
   "clean": true,
   "exclude-after-remap": true,
   "reporter": ["text", "text-summary"],
-  "reports-dir": "../../../build/engine/interfaces/coverage",
+  "reports-dir": "../../../build/coverage/raw/engine/interfaces",
   "src": [
     "src/"
   ]
diff --git a/web/src/engine/keyboard-storage/.c8rc.json b/web/src/engine/keyboard-storage/.c8rc.json
index c789716cd5..396d0ddcc5 100644
--- a/web/src/engine/keyboard-storage/.c8rc.json
+++ b/web/src/engine/keyboard-storage/.c8rc.json
@@ -3,7 +3,7 @@
   "clean": true,
   "exclude-after-remap": true,
   "reporter": ["text", "text-summary"],
-  "reports-dir": "build/coverage",
+  "reports-dir": "../../../build/coverage/raw/engine/keyboard-storage",
   "src": [
     "src/"
   ]
diff --git a/web/src/engine/keyboard/.c8rc.json b/web/src/engine/keyboard/.c8rc.json
index ceca963e15..b6bd4a818f 100644
--- a/web/src/engine/keyboard/.c8rc.json
+++ b/web/src/engine/keyboard/.c8rc.json
@@ -8,7 +8,7 @@
   ],
   "exclude-after-remap": true,
   "reporter": ["text", "text-summary"],
-  "reports-dir": "build/coverage",
+  "reports-dir": "../../../build/coverage/raw/engine/keyboard",
   "src": [
     "src/"
   ]
diff --git a/web/src/engine/osk/gesture-processor/.c8rc.json b/web/src/engine/osk/gesture-processor/.c8rc.json
index 719cd11dae..24afdfdddf 100644
--- a/web/src/engine/osk/gesture-processor/.c8rc.json
+++ b/web/src/engine/osk/gesture-processor/.c8rc.json
@@ -11,7 +11,7 @@
     "src/engine/headless/*"
   ],
   "reporter": ["text", "text-summary"],
-  "reports-dir": "build/coverage",
+  "reports-dir": "../../../../build/coverage/raw/engine/osk/gesture-processor",
   "src": [
     "src/engine/headless/*"
   ]
diff --git a/web/src/engine/predictive-text/templates/.c8rc.json b/web/src/engine/predictive-text/templates/.c8rc.json
index d107a1cacb..b938594fb2 100644
--- a/web/src/engine/predictive-text/templates/.c8rc.json
+++ b/web/src/engine/predictive-text/templates/.c8rc.json
@@ -7,7 +7,7 @@
   ],
   "exclude-after-remap": true,
   "reporter": ["text", "text-summary"],
-  "reports-dir": "build/coverage",
+  "reports-dir": "../../../../build/coverage/raw/engine/predictive-text/templates",
   "src": [
     "src/"
   ]
diff --git a/web/src/engine/predictive-text/wordbreakers/.c8rc.json b/web/src/engine/predictive-text/wordbreakers/.c8rc.json
index 6a0e2589da..c2ea18e238 100644
--- a/web/src/engine/predictive-text/wordbreakers/.c8rc.json
+++ b/web/src/engine/predictive-text/wordbreakers/.c8rc.json
@@ -7,7 +7,7 @@
   ],
   "exclude-after-remap": true,
   "reporter": ["text", "text-summary"],
-  "reports-dir": "build/coverage",
+  "reports-dir": "../../../../build/coverage/raw/engine/predictive-text/wordbreakers",
   "src": [
     "src/"
   ]
diff --git a/web/src/engine/predictive-text/worker-main/src/node/worker.ts b/web/src/engine/predictive-text/worker-main/src/node/worker.ts
index 5ad04e55d0..aafb2c4869 100644
--- a/web/src/engine/predictive-text/worker-main/src/node/worker.ts
+++ b/web/src/engine/predictive-text/worker-main/src/node/worker.ts
@@ -6,6 +6,10 @@ import { LMLayerWorkerCode, LMLayerWorkerSourcemapComment } from "@keymanapp/lm-
 export default class Worker {
   static constructInstance(): Worker {
     let scriptStr = unwrap(LMLayerWorkerCode);
+    const srcMapUrlIndex = scriptStr.indexOf("//# sourceMappingURL")
+    if(srcMapUrlIndex > 0) {
+      scriptStr = scriptStr.substring(0, srcMapUrlIndex);
+    }
 
     scriptStr += '\n' + LMLayerWorkerSourcemapComment;
     let worker = new MappedWorker(scriptStr);
diff --git a/web/src/engine/predictive-text/worker-thread/.c8rc.json b/web/src/engine/predictive-text/worker-thread/.c8rc.json
index b66bb5b106..f30fb6465e 100644
--- a/web/src/engine/predictive-text/worker-thread/.c8rc.json
+++ b/web/src/engine/predictive-text/worker-thread/.c8rc.json
@@ -7,7 +7,7 @@
   ],
   "exclude-after-remap": true,
   "reporter": ["text", "text-summary"],
-  "reports-dir": "build/coverage",
+  "reports-dir": "../../../../build/coverage/raw/engine/predictive-text/worker-thread",
   "src": [
     "src/main"
   ]
diff --git a/web/src/test/auto/headless/engine/js-processor/basic-engine.tests.js b/web/src/test/auto/headless/engine/js-processor/basic-engine.tests.js
index 68eb5136e3..df63ec3106 100644
--- a/web/src/test/auto/headless/engine/js-processor/basic-engine.tests.js
+++ b/web/src/test/auto/headless/engine/js-processor/basic-engine.tests.js
@@ -9,6 +9,9 @@ import { KeyboardInterface } from 'keyman/engine/js-processor';
 import { NodeKeyboardLoader } from 'keyman/engine/keyboard/node-keyboard-loader';
 import { KeyboardTest, NodeProctor } from '@keymanapp/recorder-core';
 
+import { getKeymanRoot } from '../../getKeymanRoot.mjs';
+const KEYMAN_ROOT = getKeymanRoot();
+
 describe('Engine - Basic Simulation', function() {
   let testJSONtext = fs.readFileSync(require.resolve('@keymanapp/common-test-resources/json/engine_tests/basic_lao_simulation.json'));
   // Common test suite setup.
@@ -25,7 +28,7 @@ describe('Engine - Basic Simulation', function() {
   before(async function() {
     // -- START: Standard Recorder-based unit test loading boilerplate --
     let keyboardLoader = new NodeKeyboardLoader(new KeyboardInterface({}, MinimalKeymanGlobal));
-    let keyboard = await keyboardLoader.loadKeyboardFromPath('../../../../../common/test/' + testSuite.keyboard.filename);
+    let keyboard = await keyboardLoader.loadKeyboardFromPath(KEYMAN_ROOT + '/common/test/' + testSuite.keyboard.filename);
     keyboardWithHarness = keyboardLoader.harness;
     keyboardWithHarness.activeKeyboard = keyboard;
 
diff --git a/web/src/test/auto/headless/engine/js-processor/chirality.tests.js b/web/src/test/auto/headless/engine/js-processor/chirality.tests.js
index c2220b7f5d..ea068e014d 100644
--- a/web/src/test/auto/headless/engine/js-processor/chirality.tests.js
+++ b/web/src/test/auto/headless/engine/js-processor/chirality.tests.js
@@ -10,6 +10,9 @@ import { NodeKeyboardLoader } from 'keyman/engine/keyboard/node-keyboard-loader'
 import { KeyboardTest, NodeProctor } from '@keymanapp/recorder-core';
 import { ModifierKeyConstants } from '@keymanapp/common-types';
 
+import { getKeymanRoot } from '../../getKeymanRoot.mjs';
+const KEYMAN_ROOT = getKeymanRoot();
+
 describe('Engine - Chirality', function() {
   let testJSONtext = fs.readFileSync(require.resolve('@keymanapp/common-test-resources/json/engine_tests/chirality.json'));
   // Common test suite setup.
@@ -26,7 +29,7 @@ describe('Engine - Chirality', function() {
   before(async function() {
     // -- START: Standard Recorder-based unit test loading boilerplate --
     let keyboardLoader = new NodeKeyboardLoader(new KeyboardInterface({}, MinimalKeymanGlobal));
-    let keyboard = await keyboardLoader.loadKeyboardFromPath('../../../../../common/test/' + testSuite.keyboard.filename);
+    let keyboard = await keyboardLoader.loadKeyboardFromPath(KEYMAN_ROOT + '/common/test/' + testSuite.keyboard.filename);
     keyboardWithHarness = keyboardLoader.harness;
     keyboardWithHarness.activeKeyboard = keyboard;
 
diff --git a/web/src/test/auto/headless/engine/js-processor/deadkeys.tests.js b/web/src/test/auto/headless/engine/js-processor/deadkeys.tests.js
index fd5d1457d3..ae67121dfd 100644
--- a/web/src/test/auto/headless/engine/js-processor/deadkeys.tests.js
+++ b/web/src/test/auto/headless/engine/js-processor/deadkeys.tests.js
@@ -9,6 +9,9 @@ import { KeyboardInterface } from 'keyman/engine/js-processor';
 import { NodeKeyboardLoader } from 'keyman/engine/keyboard/node-keyboard-loader';
 import { KeyboardTest, NodeProctor } from '@keymanapp/recorder-core';
 
+import { getKeymanRoot } from '../../getKeymanRoot.mjs';
+const KEYMAN_ROOT = getKeymanRoot();
+
 describe('Engine - Deadkeys', function() {
   let testJSONtext = fs.readFileSync(require.resolve('@keymanapp/common-test-resources/json/engine_tests/deadkeys.json'));
   // Common test suite setup.
@@ -25,7 +28,7 @@ describe('Engine - Deadkeys', function() {
   before(async function() {
     // -- START: Standard Recorder-based unit test loading boilerplate --
     let keyboardLoader = new NodeKeyboardLoader(new KeyboardInterface({}, MinimalKeymanGlobal));
-    let keyboard = await keyboardLoader.loadKeyboardFromPath('../../../../../common/test/' + testSuite.keyboard.filename);
+    let keyboard = await keyboardLoader.loadKeyboardFromPath(KEYMAN_ROOT + '/common/test/' + testSuite.keyboard.filename);
     keyboardWithHarness = keyboardLoader.harness;
     keyboardWithHarness.activeKeyboard = keyboard;
 
diff --git a/web/src/test/auto/headless/engine/js-processor/engine/unmatched_final_group.tests.js b/web/src/test/auto/headless/engine/js-processor/engine/unmatched_final_group.tests.js
index 8bfee041eb..5ceaf40cf6 100644
--- a/web/src/test/auto/headless/engine/js-processor/engine/unmatched_final_group.tests.js
+++ b/web/src/test/auto/headless/engine/js-processor/engine/unmatched_final_group.tests.js
@@ -9,6 +9,9 @@ import { KeyboardInterface } from 'keyman/engine/js-processor';
 import { NodeKeyboardLoader } from 'keyman/engine/keyboard/node-keyboard-loader';
 import { KeyboardTest, NodeProctor } from '@keymanapp/recorder-core';
 
+import { getKeymanRoot } from '../../../getKeymanRoot.mjs';
+const KEYMAN_ROOT = getKeymanRoot();
+
 describe('Engine - Unmatched Final Groups', function() {
   let testJSONtext = fs.readFileSync(require.resolve('@keymanapp/common-test-resources/json/engine_tests/ghp_enter.json'));
   // Common test suite setup.
@@ -24,7 +27,7 @@ describe('Engine - Unmatched Final Groups', function() {
   before(async function() {
     // -- START: Standard Recorder-based unit test loading boilerplate --
     let keyboardLoader = new NodeKeyboardLoader(new KeyboardInterface({}, MinimalKeymanGlobal));
-    const keyboard = await keyboardLoader.loadKeyboardFromPath('../../../../../common/test/' + testSuite.keyboard.filename);
+    const keyboard = await keyboardLoader.loadKeyboardFromPath(KEYMAN_ROOT + '/common/test/' + testSuite.keyboard.filename);
     keyboardWithHarness = keyboardLoader.harness;
     keyboardWithHarness.activeKeyboard = keyboard;
 
diff --git a/web/src/test/auto/headless/getKeymanRoot.mjs b/web/src/test/auto/headless/getKeymanRoot.mjs
new file mode 100644
index 0000000000..ce17cecd0f
--- /dev/null
+++ b/web/src/test/auto/headless/getKeymanRoot.mjs
@@ -0,0 +1,12 @@
+import { createRequire } from 'module';
+import * as path from 'path'
+const require = createRequire(import.meta.url);
+
+export function getKeymanRoot() {
+  let anchorPath = require.resolve('@keymanapp/common-test-resources/index.mjs');
+  let root = path.dirname(anchorPath);
+  for(let i=0; i < 3; i++) {
+    root = path.dirname(root);
+  }
+  return root;
+}
\ No newline at end of file

From 39c1727b6fe523c6c1f07e6bb4296f9abad2c527 Mon Sep 17 00:00:00 2001
From: Joshua Horton <jahorton@sil.org>
Date: Wed, 12 Feb 2025 15:55:23 +0700
Subject: [PATCH 14/76] change(web): use env.KEYMAN_ROOT instead of custom
 function

---
 .../engine/js-processor/basic-engine.tests.js        |  5 +++--
 .../headless/engine/js-processor/chirality.tests.js  |  4 ++--
 .../headless/engine/js-processor/deadkeys.tests.js   |  4 ++--
 .../engine/unmatched_final_group.tests.js            |  4 ++--
 web/src/test/auto/headless/getKeymanRoot.mjs         | 12 ------------
 5 files changed, 9 insertions(+), 20 deletions(-)
 delete mode 100644 web/src/test/auto/headless/getKeymanRoot.mjs

diff --git a/web/src/test/auto/headless/engine/js-processor/basic-engine.tests.js b/web/src/test/auto/headless/engine/js-processor/basic-engine.tests.js
index df63ec3106..09780444d9 100644
--- a/web/src/test/auto/headless/engine/js-processor/basic-engine.tests.js
+++ b/web/src/test/auto/headless/engine/js-processor/basic-engine.tests.js
@@ -1,6 +1,7 @@
 import { assert } from 'chai';
 import fs from 'fs';
 
+
 import { createRequire } from 'module';
 const require = createRequire(import.meta.url);
 
@@ -9,8 +10,8 @@ import { KeyboardInterface } from 'keyman/engine/js-processor';
 import { NodeKeyboardLoader } from 'keyman/engine/keyboard/node-keyboard-loader';
 import { KeyboardTest, NodeProctor } from '@keymanapp/recorder-core';
 
-import { getKeymanRoot } from '../../getKeymanRoot.mjs';
-const KEYMAN_ROOT = getKeymanRoot();
+import { env } from 'node:process';
+const KEYMAN_ROOT = env.KEYMAN_ROOT;
 
 describe('Engine - Basic Simulation', function() {
   let testJSONtext = fs.readFileSync(require.resolve('@keymanapp/common-test-resources/json/engine_tests/basic_lao_simulation.json'));
diff --git a/web/src/test/auto/headless/engine/js-processor/chirality.tests.js b/web/src/test/auto/headless/engine/js-processor/chirality.tests.js
index ea068e014d..e8a3e30f9e 100644
--- a/web/src/test/auto/headless/engine/js-processor/chirality.tests.js
+++ b/web/src/test/auto/headless/engine/js-processor/chirality.tests.js
@@ -10,8 +10,8 @@ import { NodeKeyboardLoader } from 'keyman/engine/keyboard/node-keyboard-loader'
 import { KeyboardTest, NodeProctor } from '@keymanapp/recorder-core';
 import { ModifierKeyConstants } from '@keymanapp/common-types';
 
-import { getKeymanRoot } from '../../getKeymanRoot.mjs';
-const KEYMAN_ROOT = getKeymanRoot();
+import { env } from 'node:process';
+const KEYMAN_ROOT = env.KEYMAN_ROOT;
 
 describe('Engine - Chirality', function() {
   let testJSONtext = fs.readFileSync(require.resolve('@keymanapp/common-test-resources/json/engine_tests/chirality.json'));
diff --git a/web/src/test/auto/headless/engine/js-processor/deadkeys.tests.js b/web/src/test/auto/headless/engine/js-processor/deadkeys.tests.js
index ae67121dfd..007a4ec9ec 100644
--- a/web/src/test/auto/headless/engine/js-processor/deadkeys.tests.js
+++ b/web/src/test/auto/headless/engine/js-processor/deadkeys.tests.js
@@ -9,8 +9,8 @@ import { KeyboardInterface } from 'keyman/engine/js-processor';
 import { NodeKeyboardLoader } from 'keyman/engine/keyboard/node-keyboard-loader';
 import { KeyboardTest, NodeProctor } from '@keymanapp/recorder-core';
 
-import { getKeymanRoot } from '../../getKeymanRoot.mjs';
-const KEYMAN_ROOT = getKeymanRoot();
+import { env } from 'node:process';
+const KEYMAN_ROOT = env.KEYMAN_ROOT;
 
 describe('Engine - Deadkeys', function() {
   let testJSONtext = fs.readFileSync(require.resolve('@keymanapp/common-test-resources/json/engine_tests/deadkeys.json'));
diff --git a/web/src/test/auto/headless/engine/js-processor/engine/unmatched_final_group.tests.js b/web/src/test/auto/headless/engine/js-processor/engine/unmatched_final_group.tests.js
index 5ceaf40cf6..fd2536ec22 100644
--- a/web/src/test/auto/headless/engine/js-processor/engine/unmatched_final_group.tests.js
+++ b/web/src/test/auto/headless/engine/js-processor/engine/unmatched_final_group.tests.js
@@ -9,8 +9,8 @@ import { KeyboardInterface } from 'keyman/engine/js-processor';
 import { NodeKeyboardLoader } from 'keyman/engine/keyboard/node-keyboard-loader';
 import { KeyboardTest, NodeProctor } from '@keymanapp/recorder-core';
 
-import { getKeymanRoot } from '../../../getKeymanRoot.mjs';
-const KEYMAN_ROOT = getKeymanRoot();
+import { env } from 'node:process';
+const KEYMAN_ROOT = env.KEYMAN_ROOT;
 
 describe('Engine - Unmatched Final Groups', function() {
   let testJSONtext = fs.readFileSync(require.resolve('@keymanapp/common-test-resources/json/engine_tests/ghp_enter.json'));
diff --git a/web/src/test/auto/headless/getKeymanRoot.mjs b/web/src/test/auto/headless/getKeymanRoot.mjs
deleted file mode 100644
index ce17cecd0f..0000000000
--- a/web/src/test/auto/headless/getKeymanRoot.mjs
+++ /dev/null
@@ -1,12 +0,0 @@
-import { createRequire } from 'module';
-import * as path from 'path'
-const require = createRequire(import.meta.url);
-
-export function getKeymanRoot() {
-  let anchorPath = require.resolve('@keymanapp/common-test-resources/index.mjs');
-  let root = path.dirname(anchorPath);
-  for(let i=0; i < 3; i++) {
-    root = path.dirname(root);
-  }
-  return root;
-}
\ No newline at end of file

From ef824dcfa6dbbe13c18d6fcd7bb4420708eca0a4 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Wed, 12 Feb 2025 11:32:37 +0100
Subject: [PATCH 15/76] chore(linux): update minimum version

---
 docs/build/linux-ubuntu.md              | 2 +-
 docs/minimum-versions.md                | 2 +-
 linux/docs/help/common/index.md         | 4 ++--
 resources/build/minimum-versions.inc.sh | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/build/linux-ubuntu.md b/docs/build/linux-ubuntu.md
index 0f531acb59..9c0b195474 100644
--- a/docs/build/linux-ubuntu.md
+++ b/docs/build/linux-ubuntu.md
@@ -23,7 +23,7 @@ The following projects **cannot** be built on Linux:
 
 ### System Requirements
 
-- Minimum Ubuntu version: Ubuntu 20.04
+- Minimum Ubuntu version: Ubuntu 22.04
 
 Other Linux distributions will also work if appropriate dependencies are installed.
 
diff --git a/docs/minimum-versions.md b/docs/minimum-versions.md
index beb542e408..4f67d5a626 100644
--- a/docs/minimum-versions.md
+++ b/docs/minimum-versions.md
@@ -53,7 +53,7 @@ https://help.keyman.com/developer/engine/android/latest-version/
 | KEYMAN_MIN_TARGET_VERSION_ANDROID_CHROME | 53.0 |
 | KEYMAN_MIN_TARGET_VERSION_IOS | 12.2 |
 | KEYMAN_MIN_TARGET_VERSION_MAC | 10.13 |
-| KEYMAN_MIN_TARGET_VERSION_UBUNTU | 20.04 |
+| KEYMAN_MIN_TARGET_VERSION_UBUNTU | 22.04 |
 | KEYMAN_MIN_TARGET_VERSION_WEB_CHROME | 95.0 |
 | KEYMAN_MIN_TARGET_VERSION_WEB_FIREFOX | 79.0 |
 | KEYMAN_MIN_TARGET_VERSION_WEB_OPERA | 47.0 |
diff --git a/linux/docs/help/common/index.md b/linux/docs/help/common/index.md
index b2d606b38d..a7f9e786bf 100644
--- a/linux/docs/help/common/index.md
+++ b/linux/docs/help/common/index.md
@@ -59,8 +59,8 @@ no on-screen keyboard for Wayland that works with Keyman.
 **A.** Keyman runs on Debian, Ubuntu, Wasta Linux and can be compiled to run
 from source in most distributions.
 
-**Note:** Ubuntu versions before Ubuntu 20.04 LTS are no longer supported with
-Keyman 17. If you are still running an older version and require Keyman you'll
+**Note:** Ubuntu versions before Ubuntu 22.04 LTS are no longer supported with
+Keyman 18. If you are still running an older version and require Keyman you'll
 have to install an older Keyman version.
 
 ## Q. Will my existing Windows Keyman keyboard work with Keyman for Linux?
diff --git a/resources/build/minimum-versions.inc.sh b/resources/build/minimum-versions.inc.sh
index f57ebff419..2e1a2914b1 100644
--- a/resources/build/minimum-versions.inc.sh
+++ b/resources/build/minimum-versions.inc.sh
@@ -14,7 +14,7 @@ KEYMAN_MIN_TARGET_VERSION_ANDROID=5.0         # Lollipop
 KEYMAN_MIN_TARGET_VERSION_IOS=12.2            # iOS 12.2
 KEYMAN_MIN_TARGET_VERSION_WINDOWS=10          # Windows 10
 KEYMAN_MIN_TARGET_VERSION_MAC=10.13           # MacOS 10.13 (High Sierra)
-KEYMAN_MIN_TARGET_VERSION_UBUNTU=20.04        # Ubuntu 20.04 Focal
+KEYMAN_MIN_TARGET_VERSION_UBUNTU=22.04        # Ubuntu 22.04 Jammy
 KEYMAN_MIN_TARGET_VERSION_ANDROID_CHROME=53.0 # min version of Chrome for Keyman for Android
 
 # Target web browsers for KeymanWeb -- we do not have polyfills for

From 53bb152bef5497e7029b303a1141963a4533e17a Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Wed, 12 Feb 2025 11:47:21 +0100
Subject: [PATCH 16/76] docs(linux): update `welcome.md`

---
 linux/docs/help/about/welcome.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/linux/docs/help/about/welcome.md b/linux/docs/help/about/welcome.md
index eacc8c449c..dfd410b46e 100644
--- a/linux/docs/help/about/welcome.md
+++ b/linux/docs/help/about/welcome.md
@@ -6,6 +6,6 @@ Thank you for installing Keyman for Linux. Whether you're a new or returning use
 
 ## What is Keyman for Linux?
 
-Keyman for Linux makes it possible to type in over 1,000 languages in any Linux application.
+Keyman for Linux makes it possible to type in over 2,000 languages in any Linux application.
 
 [Click here](../start/) to get started.

From f1b32a1439c4943b757c75d2d456cde3523e898a Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Wed, 12 Feb 2025 11:58:45 +0100
Subject: [PATCH 17/76] chore(linux): additional code cleanup after Focal
 removal

---
 linux/debian/control                          |  4 +--
 linux/ibus-keyman/src/keymanutil.c            |  5 ++--
 linux/ibus-keyman/src/test/keymanutil.tests.c | 30 +++++--------------
 .../keyman_config/downloadkeyboard.py         |  7 +----
 .../keyman_config/install_window.py           |  7 +----
 .../keyman_config/keyboard_options_view.py    |  7 +----
 linux/keyman-config/keyman_config/welcome.py  |  6 +---
 7 files changed, 15 insertions(+), 51 deletions(-)

diff --git a/linux/debian/control b/linux/debian/control
index fbe7066f5c..e12da18aa3 100644
--- a/linux/debian/control
+++ b/linux/debian/control
@@ -10,7 +10,7 @@ Build-Depends:
  debhelper-compat (= 12),
  dh-python,
  gawk,
- gir1.2-webkit2-4.1 | gir1.2-webkit2-4.0,
+ gir1.2-webkit2-4.1,
  ibus,
  libevdev-dev,
  libgtk-3-dev,
@@ -88,7 +88,7 @@ Architecture: all
 Depends:
  dbus-x11,
  dconf-cli,
- gir1.2-webkit2-4.1 | gir1.2-webkit2-4.0,
+ gir1.2-webkit2-4.1,
  keyman-engine,
  python3-bs4,
  python3-fonttools,
diff --git a/linux/ibus-keyman/src/keymanutil.c b/linux/ibus-keyman/src/keymanutil.c
index 9f48f0ffce..4bb0ac4078 100644
--- a/linux/ibus-keyman/src/keymanutil.c
+++ b/linux/ibus-keyman/src/keymanutil.c
@@ -649,9 +649,8 @@ _ptr_array_new_from_array(
 }
 
 // `g_ptr_array_new_from_null_terminated_array` is only available in GLib 2.76, but we're still
-// stuck to 2.64 (Ubuntu 20.04 Focal) and 2.72 (Ubuntu 22.04 Jammy). Therefore we
-// copy the implementation here (slightly simplified). Once we're past 2.76 we can use the GLib method
-// directly.
+// stuck to 2.72 (Ubuntu 22.04 Jammy). Therefore we copy the implementation here (slightly
+// simplified). Once we're past 2.76 we can use the GLib method directly.
 GPtrArray *
 _g_ptr_array_new_from_null_terminated_array(
     gpointer *data,
diff --git a/linux/ibus-keyman/src/test/keymanutil.tests.c b/linux/ibus-keyman/src/test/keymanutil.tests.c
index 13636857d8..56965a41ad 100644
--- a/linux/ibus-keyman/src/test/keymanutil.tests.c
+++ b/linux/ibus-keyman/src/test/keymanutil.tests.c
@@ -123,22 +123,6 @@ _free_tst_kb_data(add_keyboard_data* kb_data) {
 
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(add_keyboard_data, _free_tst_kb_data)
 
-// Newer glib versions have g_assert_cmpstrv which would allow to do
-// g_assert_cmpstrv(result, keyboards);
-// but unfortunately Ubuntu 20.04 Focal doesn't have that, so we roll
-// our own
-void
-_kmn_assert_cmpstrv(gchar** result, gchar** expected) {
-  g_assert_nonnull(result);
-  g_assert_nonnull(expected);
-  int i = 0;
-  for (; result[i] && expected[i]; i++) {
-    g_assert_cmpstr(result[i], ==, expected[i]);
-  }
-  g_assert_null(result[i]);
-  g_assert_null(expected[i]);
-}
-
 //----------------------------------------------------------------------------------------------
 void
 test_keyman_put_keyboard_options_todconf__invalid() {
@@ -526,7 +510,7 @@ test_keyman_set_custom_keyboards__new_key() {
   // Verify
   g_auto(GStrv) result = _get_tst_kbds_key();
   g_assert_nonnull(result);
-  _kmn_assert_cmpstrv(result, keyboards);
+  g_assert_cmpstrv(result, keyboards);
 
   // Cleanup
   _delete_tst_kbds_key();
@@ -546,7 +530,7 @@ test_keyman_set_custom_keyboards__overwrite_key() {
   // Verify
   g_auto(GStrv) result = _get_tst_kbds_key();
   g_assert_nonnull(result);
-  _kmn_assert_cmpstrv(result, keyboards);
+  g_assert_cmpstrv(result, keyboards);
 
   // Cleanup
   _delete_tst_kbds_key();
@@ -565,7 +549,7 @@ test_keyman_set_custom_keyboards__delete_key_NULL() {
   g_auto(GStrv) result = _get_tst_kbds_key();
   gchar* expected[] = {NULL};
   g_assert_nonnull(result);
-  _kmn_assert_cmpstrv(result, expected);
+  g_assert_cmpstrv(result, expected);
 
   // Cleanup
   _delete_tst_kbds_key();
@@ -585,7 +569,7 @@ test_keyman_set_custom_keyboards__delete_key_empty_array() {
   // Verify
   g_auto(GStrv) result = _get_tst_kbds_key();
   g_assert_nonnull(result);
-  _kmn_assert_cmpstrv(result, keyboards);
+  g_assert_cmpstrv(result, keyboards);
 
   // Cleanup
   _delete_tst_kbds_key();
@@ -604,7 +588,7 @@ test_keyman_set_custom_keyboards__invalid_values() {
   g_auto(GStrv) result = _get_tst_kbds_key();
   g_assert_nonnull(result);
   gchar* expected[] = {"fr:/tmp/test/test.kmx", NULL};
-  _kmn_assert_cmpstrv(result, expected);
+  g_assert_cmpstrv(result, expected);
 
   // Cleanup
   _delete_tst_kbds_key();
@@ -622,7 +606,7 @@ test_keyman_get_custom_keyboards__value() {
 
   // Verify
   g_assert_nonnull(result);
-  _kmn_assert_cmpstrv(result, keyboards);
+  g_assert_cmpstrv(result, keyboards);
 
   // Cleanup
   _delete_tst_kbds_key();
@@ -640,7 +624,7 @@ test_keyman_get_custom_keyboards__invalid_values() {
   // Verify
   gchar* expected[] = {"fr:/tmp/test/test.kmx", NULL};
   g_assert_nonnull(result);
-  _kmn_assert_cmpstrv(result, expected);
+  g_assert_cmpstrv(result, expected);
 
   // Cleanup
   _delete_tst_kbds_key();
diff --git a/linux/keyman-config/keyman_config/downloadkeyboard.py b/linux/keyman-config/keyman_config/downloadkeyboard.py
index 42ff74308d..ca3b091f92 100755
--- a/linux/keyman-config/keyman_config/downloadkeyboard.py
+++ b/linux/keyman-config/keyman_config/downloadkeyboard.py
@@ -7,12 +7,7 @@ import urllib.parse
 import gi
 
 gi.require_version('Gtk', '3.0')
-try:
-    gi.require_version('WebKit2', '4.1')
-except ValueError:
-    # TODO: Remove once we drop support for Ubuntu 20.04 Focal
-    gi.require_version('WebKit2', '4.0')
-
+gi.require_version('WebKit2', '4.1')
 from gi.repository import Gtk, WebKit2
 
 from keyman_config import KeymanComUrl, _, __releaseversion__, __tier__
diff --git a/linux/keyman-config/keyman_config/install_window.py b/linux/keyman-config/keyman_config/install_window.py
index dda242c7e1..1342dd44f6 100755
--- a/linux/keyman-config/keyman_config/install_window.py
+++ b/linux/keyman-config/keyman_config/install_window.py
@@ -15,12 +15,7 @@ import packaging.version
 import gi
 
 gi.require_version('Gtk', '3.0')
-try:
-    gi.require_version('WebKit2', '4.1')
-except ValueError:
-    # TODO: Remove once we drop support for Ubuntu 20.04 Focal
-    gi.require_version('WebKit2', '4.0')
-
+gi.require_version('WebKit2', '4.1')
 from gi.repository import Gtk, WebKit2
 
 from keyman_config import _, secure_lookup
diff --git a/linux/keyman-config/keyman_config/keyboard_options_view.py b/linux/keyman-config/keyman_config/keyboard_options_view.py
index 795386d7bf..38499a558a 100644
--- a/linux/keyman-config/keyman_config/keyboard_options_view.py
+++ b/linux/keyman-config/keyman_config/keyboard_options_view.py
@@ -8,12 +8,7 @@ from urllib.parse import parse_qsl, urlencode
 import gi
 
 gi.require_version('Gtk', '3.0')
-try:
-    gi.require_version('WebKit2', '4.1')
-except ValueError:
-    # TODO: Remove once we drop support for Ubuntu 20.04 Focal
-    gi.require_version('WebKit2', '4.0')
-
+gi.require_version('WebKit2', '4.1')
 from gi.repository import Gtk, WebKit2
 
 from keyman_config import _
diff --git a/linux/keyman-config/keyman_config/welcome.py b/linux/keyman-config/keyman_config/welcome.py
index af001ea464..a14d747c6a 100644
--- a/linux/keyman-config/keyman_config/welcome.py
+++ b/linux/keyman-config/keyman_config/welcome.py
@@ -7,11 +7,7 @@ import webbrowser
 import gi
 
 gi.require_version('Gtk', '3.0')
-try:
-    gi.require_version('WebKit2', '4.1')
-except ValueError:
-    # TODO: Remove once we drop support for Ubuntu 20.04 Focal
-    gi.require_version('WebKit2', '4.0')
+gi.require_version('WebKit2', '4.1')
 from gi.repository import Gtk, WebKit2
 
 from keyman_config import _

From bbc3142c3c05a7c8c4d0a35f6f74303a2e4fc679 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Wed, 12 Feb 2025 18:01:21 +0100
Subject: [PATCH 18/76] docs(linux): update what's new for 18.0

Fixes: #13183
---
 linux/docs/help/about/whatsnew.md | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/linux/docs/help/about/whatsnew.md b/linux/docs/help/about/whatsnew.md
index 4a4d5a30e1..35edaa60ab 100644
--- a/linux/docs/help/about/whatsnew.md
+++ b/linux/docs/help/about/whatsnew.md
@@ -2,4 +2,12 @@
 title: What's New in Keyman 18.0 for Linux
 ---
 
-Here are some of the new features we have added to Keyman for Linux 18.0:
+Here are some significant changes to Keyman for Linux 18.0:
+
+- Minimum supported Ubuntu version is now 22.04 Jammy LTS.
+- Other supported versions are Ubuntu 24.04 Noble LTS and
+  Ubuntu 24.10 Oracular. Users that are running an older version of
+  Ubuntu will have to continue using an older Keyman version.
+- Keyman no longer requires a patched version of ibus as Keyman now uses
+  a system service to manage keystroke order (#11535).
+- Added support for simulation of AltGr (right Alt) with Ctrl+Alt (#11852)

From 67d26a9d3f9074c11cb4a6b5a504d346c89b9e79 Mon Sep 17 00:00:00 2001
From: Keyman Build Agent <buildagent@keyman.com>
Date: Wed, 12 Feb 2025 13:01:06 -0500
Subject: [PATCH 19/76] auto: increment master version to 19.0.3

---
 HISTORY.md | 4 ++++
 VERSION.md | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/HISTORY.md b/HISTORY.md
index e907cc12dd..544a275dea 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,5 +1,9 @@
 # Keyman Version History
 
+## 19.0.2 alpha 2025-02-12
+
+* chore(linux): remove support of Ubuntu 20.04 Focal (#13203)
+
 ## 19.0.1 alpha 2025-02-11
 
 * refactor(windows): rename `TKeymanMutex.MutexOwned` to `TakeOwnership` and add `ReleaseOwnership` (#13168)
diff --git a/VERSION.md b/VERSION.md
index fc1a009252..dd7d796646 100644
--- a/VERSION.md
+++ b/VERSION.md
@@ -1 +1 @@
-19.0.2
\ No newline at end of file
+19.0.3
\ No newline at end of file

From d4f96d66b74359426021b96ad546617ba6f32eb5 Mon Sep 17 00:00:00 2001
From: Darcy Wong <darcy_wong@sil.org>
Date: Wed, 5 Feb 2025 10:17:25 +0700
Subject: [PATCH 20/76] fix(android): Check WebView is installed and enabled

Fixes: #11560
Fixes: KEYMAN-ANDROID-5E9
Fixes: KEYMAN-ANDROID-6MA
---
 .../com/tavultesoft/kmapro/MainActivity.java  | 102 ++++++++++++------
 .../src/main/res/layout/activity_main.xml     |   4 +-
 ...ut.xml => check_chrome_webview_layout.xml} |   8 +-
 .../java/com/keyman/engine/KMKeyboard.java    |  19 +++-
 .../java/com/keyman/engine/KMManager.java     |  37 +++++--
 .../java/com/keyman/engine/KMTextView.java    |   6 +-
 .../com/keyman/engine/util/WebViewUtils.java  |  39 ++++++-
 .../KMEA/app/src/main/res/values/strings.xml  |  39 +++++--
 8 files changed, 190 insertions(+), 64 deletions(-)
 rename android/KMAPro/kMAPro/src/main/res/layout/{update_chrome_layout.xml => check_chrome_webview_layout.xml} (86%)

diff --git a/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/MainActivity.java b/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/MainActivity.java
index 908d2f4538..98e26959b7 100644
--- a/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/MainActivity.java
+++ b/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/MainActivity.java
@@ -43,7 +43,9 @@ import com.keyman.android.DownloadIntentService;
 import com.keyman.engine.util.KMLog;
 import com.keyman.engine.util.KMPLink;
 import com.keyman.engine.util.KMString;
+import com.keyman.engine.util.WebViewUtils;
 import com.keyman.engine.util.WebViewUtils.EngineWebViewVersionStatus;
+import com.keyman.engine.util.WebViewUtils.SystemWebViewStatus;
 
 import android.Manifest;
 import android.app.ProgressDialog;
@@ -153,6 +155,7 @@ public class MainActivity extends BaseActivity implements OnKeyboardEventListene
       KMManager.setDebugMode(true);
     }
 
+    // Verify WebView installed and enabled before attempting to initialize KMManager
     KMManager.initialize(getApplicationContext(), KeyboardType.KEYBOARD_TYPE_INAPP);
     KMManager.executeResourceUpdate(this);
 
@@ -181,8 +184,8 @@ public class MainActivity extends BaseActivity implements OnKeyboardEventListene
     textView.setTextSize((float) textSize);
     textView.setSelection(textView.getText().length());
 
-    // Use in-app keyboard WebView to check the Chrome version
-    checkChromeVersion(KMManager.getKMKeyboard(KeyboardType.KEYBOARD_TYPE_INAPP));
+    // Check WebView enabled and Chrome version
+    checkWebViewAndChromeVersion(context);
     CheckInstallReferrer.checkGooglePlayInstallReferrer(this, context);
     checkGetStarted();
   }
@@ -770,39 +773,70 @@ public class MainActivity extends BaseActivity implements OnKeyboardEventListene
     KMManager.setHapticFeedback(mayHaveHapticFeedback);
   }
 
-  private void checkChromeVersion(WebView webView) {
-    if (KMManager.getEngineWebViewVersionStatus() != EngineWebViewVersionStatus.FULL) {
-      LinearLayout updateChromeLayout = (LinearLayout) findViewById(R.id.updateChromeLayout);
-      updateChromeLayout.setVisibility(View.VISIBLE);
-
-      Button updateChromeButton = (Button)findViewById(R.id.updateChromeButton);
-      updateChromeButton.setOnClickListener(new View.OnClickListener() {
-        public void onClick(View v) {
-          // Launch PlayStore to update Chrome
-          try {
-            Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse("market://details?id=com.android.chrome"));
-            if (intent.resolveActivity(getPackageManager()) != null) {
-              startActivity(intent);
-            } else {
-              intent = new Intent(Intent.ACTION_VIEW, Uri.parse("https://play.google.com/store/apps/details?id=com.android.chrome"));
-              if (intent.resolveActivity(getPackageManager()) != null) {
-                startActivity(intent);
-              } else {
-                Toast.makeText(getApplicationContext(), getString(R.string.unable_to_open_browser), Toast.LENGTH_SHORT).show();
-              }
-            }
-          } catch (android.content.ActivityNotFoundException e) {
-            // Link to Chrome if user is not signed in to Play Store
-            Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse("https://play.google.com/store/apps/details?id=com.android.chrome"));
-            if (intent.resolveActivity(getPackageManager()) != null) {
-              startActivity(intent);
-            } else {
-              Toast.makeText(getApplicationContext(), getString(R.string.unable_to_open_browser), Toast.LENGTH_SHORT).show();
-            }
-          }
-        }
-      });
+  /**
+   * Check that WebView is enabled and Chrome version high enough for Keyman.
+   * If they're not, update the view and button to install/enable the missing app.
+   * @param context
+   */
+  private void checkWebViewAndChromeVersion(Context context) {
+    final SystemWebViewStatus webViewStatus = WebViewUtils.getSystemWebViewStatus(context);
+    final boolean updateChrome = KMManager.getEngineWebViewVersionStatus() != EngineWebViewVersionStatus.FULL;
+    if (webViewStatus == SystemWebViewStatus.FULL && !updateChrome) {
+      return;
     }
+
+    final TextView textView = (TextView)findViewById((R.id.kmWebViewChromeTextView));
+    String buttonLabel = getString(R.string.button_update_chrome);
+    if (webViewStatus == SystemWebViewStatus.NOT_INSTALLED) {
+      textView.setText(getString(R.string.body_install_webview));
+      buttonLabel = getString(R.string.label_install_webview);
+    } else if (webViewStatus == SystemWebViewStatus.DISABLED) {
+      textView.setText(R.string.body_enable_webview);
+      buttonLabel = getString(R.string.label_enable_webview);
+    }
+
+    LinearLayout webViewChromeLayout = (LinearLayout) findViewById(R.id.checkWebViewChromeLayout);
+    webViewChromeLayout.setVisibility(View.VISIBLE);
+
+    Button button = (Button)findViewById(R.id.webViewChromeButton);
+    button.setText(buttonLabel);
+    button.setOnClickListener(new View.OnClickListener() {
+      public void onClick(View v) {
+        // Initialize the intent to something (alternate Play Store link to install/update Chrome)
+        Intent intent = new Intent(Intent.ACTION_VIEW,
+          Uri.parse("https://play.google.com/store/apps/details?id=com.android.chrome"));
+        if (webViewStatus == SystemWebViewStatus.NOT_INSTALLED) {
+          // Play Store link to install WebView
+          intent = new Intent(Intent.ACTION_VIEW,
+            Uri.parse("https://play.google.com/store/apps/details?id=com.google.android.webview"));
+        } else if (webViewStatus == SystemWebViewStatus.DISABLED) {
+          // Application settings to enable WebView
+          intent = new Intent("android.settings.APPLICATION_DETAILS_SETTINGS",
+            Uri.parse("package:com.google.android.webview"));
+        } else if (updateChrome) {
+          // Primary Play Store link to install/update Chrome
+          intent = new Intent(Intent.ACTION_VIEW,
+            Uri.parse("market://details?id=com.android.chrome"));
+        }
+
+        // Launch intent
+        try {
+          PackageManager packageManager = context.getPackageManager();
+          if (intent.resolveActivity(packageManager) != null) {
+            startActivity(intent);
+          } else {
+            // (alternate Play Store link to install/update Chrome)
+            intent = new Intent(Intent.ACTION_VIEW,
+              Uri.parse("https://play.google.com/store/apps/details?id=com.android.chrome"));
+
+            intent.resolveActivity(packageManager);
+            startActivity(intent);
+          }
+        } catch (android.content.ActivityNotFoundException e) {
+          Toast.makeText(getApplicationContext(), getString(R.string.unable_to_open_browser), Toast.LENGTH_SHORT).show();
+        }
+      }
+    });
   }
 
   private Uri requestPermissionIntentUri;
diff --git a/android/KMAPro/kMAPro/src/main/res/layout/activity_main.xml b/android/KMAPro/kMAPro/src/main/res/layout/activity_main.xml
index 87c7fe16f9..c2911272d1 100644
--- a/android/KMAPro/kMAPro/src/main/res/layout/activity_main.xml
+++ b/android/KMAPro/kMAPro/src/main/res/layout/activity_main.xml
@@ -11,7 +11,7 @@
 
     <include layout="@layout/titlebar" />
 
-    <include layout="@layout/update_chrome_layout"
+    <include layout="@layout/check_chrome_webview_layout"
       android:visibility="gone"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
@@ -22,7 +22,7 @@
         android:background="@drawable/textview_bg"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_below="@id/updateChromeLayout"
+        android:layout_below="@id/checkWebViewChromeLayout"
         android:ems="10"
         android:inputType="textMultiLine|textNoSuggestions"
         android:hint="@string/textview_hint"
diff --git a/android/KMAPro/kMAPro/src/main/res/layout/update_chrome_layout.xml b/android/KMAPro/kMAPro/src/main/res/layout/check_chrome_webview_layout.xml
similarity index 86%
rename from android/KMAPro/kMAPro/src/main/res/layout/update_chrome_layout.xml
rename to android/KMAPro/kMAPro/src/main/res/layout/check_chrome_webview_layout.xml
index 5c01c4533c..09716bdd8a 100644
--- a/android/KMAPro/kMAPro/src/main/res/layout/update_chrome_layout.xml
+++ b/android/KMAPro/kMAPro/src/main/res/layout/check_chrome_webview_layout.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  android:id="@+id/updateChromeLayout"
+  android:id="@+id/checkWebViewChromeLayout"
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
   android:background="@android:color/white"
   android:orientation="horizontal">
 
-  <!-- Banner to display if old version of Chrome installed -->
+  <!-- Banner to display if WebView is not installed/enabled or old version of Chrome installed -->
   <TextView
-    android:id="@+id/kmUpgradeChromeTextView"
+    android:id="@+id/kmWebViewChromeTextView"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_weight="1"
@@ -20,7 +20,7 @@
     android:textSize="@dimen/update_chrome_label_textsize" />
 
   <Button
-    android:id="@+id/updateChromeButton"
+    android:id="@+id/webViewChromeButton"
     style="@style/Widget.AppCompat.Button.Colored"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
diff --git a/android/KMEA/app/src/main/java/com/keyman/engine/KMKeyboard.java b/android/KMEA/app/src/main/java/com/keyman/engine/KMKeyboard.java
index de01e0bcc5..3d8a93653f 100644
--- a/android/KMEA/app/src/main/java/com/keyman/engine/KMKeyboard.java
+++ b/android/KMEA/app/src/main/java/com/keyman/engine/KMKeyboard.java
@@ -32,6 +32,7 @@ import android.content.res.Configuration;
 import android.net.Uri;
 import android.os.Handler;
 import android.os.Looper;
+import android.util.AndroidRuntimeException;
 import android.util.DisplayMetrics;
 import android.util.Log;
 import android.view.GestureDetector;
@@ -110,14 +111,28 @@ final class KMKeyboard extends WebView {
 
   public String specialOskFont = "";
 
-  public KMKeyboard(Context context) {
+  /**
+   * Constructor for KMKeyboard.
+   * If System WebView not installed/enabled, will throw AndroidRuntimeException.
+   * Can't catch the exception here because super(context) must be the first line.
+   * @param context
+   * @throws AndroidRuntimeException
+   */
+  public KMKeyboard(Context context) throws AndroidRuntimeException {
     super(context);
     this.context = context;
     this.keyboardType = KeyboardType.KEYBOARD_TYPE_INAPP;
     initKMKeyboard(context);
   }
 
-  public KMKeyboard(Context context, KeyboardType keyboardType) {
+  /**
+   * Constructor for KMKeyboard.
+   * If System WebView not installed/enabled, will throw AndroidRuntimeException.
+   * Can't catch the exception here because super(context) must be the first line.
+   * @param context
+   * @throws AndroidRuntimeException
+   */
+  public KMKeyboard(Context context, KeyboardType keyboardType) throws AndroidRuntimeException {
     super(context);
     this.context = context;
     this.keyboardType = keyboardType;
diff --git a/android/KMEA/app/src/main/java/com/keyman/engine/KMManager.java b/android/KMEA/app/src/main/java/com/keyman/engine/KMManager.java
index 0e4c261232..a35623ad79 100644
--- a/android/KMEA/app/src/main/java/com/keyman/engine/KMManager.java
+++ b/android/KMEA/app/src/main/java/com/keyman/engine/KMManager.java
@@ -33,6 +33,7 @@ import android.net.NetworkInfo;
 import android.os.Build;
 import android.os.IBinder;
 import android.text.InputType;
+import android.util.AndroidRuntimeException;
 import android.util.DisplayMetrics;
 import android.util.Log;
 import android.view.View;
@@ -48,6 +49,7 @@ import android.view.inputmethod.InputMethodManager;
 import android.webkit.WebView;
 import android.widget.FrameLayout;
 import android.widget.RelativeLayout;
+import android.widget.Toast;
 
 import androidx.core.content.ContextCompat;
 
@@ -73,6 +75,7 @@ import com.keyman.engine.util.KMLog;
 import com.keyman.engine.util.KMString;
 import com.keyman.engine.util.MapCompat;
 import com.keyman.engine.util.WebViewUtils;
+import com.keyman.engine.util.WebViewUtils.SystemWebViewStatus;
 
 import org.json.JSONArray;
 import org.json.JSONException;
@@ -687,12 +690,26 @@ public final class KMManager {
     KMKeyboardWebViewClient webViewClient = null;
 
     if (keyboardType == KeyboardType.KEYBOARD_TYPE_INAPP && InAppKeyboard == null) {
-      InAppKeyboard = new KMKeyboard(appContext, KeyboardType.KEYBOARD_TYPE_INAPP);
+      try {
+        InAppKeyboard = new KMKeyboard(appContext, KeyboardType.KEYBOARD_TYPE_INAPP);
+      } catch (AndroidRuntimeException e) {
+        // Catch fatal error when WebView not installed/enabled
+        return;
+      }
       InAppKeyboardWebViewClient = new KMKeyboardWebViewClient(appContext, keyboardType);
       keyboard = InAppKeyboard;
       webViewClient = InAppKeyboardWebViewClient;
     } else if (keyboardType == KeyboardType.KEYBOARD_TYPE_SYSTEM && SystemKeyboard == null) {
-      SystemKeyboard = new KMKeyboard(appContext, KeyboardType.KEYBOARD_TYPE_SYSTEM);
+      try {
+        SystemKeyboard = new KMKeyboard(appContext, KeyboardType.KEYBOARD_TYPE_SYSTEM);
+      } catch (AndroidRuntimeException e) {
+        // Catch fatal error when WebView not installed/enabled
+        // Direct user to pick another system keyboard
+        InputMethodManager imManager = (InputMethodManager) appContext.getSystemService(Context.INPUT_METHOD_SERVICE);
+        imManager.showInputMethodPicker();
+
+        return;
+      }
       SystemKeyboardWebViewClient = new KMKeyboardWebViewClient(appContext, keyboardType);
       keyboard = SystemKeyboard;
       webViewClient = SystemKeyboardWebViewClient;
@@ -776,6 +793,10 @@ public final class KMManager {
     final FrameLayout mainLayout = new FrameLayout(appContext);
     mainLayout.setLayoutParams(new FrameLayout.LayoutParams(FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams.MATCH_PARENT));
 
+    if (SystemKeyboard == null) {
+      return mainLayout;
+    }
+
     RelativeLayout keyboardLayout = new RelativeLayout(appContext);
     keyboardLayout.setLayoutParams(new FrameLayout.LayoutParams(FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams.MATCH_PARENT));
     ViewGroup parent = (ViewGroup) SystemKeyboard.getParent();
@@ -2301,9 +2322,9 @@ public final class KMManager {
   public static boolean updateText(KeyboardType kbType, String text) {
     boolean result = false;
 
-    if (kbType == KeyboardType.KEYBOARD_TYPE_INAPP) {
+    if (kbType == KeyboardType.KEYBOARD_TYPE_INAPP && InAppKeyboard != null) {
       return InAppKeyboard.updateText(text);
-    } else if (kbType == KeyboardType.KEYBOARD_TYPE_SYSTEM) {
+    } else if (kbType == KeyboardType.KEYBOARD_TYPE_SYSTEM && SystemKeyboard != null) {
       return SystemKeyboard.updateText(text);
     }
 
@@ -2335,13 +2356,13 @@ public final class KMManager {
   public static boolean updateSelectionRange(KeyboardType kbType) {
     boolean result = false;
 
-    if (kbType == KeyboardType.KEYBOARD_TYPE_INAPP) {
+    if (kbType == KeyboardType.KEYBOARD_TYPE_INAPP && InAppKeyboard != null) {
       if (isKeyboardLoaded(KeyboardType.KEYBOARD_TYPE_INAPP) && !InAppKeyboard.shouldIgnoreSelectionChange()) {
         result = InAppKeyboard.updateSelectionRange();
       }
 
       InAppKeyboard.setShouldIgnoreSelectionChange(false);
-    } else if (kbType == KeyboardType.KEYBOARD_TYPE_SYSTEM) {
+    } else if (kbType == KeyboardType.KEYBOARD_TYPE_SYSTEM && SystemKeyboard != null) {
       if (isKeyboardLoaded(KeyboardType.KEYBOARD_TYPE_SYSTEM) && !SystemKeyboard.shouldIgnoreSelectionChange()) {
         result = SystemKeyboard.updateSelectionRange();
       }
@@ -2354,11 +2375,11 @@ public final class KMManager {
 
   public static void resetContext(KeyboardType kbType) {
     if (kbType == KeyboardType.KEYBOARD_TYPE_INAPP) {
-      if (isKeyboardLoaded(KeyboardType.KEYBOARD_TYPE_INAPP)) {
+      if (isKeyboardLoaded(KeyboardType.KEYBOARD_TYPE_INAPP) && InAppKeyboard != null) {
         InAppKeyboard.loadJavascript("resetContext()");
       }
     } else if (kbType == KeyboardType.KEYBOARD_TYPE_SYSTEM) {
-      if (isKeyboardLoaded(KeyboardType.KEYBOARD_TYPE_SYSTEM)) {
+      if (isKeyboardLoaded(KeyboardType.KEYBOARD_TYPE_SYSTEM) && SystemKeyboard != null) {
         SystemKeyboard.loadJavascript("resetContext()");
       }
     }
diff --git a/android/KMEA/app/src/main/java/com/keyman/engine/KMTextView.java b/android/KMEA/app/src/main/java/com/keyman/engine/KMTextView.java
index 3c5959fc9d..e9c3ce4e11 100644
--- a/android/KMEA/app/src/main/java/com/keyman/engine/KMTextView.java
+++ b/android/KMEA/app/src/main/java/com/keyman/engine/KMTextView.java
@@ -119,7 +119,7 @@ public final class KMTextView extends AppCompatEditText {
       public void onFocusChange(View v, boolean hasFocus) {
         if (hasFocus) {
           activeView = v;
-          if (KMManager.InAppKeyboardWebViewClient.getKeyboardLoaded()) {
+          if (KMManager.InAppKeyboard != null && KMManager.InAppKeyboardWebViewClient.getKeyboardLoaded()) {
             updateTextContext();
           }
           showKeyboard();
@@ -165,7 +165,7 @@ public final class KMTextView extends AppCompatEditText {
   protected void onSelectionChanged(int selStart, int selEnd) {
     super.onSelectionChanged(selStart, selEnd);
     if (activeView != null && activeView.equals(this)) {
-      if (KMManager.updateSelectionRange(KMManager.KeyboardType.KEYBOARD_TYPE_INAPP)) {
+      if (KMManager.InAppKeyboard != null && KMManager.updateSelectionRange(KMManager.KeyboardType.KEYBOARD_TYPE_INAPP)) {
         KMManager.resetContext(KeyboardType.KEYBOARD_TYPE_INAPP);
       }
     }
@@ -176,7 +176,7 @@ public final class KMTextView extends AppCompatEditText {
     AppCompatActivity activity = (AppCompatActivity)context;
 
     Window mainWindow = activity.getWindow();
-    if (hasWindowFocus) {
+    if (hasWindowFocus && KMManager.InAppKeyboard != null) {
       KMManager.InAppKeyboardWebViewClient.setContext(context);
       activeView = mainWindow.getCurrentFocus();
 
diff --git a/android/KMEA/app/src/main/java/com/keyman/engine/util/WebViewUtils.java b/android/KMEA/app/src/main/java/com/keyman/engine/util/WebViewUtils.java
index 1c60193dc7..0993abac0d 100644
--- a/android/KMEA/app/src/main/java/com/keyman/engine/util/WebViewUtils.java
+++ b/android/KMEA/app/src/main/java/com/keyman/engine/util/WebViewUtils.java
@@ -4,9 +4,11 @@
 package com.keyman.engine.util;
 
 import android.content.Context;
+import android.content.pm.PackageManager;
+import android.util.AndroidRuntimeException;
 import android.view.ViewGroup;
+import android.webkit.CookieManager;
 import android.webkit.WebView;
-import com.keyman.engine.util.KMLog;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -22,6 +24,14 @@ public final class WebViewUtils {
     FULL;         // WebView supports touch keyboards and LDML keyboards
   }
 
+  // System WebView status
+  public enum SystemWebViewStatus {
+    UNDETERMINED,  // Functionality not determined yet
+    NOT_INSTALLED, // WebView not installed
+    DISABLED,      // WebView installed, but disabled
+    FULL;          // WebView installed and enabled
+  }
+
   private static final String CHROME_INSTALL_PATTERN_FORMATSTR = "^.*Chrome/([\\d.]+).*$";
   private static final Pattern installPattern = Pattern.compile(CHROME_INSTALL_PATTERN_FORMATSTR);
 
@@ -51,6 +61,33 @@ public final class WebViewUtils {
     return EngineWebViewVersionStatus.FULL;
   }
 
+  /**
+   * Determine the state of the system WebView (required for Keyman)
+   * @param context
+   * @return {SystemWebViewStatus}
+   */
+  public static SystemWebViewStatus getSystemWebViewStatus(
+      Context context) {
+    // Check whether WebView is installed - this also returns true when installed but disabled
+    PackageManager packageManager = context.getPackageManager();
+    if (!packageManager.hasSystemFeature("android.software.webview")) {
+      return SystemWebViewStatus.NOT_INSTALLED;
+    }
+
+    // Use CookieManager to check if WebView is really enabled
+    // https://stackoverflow.com/a/70354583
+    try {
+      CookieManager.getInstance();
+    } catch (AndroidRuntimeException e) {
+      // WebView installed but not enabled
+      return SystemWebViewStatus.DISABLED;
+    } catch (Exception e) {
+      return SystemWebViewStatus.DISABLED;
+    }
+
+    return SystemWebViewStatus.FULL;
+  }
+
   // Inject a meta viewport tag into the head of the file if it doesn't exist
   public static void injectViewport(WebView webView) {
     if (webView != null) {
diff --git a/android/KMEA/app/src/main/res/values/strings.xml b/android/KMEA/app/src/main/res/values/strings.xml
index 5c5d6f3173..658e8e7eba 100644
--- a/android/KMEA/app/src/main/res/values/strings.xml
+++ b/android/KMEA/app/src/main/res/values/strings.xml
@@ -9,14 +9,14 @@
 
     <!-- Context: Title for list -->
     <plurals name="title_keyboards">
-      <item quantity="one">Keyboard</item>
-      <item quantity="other">Keyboards</item>
+        <item quantity="one">Keyboard</item>
+        <item quantity="other">Keyboards</item>
     </plurals>
 
     <!-- Context: Title for list -->
     <plurals name="title_other_input_methods">
-      <item quantity="one">Other Input Method</item>
-      <item quantity="other">Other Input Methods</item>
+        <item quantity="one">Other Input Method</item>
+        <item quantity="other">Other Input Methods</item>
     </plurals>
 
     <!-- Context: Title for list -->
@@ -127,10 +127,28 @@
     <string name="fatal_keyboard_error" comment="Fatal keyboard error (keyboard ID::packageID for language). Will load default keyboard">
       Fatal keyboard error with %1$s:%2$s for %3$s language. Loading default keyboard.</string>
 
-  <!-- Context: Fatal keyboard error.  -->
-  <string name="fatal_keyboard_error_short" comment="Error in keyboard (keyboard ID::packageID for language).">
+    <!-- Context: Fatal keyboard error.  -->
+    <string name="fatal_keyboard_error_short" comment="Error in keyboard (keyboard ID::packageID for language).">
       Error in keyboard %1$s:%2$s for %3$s language.</string>
 
+    <!-- Context: Alert Dialog title: System WebView not installed or enabled -->
+    <string name="alert_dialog_title_webview_missing">
+        Fatal Error: WebView Missing</string>
+
+    <!-- Context: Alert Dialog body: System WebView not installed -->
+    <string name="body_install_webview" comment="Notification when WebView not installed">
+        Keyman requires WebView to be installed."</string>
+
+    <!-- Context: Alert Dialog body: System WebView installed but not enabled -->
+    <string name="body_enable_webview" comment="Notification when WebView installed but not enabled">
+        Keyman requires WebView to be enabled."</string>
+
+    <!-- Context Button label: Install WebView -->
+    <string name="label_install_webview" comment="Button label to install webview">Install WebView</string>
+
+    <!-- Context Button label: Enable WebView -->
+    <string name="label_enable_webview" comment="Button label to enable webview">Enable WebView</string>
+
     <!-- Context: Query for associated dictionary -->
     <string name="query_associated_model" comment="Check if there's an available dictionary to download">Checking for associated dictionary to download</string>
 
@@ -229,8 +247,8 @@
     <!-- Context: Language Settings menu strings -->
     <string name="model_label">Dictionary</string>
     <plurals name="model_count">
-      <item quantity="one">Dictionary</item>
-      <item quantity="other">Dictionaries</item>
+        <item quantity="one">Dictionary</item>
+        <item quantity="other">Dictionaries</item>
     </plurals>
 
     <!-- Context: Language Settings menu substring - Check for available dictionary -->
@@ -251,8 +269,8 @@
 
     <!-- Context: Language Settings menu strings -->
     <plurals name="keyboard_count">
-      <item quantity="one">(%1$d keyboard)</item>
-      <item quantity="other">(%1$d keyboards)</item>
+        <item quantity="one">(%1$d keyboard)</item>
+        <item quantity="other">(%1$d keyboards)</item>
     </plurals>
 
 
@@ -278,4 +296,5 @@
 
     <!-- Context: anywhere -->
     <string name="unable_to_open_browser" comment="Notification when a browser activity cannot be launched">Unable to launch web browser</string>
+
 </resources>

From b608ca3f17d6292aeca31845dc2f90bb545d6441 Mon Sep 17 00:00:00 2001
From: Darcy Wong <darcy_wong@sil.org>
Date: Thu, 6 Feb 2025 08:23:44 +0700
Subject: [PATCH 21/76] fix(android): Catch KMPBrowserActivity WebView
 exception

---
 .../java/com/tavultesoft/kmapro/KMPBrowserActivity.java  | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/KMPBrowserActivity.java b/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/KMPBrowserActivity.java
index 4410761e6d..e66d5e9ebc 100644
--- a/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/KMPBrowserActivity.java
+++ b/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/KMPBrowserActivity.java
@@ -11,6 +11,7 @@ import android.graphics.Bitmap;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
+import android.util.AndroidRuntimeException;
 import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
@@ -70,7 +71,13 @@ public class KMPBrowserActivity extends BaseActivity {
       }
     }
 
-    setContentView(R.layout.activity_kmp_browser);
+    try {
+      setContentView(R.layout.activity_kmp_browser);
+    } catch (AndroidRuntimeException e) {
+      // WebView not enabled
+      finish();
+      return;
+    }
 
     webView = (WebView) findViewById(R.id.kmpBrowserWebView);
     webView.getSettings().setLayoutAlgorithm(WebSettings.LayoutAlgorithm.NORMAL);

From 474801c239637c23c0fc82c7bb7538b6ff40fef0 Mon Sep 17 00:00:00 2001
From: Darcy Wong <darcy_wong@sil.org>
Date: Thu, 6 Feb 2025 10:21:12 +0700
Subject: [PATCH 22/76] fix(android): Display Toast notification when system
 keyboard fails

---
 android/KMAPro/kMAPro/src/main/AndroidManifest.xml       | 4 ++++
 .../app/src/main/java/com/keyman/engine/KMManager.java   | 9 ++++-----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/android/KMAPro/kMAPro/src/main/AndroidManifest.xml b/android/KMAPro/kMAPro/src/main/AndroidManifest.xml
index bdb1d18a43..70bc8558d7 100644
--- a/android/KMAPro/kMAPro/src/main/AndroidManifest.xml
+++ b/android/KMAPro/kMAPro/src/main/AndroidManifest.xml
@@ -12,6 +12,10 @@
        https://developer.android.com/reference/android/Manifest.permission#READ_EXTERNAL_STORAGE -->
   <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" android:maxSdkVersion="32" />
 
+    <queries>
+        <package android:name="com.android.webkit" />
+        <package android:name="com.google.android.ims" />
+    </queries>
   <!-- Ideally we would declare this permission so we can get other installed keyboard names.
   But would involve a long review process with the Play Store:
   https://support.google.com/googleplay/android-developer/answer/9214102#
diff --git a/android/KMEA/app/src/main/java/com/keyman/engine/KMManager.java b/android/KMEA/app/src/main/java/com/keyman/engine/KMManager.java
index a35623ad79..ed426495d9 100644
--- a/android/KMEA/app/src/main/java/com/keyman/engine/KMManager.java
+++ b/android/KMEA/app/src/main/java/com/keyman/engine/KMManager.java
@@ -703,11 +703,10 @@ public final class KMManager {
       try {
         SystemKeyboard = new KMKeyboard(appContext, KeyboardType.KEYBOARD_TYPE_SYSTEM);
       } catch (AndroidRuntimeException e) {
-        // Catch fatal error when WebView not installed/enabled
-        // Direct user to pick another system keyboard
-        InputMethodManager imManager = (InputMethodManager) appContext.getSystemService(Context.INPUT_METHOD_SERVICE);
-        imManager.showInputMethodPicker();
-
+        // Notify fatal error when WebView not installed/enabled
+        String message = appContext.getString(R.string.body_install_webview);
+        Toast.makeText(appContext, message,
+          Toast.LENGTH_LONG).show();
         return;
       }
       SystemKeyboardWebViewClient = new KMKeyboardWebViewClient(appContext, keyboardType);

From 2cb0dadfa94f651d4344efba3e53751ca6f8d1ea Mon Sep 17 00:00:00 2001
From: Darcy Wong <darcy_wong@sil.org>
Date: Mon, 10 Feb 2025 15:23:28 +0700
Subject: [PATCH 23/76] fix(android): Show WebViewError activity on
 SystemKeyboard exception

---
 android/KMEA/app/src/main/AndroidManifest.xml |  7 +++
 .../java/com/keyman/engine/KMManager.java     | 22 +++++++---
 .../keyman/engine/WebViewErrorActivity.java   | 43 +++++++++++++++++++
 .../res/layout/activity_webview_error.xml     | 41 ++++++++++++++++++
 .../KMEA/app/src/main/res/values/strings.xml  |  6 +++
 .../KMEA/app/src/main/res/values/styles.xml   |  3 ++
 6 files changed, 117 insertions(+), 5 deletions(-)
 create mode 100644 android/KMEA/app/src/main/java/com/keyman/engine/WebViewErrorActivity.java
 create mode 100644 android/KMEA/app/src/main/res/layout/activity_webview_error.xml

diff --git a/android/KMEA/app/src/main/AndroidManifest.xml b/android/KMEA/app/src/main/AndroidManifest.xml
index 304d715ee7..1cba0958ce 100644
--- a/android/KMEA/app/src/main/AndroidManifest.xml
+++ b/android/KMEA/app/src/main/AndroidManifest.xml
@@ -57,6 +57,13 @@
             android:label="@string/app_name"
             android:theme="@style/AppTheme.Light.Dialog" >
         </activity>
+        <activity
+            android:name="com.keyman.engine.WebViewErrorActivity"
+            android:exported="true"
+            android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|screenSize|smallestScreenSize"
+            android:label="@string/app_name"
+            android:theme="@style/AppTheme.NoTitleDialog">
+        </activity>
 
         <!-- Put other WebViewActivities in a separate process so the Keyboard WebView doesn't lag.
         Ref https://stackoverflow.com/questions/40650643/timed-out-waiting-on-iinputcontextcallback-with-custom-keyboard-on-android -->
diff --git a/android/KMEA/app/src/main/java/com/keyman/engine/KMManager.java b/android/KMEA/app/src/main/java/com/keyman/engine/KMManager.java
index ed426495d9..51dbe33a23 100644
--- a/android/KMEA/app/src/main/java/com/keyman/engine/KMManager.java
+++ b/android/KMEA/app/src/main/java/com/keyman/engine/KMManager.java
@@ -49,7 +49,6 @@ import android.view.inputmethod.InputMethodManager;
 import android.webkit.WebView;
 import android.widget.FrameLayout;
 import android.widget.RelativeLayout;
-import android.widget.Toast;
 
 import androidx.core.content.ContextCompat;
 
@@ -229,6 +228,7 @@ public final class KMManager {
   private static boolean debugMode = false;
   private static boolean shouldAllowSetKeyboard = true;
   private static boolean didCopyAssets = false;
+  private static boolean didShowWebViewError = false;
 
   private static boolean didLogHardwareKeystrokeException = false;
 
@@ -671,6 +671,16 @@ public final class KMManager {
     }
   }
 
+  private static void showWebViewError() {
+    Intent i = new Intent(appContext, WebViewErrorActivity.class);
+    i.addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT); // Replaces FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET
+    i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);     // Required to call startActivity() from outside of an Activity context
+    i.addFlags(Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);
+    i.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
+
+    appContext.startActivity(i);
+  }
+
   /**
    * Adjust the keyboard dimensions. If the suggestion banner is active, use the
    * combined banner height and keyboard height
@@ -703,10 +713,7 @@ public final class KMManager {
       try {
         SystemKeyboard = new KMKeyboard(appContext, KeyboardType.KEYBOARD_TYPE_SYSTEM);
       } catch (AndroidRuntimeException e) {
-        // Notify fatal error when WebView not installed/enabled
-        String message = appContext.getString(R.string.body_install_webview);
-        Toast.makeText(appContext, message,
-          Toast.LENGTH_LONG).show();
+        // Catch fatal error when WebView not installed/enabled
         return;
       }
       SystemKeyboardWebViewClient = new KMKeyboardWebViewClient(appContext, keyboardType);
@@ -809,6 +816,11 @@ public final class KMManager {
   }
 
   public static void onStartInput(EditorInfo attribute, boolean restarting) {
+    if (!didShowWebViewError && SystemKeyboard == null && WebViewUtils.getSystemWebViewStatus(appContext) !=
+        SystemWebViewStatus.FULL) {
+      showWebViewError();
+      didShowWebViewError = true;
+    }
     if (!restarting && SystemKeyboard != null) {
       String packageName = attribute.packageName;
       int inputType = attribute.inputType;
diff --git a/android/KMEA/app/src/main/java/com/keyman/engine/WebViewErrorActivity.java b/android/KMEA/app/src/main/java/com/keyman/engine/WebViewErrorActivity.java
new file mode 100644
index 0000000000..09534ce46c
--- /dev/null
+++ b/android/KMEA/app/src/main/java/com/keyman/engine/WebViewErrorActivity.java
@@ -0,0 +1,43 @@
+/**
+ * Keyman is copyright (C) SIL Global. MIT License
+ */
+package com.keyman.engine;
+
+import android.content.Context;
+import android.os.Bundle;
+import android.view.View;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.Button;
+import android.widget.LinearLayout;
+
+/**
+ * Activity to display when WebView is either not installed or enabled.
+ * Prompts user to switch system keyboard.
+ */
+public class WebViewErrorActivity extends BaseActivity {
+  private static final String TAG = "WebViewErrorActivity";
+
+  private static LinearLayout linearLayout = null;
+  private static Button changeIMEButton = null;
+
+  @Override
+  protected void onCreate(Bundle savedInstanceState) {
+    super.onCreate(savedInstanceState);
+
+    final Context context = this;
+    setContentView(R.layout.activity_webview_error);
+
+    linearLayout = (LinearLayout) findViewById(R.id.webViewErrorLayout);
+    changeIMEButton = (Button) findViewById(R.id.changeIMEButton);
+    changeIMEButton.setOnClickListener(new View.OnClickListener() {
+      public void onClick(View v) {
+        InputMethodManager imManager = (InputMethodManager) context.getSystemService(Context.INPUT_METHOD_SERVICE);
+        imManager.showInputMethodPicker();
+
+        // Dismiss the View
+        linearLayout.setVisibility(View.GONE);
+        //finish(); Dismiss IME picker too fast
+      }
+    });
+  }
+}
\ No newline at end of file
diff --git a/android/KMEA/app/src/main/res/layout/activity_webview_error.xml b/android/KMEA/app/src/main/res/layout/activity_webview_error.xml
new file mode 100644
index 0000000000..0b93503ca0
--- /dev/null
+++ b/android/KMEA/app/src/main/res/layout/activity_webview_error.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/webViewErrorLayout"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:background="@android:color/white"
+    android:orientation="vertical">
+
+    <!-- Banner to display if WebView is not installed/enabled -->
+    <TextView
+        android:id="@+id/kmWebViewError"
+        android:drawableStart="@drawable/ic_launcher"
+        android:layout_width="wrap_content"
+        android:layout_height="0dp"
+        android:layout_gravity="center_horizontal|center_vertical"
+        android:layout_marginStart="@dimen/fab_margin"
+        android:layout_marginEnd="@dimen/fab_margin"
+        android:layout_weight="1"
+        android:background="@android:color/white"
+        android:text="@string/body_switch_keyboard"
+        android:textSize="@dimen/titlebar_label_textsize" />
+
+    <Button
+        android:id="@+id/changeIMEButton"
+        style="@style/Widget.AppCompat.Button.Colored"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="end|center_vertical"
+        android:layout_marginStart="@dimen/fab_margin"
+        android:layout_marginEnd="@dimen/fab_margin"
+        android:layout_marginTop="@dimen/fab_margin"
+        android:layout_marginBottom="@dimen/fab_margin"
+        android:paddingStart="@dimen/fab_padding"
+        android:paddingEnd="@dimen/fab_padding"
+        android:background="@android:color/holo_orange_light"
+        android:elevation="1dp"
+        android:singleLine="true"
+        android:text="@string/label_ok"
+        android:textColor="@android:color/white"/>
+
+</LinearLayout>
diff --git a/android/KMEA/app/src/main/res/values/strings.xml b/android/KMEA/app/src/main/res/values/strings.xml
index 658e8e7eba..737d728154 100644
--- a/android/KMEA/app/src/main/res/values/strings.xml
+++ b/android/KMEA/app/src/main/res/values/strings.xml
@@ -139,6 +139,12 @@
     <string name="body_install_webview" comment="Notification when WebView not installed">
         Keyman requires WebView to be installed."</string>
 
+    <!-- ContexT: Alert Dialog body: Switch to another keyboard -->
+    <string name="body_switch_keyboard" comment="Direct user to select another keyboard">
+        Keyman requires WebView to be installed and enabled.\n\n
+        Switch to a different keyboard.
+    </string>
+
     <!-- Context: Alert Dialog body: System WebView installed but not enabled -->
     <string name="body_enable_webview" comment="Notification when WebView installed but not enabled">
         Keyman requires WebView to be enabled."</string>
diff --git a/android/KMEA/app/src/main/res/values/styles.xml b/android/KMEA/app/src/main/res/values/styles.xml
index e21242fea9..ef8daf5ca9 100644
--- a/android/KMEA/app/src/main/res/values/styles.xml
+++ b/android/KMEA/app/src/main/res/values/styles.xml
@@ -22,6 +22,9 @@
         <item name="android:textColorPrimary">@android:color/black</item>
         <item name="android:windowBackground">@android:color/transparent</item>
     </style>
+    <style name="AppTheme.NoTitleDialog" parent="AppTheme.Light.Dialog">
+        <item name="windowNoTitle">true</item>
+    </style>
 
     <style name="AppTheme.Dialog.Alert" parent="Theme.AppCompat.Light.Dialog.Alert">
         <item name="android:textColor">@android:color/black</item>

From d9a1938cfefdbb0d8b16800594c1a03e5715870e Mon Sep 17 00:00:00 2001
From: Darcy Wong <darcy_wong@sil.org>
Date: Tue, 11 Feb 2025 13:36:45 +0700
Subject: [PATCH 24/76] fix(android): Tweak layout

---
 .../java/com/keyman/engine/KMManager.java     |  4 ++-
 .../keyman/engine/WebViewErrorActivity.java   |  7 ++--
 .../res/layout/activity_webview_error.xml     | 36 +++++++++++--------
 3 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/android/KMEA/app/src/main/java/com/keyman/engine/KMManager.java b/android/KMEA/app/src/main/java/com/keyman/engine/KMManager.java
index 51dbe33a23..f391e784c4 100644
--- a/android/KMEA/app/src/main/java/com/keyman/engine/KMManager.java
+++ b/android/KMEA/app/src/main/java/com/keyman/engine/KMManager.java
@@ -714,6 +714,7 @@ public final class KMManager {
         SystemKeyboard = new KMKeyboard(appContext, KeyboardType.KEYBOARD_TYPE_SYSTEM);
       } catch (AndroidRuntimeException e) {
         // Catch fatal error when WebView not installed/enabled
+        showWebViewError();
         return;
       }
       SystemKeyboardWebViewClient = new KMKeyboardWebViewClient(appContext, keyboardType);
@@ -816,11 +817,12 @@ public final class KMManager {
   }
 
   public static void onStartInput(EditorInfo attribute, boolean restarting) {
-    if (!didShowWebViewError && SystemKeyboard == null && WebViewUtils.getSystemWebViewStatus(appContext) !=
+    /*if (!didShowWebViewError && SystemKeyboard == null && WebViewUtils.getSystemWebViewStatus(appContext) !=
         SystemWebViewStatus.FULL) {
       showWebViewError();
       didShowWebViewError = true;
     }
+     */
     if (!restarting && SystemKeyboard != null) {
       String packageName = attribute.packageName;
       int inputType = attribute.inputType;
diff --git a/android/KMEA/app/src/main/java/com/keyman/engine/WebViewErrorActivity.java b/android/KMEA/app/src/main/java/com/keyman/engine/WebViewErrorActivity.java
index 09534ce46c..2b72c153c3 100644
--- a/android/KMEA/app/src/main/java/com/keyman/engine/WebViewErrorActivity.java
+++ b/android/KMEA/app/src/main/java/com/keyman/engine/WebViewErrorActivity.java
@@ -5,10 +5,12 @@ package com.keyman.engine;
 
 import android.content.Context;
 import android.os.Bundle;
+import android.util.Log;
 import android.view.View;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.Button;
 import android.widget.LinearLayout;
+import android.widget.RelativeLayout;
 
 /**
  * Activity to display when WebView is either not installed or enabled.
@@ -17,17 +19,18 @@ import android.widget.LinearLayout;
 public class WebViewErrorActivity extends BaseActivity {
   private static final String TAG = "WebViewErrorActivity";
 
-  private static LinearLayout linearLayout = null;
+  private static RelativeLayout linearLayout = null;
   private static Button changeIMEButton = null;
 
   @Override
   protected void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
 
+    Log.d(TAG, "creating WebViewErrorActivity");
     final Context context = this;
     setContentView(R.layout.activity_webview_error);
 
-    linearLayout = (LinearLayout) findViewById(R.id.webViewErrorLayout);
+    linearLayout = (RelativeLayout) findViewById(R.id.webViewErrorLayout);
     changeIMEButton = (Button) findViewById(R.id.changeIMEButton);
     changeIMEButton.setOnClickListener(new View.OnClickListener() {
       public void onClick(View v) {
diff --git a/android/KMEA/app/src/main/res/layout/activity_webview_error.xml b/android/KMEA/app/src/main/res/layout/activity_webview_error.xml
index 0b93503ca0..f56df93e8f 100644
--- a/android/KMEA/app/src/main/res/layout/activity_webview_error.xml
+++ b/android/KMEA/app/src/main/res/layout/activity_webview_error.xml
@@ -1,41 +1,49 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/webViewErrorLayout"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
+    android:layout_width="match_parent"
+    android:layout_height="fill_parent"
     android:background="@android:color/white"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    android:gravity="bottom"
+    app:layout_anchorGravity="bottom">
+
+    <View android:id="@+id/pad"
+        android:layout_width="fill_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1" />
 
     <!-- Banner to display if WebView is not installed/enabled -->
     <TextView
         android:id="@+id/kmWebViewError"
-        android:drawableStart="@drawable/ic_launcher"
         android:layout_width="wrap_content"
-        android:layout_height="0dp"
+        android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal|center_vertical"
         android:layout_marginStart="@dimen/fab_margin"
         android:layout_marginEnd="@dimen/fab_margin"
-        android:layout_weight="1"
         android:background="@android:color/white"
+        app:drawableStartCompat="@drawable/ic_launcher"
         android:text="@string/body_switch_keyboard"
         android:textSize="@dimen/titlebar_label_textsize" />
 
     <Button
         android:id="@+id/changeIMEButton"
         style="@style/Widget.AppCompat.Button.Colored"
+        android:background="@android:color/holo_orange_light"
+        android:textColor="@android:color/white"
+        android:layout_alignParentEnd="true"
+        android:layout_below="@id/kmWebViewError"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="end|center_vertical"
         android:layout_marginStart="@dimen/fab_margin"
-        android:layout_marginEnd="@dimen/fab_margin"
         android:layout_marginTop="@dimen/fab_margin"
+        android:layout_marginEnd="@dimen/fab_margin"
         android:layout_marginBottom="@dimen/fab_margin"
+        android:elevation="1dp"
         android:paddingStart="@dimen/fab_padding"
         android:paddingEnd="@dimen/fab_padding"
-        android:background="@android:color/holo_orange_light"
-        android:elevation="1dp"
         android:singleLine="true"
-        android:text="@string/label_ok"
-        android:textColor="@android:color/white"/>
+        android:text="@string/label_ok" />
 
-</LinearLayout>
+</RelativeLayout>

From 7f79dd55b8d6b993b6dba3859e2e07a67a1ee27e Mon Sep 17 00:00:00 2001
From: Darcy Wong <darcy_wong@sil.org>
Date: Thu, 13 Feb 2025 07:37:31 +0700
Subject: [PATCH 25/76] fix(android): Remove WebViewErrorActivity

TODO for separate PR
---
 .../kMAPro/src/main/AndroidManifest.xml       |  4 --
 android/KMEA/app/src/main/AndroidManifest.xml | 12 ++---
 .../java/com/keyman/engine/KMManager.java     | 28 ++++-------
 .../keyman/engine/WebViewErrorActivity.java   | 46 -------------------
 .../res/layout/activity_webview_error.xml     | 23 ++++------
 5 files changed, 25 insertions(+), 88 deletions(-)
 delete mode 100644 android/KMEA/app/src/main/java/com/keyman/engine/WebViewErrorActivity.java

diff --git a/android/KMAPro/kMAPro/src/main/AndroidManifest.xml b/android/KMAPro/kMAPro/src/main/AndroidManifest.xml
index 70bc8558d7..bdb1d18a43 100644
--- a/android/KMAPro/kMAPro/src/main/AndroidManifest.xml
+++ b/android/KMAPro/kMAPro/src/main/AndroidManifest.xml
@@ -12,10 +12,6 @@
        https://developer.android.com/reference/android/Manifest.permission#READ_EXTERNAL_STORAGE -->
   <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" android:maxSdkVersion="32" />
 
-    <queries>
-        <package android:name="com.android.webkit" />
-        <package android:name="com.google.android.ims" />
-    </queries>
   <!-- Ideally we would declare this permission so we can get other installed keyboard names.
   But would involve a long review process with the Play Store:
   https://support.google.com/googleplay/android-developer/answer/9214102#
diff --git a/android/KMEA/app/src/main/AndroidManifest.xml b/android/KMEA/app/src/main/AndroidManifest.xml
index 1cba0958ce..38b1069277 100644
--- a/android/KMEA/app/src/main/AndroidManifest.xml
+++ b/android/KMEA/app/src/main/AndroidManifest.xml
@@ -7,6 +7,11 @@
       </intent>
     </queries>
 
+    <queries>
+        <package android:name="com.android.webkit" />
+        <package android:name="com.google.android.ims" />
+    </queries>
+
     <!-- https://developer.android.com/develop/ui/views/notifications/notification-permission#declare -->
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
     <uses-permission android:name="android.permission.VIBRATE" />
@@ -57,13 +62,6 @@
             android:label="@string/app_name"
             android:theme="@style/AppTheme.Light.Dialog" >
         </activity>
-        <activity
-            android:name="com.keyman.engine.WebViewErrorActivity"
-            android:exported="true"
-            android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|screenSize|smallestScreenSize"
-            android:label="@string/app_name"
-            android:theme="@style/AppTheme.NoTitleDialog">
-        </activity>
 
         <!-- Put other WebViewActivities in a separate process so the Keyboard WebView doesn't lag.
         Ref https://stackoverflow.com/questions/40650643/timed-out-waiting-on-iinputcontextcallback-with-custom-keyboard-on-android -->
diff --git a/android/KMEA/app/src/main/java/com/keyman/engine/KMManager.java b/android/KMEA/app/src/main/java/com/keyman/engine/KMManager.java
index f391e784c4..30abab6f8c 100644
--- a/android/KMEA/app/src/main/java/com/keyman/engine/KMManager.java
+++ b/android/KMEA/app/src/main/java/com/keyman/engine/KMManager.java
@@ -228,7 +228,6 @@ public final class KMManager {
   private static boolean debugMode = false;
   private static boolean shouldAllowSetKeyboard = true;
   private static boolean didCopyAssets = false;
-  private static boolean didShowWebViewError = false;
 
   private static boolean didLogHardwareKeystrokeException = false;
 
@@ -671,16 +670,6 @@ public final class KMManager {
     }
   }
 
-  private static void showWebViewError() {
-    Intent i = new Intent(appContext, WebViewErrorActivity.class);
-    i.addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT); // Replaces FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET
-    i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);     // Required to call startActivity() from outside of an Activity context
-    i.addFlags(Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);
-    i.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
-
-    appContext.startActivity(i);
-  }
-
   /**
    * Adjust the keyboard dimensions. If the suggestion banner is active, use the
    * combined banner height and keyboard height
@@ -704,6 +693,10 @@ public final class KMManager {
         InAppKeyboard = new KMKeyboard(appContext, KeyboardType.KEYBOARD_TYPE_INAPP);
       } catch (AndroidRuntimeException e) {
         // Catch fatal error when WebView not installed/enabled
+        // Only log exceptions unrelated to WebView
+        if (e != null && !e.getMessage().contains("MissingWebViewPackageException")) {
+          KMLog.LogException(TAG, "initKeyboard for INAPP" , e);
+        }
         return;
       }
       InAppKeyboardWebViewClient = new KMKeyboardWebViewClient(appContext, keyboardType);
@@ -714,7 +707,12 @@ public final class KMManager {
         SystemKeyboard = new KMKeyboard(appContext, KeyboardType.KEYBOARD_TYPE_SYSTEM);
       } catch (AndroidRuntimeException e) {
         // Catch fatal error when WebView not installed/enabled
-        showWebViewError();
+        // Catch fatal error when WebView not installed/enabled
+        // Only log exceptions unrelated to WebView
+        if (e != null && !e.getMessage().contains("MissingWebViewPackageException")) {
+          KMLog.LogException(TAG, "initKeyboard for SYSTEM" , e);
+        }
+        // TODO: Send user to pick another system keyboard
         return;
       }
       SystemKeyboardWebViewClient = new KMKeyboardWebViewClient(appContext, keyboardType);
@@ -817,12 +815,6 @@ public final class KMManager {
   }
 
   public static void onStartInput(EditorInfo attribute, boolean restarting) {
-    /*if (!didShowWebViewError && SystemKeyboard == null && WebViewUtils.getSystemWebViewStatus(appContext) !=
-        SystemWebViewStatus.FULL) {
-      showWebViewError();
-      didShowWebViewError = true;
-    }
-     */
     if (!restarting && SystemKeyboard != null) {
       String packageName = attribute.packageName;
       int inputType = attribute.inputType;
diff --git a/android/KMEA/app/src/main/java/com/keyman/engine/WebViewErrorActivity.java b/android/KMEA/app/src/main/java/com/keyman/engine/WebViewErrorActivity.java
deleted file mode 100644
index 2b72c153c3..0000000000
--- a/android/KMEA/app/src/main/java/com/keyman/engine/WebViewErrorActivity.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/**
- * Keyman is copyright (C) SIL Global. MIT License
- */
-package com.keyman.engine;
-
-import android.content.Context;
-import android.os.Bundle;
-import android.util.Log;
-import android.view.View;
-import android.view.inputmethod.InputMethodManager;
-import android.widget.Button;
-import android.widget.LinearLayout;
-import android.widget.RelativeLayout;
-
-/**
- * Activity to display when WebView is either not installed or enabled.
- * Prompts user to switch system keyboard.
- */
-public class WebViewErrorActivity extends BaseActivity {
-  private static final String TAG = "WebViewErrorActivity";
-
-  private static RelativeLayout linearLayout = null;
-  private static Button changeIMEButton = null;
-
-  @Override
-  protected void onCreate(Bundle savedInstanceState) {
-    super.onCreate(savedInstanceState);
-
-    Log.d(TAG, "creating WebViewErrorActivity");
-    final Context context = this;
-    setContentView(R.layout.activity_webview_error);
-
-    linearLayout = (RelativeLayout) findViewById(R.id.webViewErrorLayout);
-    changeIMEButton = (Button) findViewById(R.id.changeIMEButton);
-    changeIMEButton.setOnClickListener(new View.OnClickListener() {
-      public void onClick(View v) {
-        InputMethodManager imManager = (InputMethodManager) context.getSystemService(Context.INPUT_METHOD_SERVICE);
-        imManager.showInputMethodPicker();
-
-        // Dismiss the View
-        linearLayout.setVisibility(View.GONE);
-        //finish(); Dismiss IME picker too fast
-      }
-    });
-  }
-}
\ No newline at end of file
diff --git a/android/KMEA/app/src/main/res/layout/activity_webview_error.xml b/android/KMEA/app/src/main/res/layout/activity_webview_error.xml
index f56df93e8f..8b85711b75 100644
--- a/android/KMEA/app/src/main/res/layout/activity_webview_error.xml
+++ b/android/KMEA/app/src/main/res/layout/activity_webview_error.xml
@@ -1,25 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/webViewErrorLayout"
     android:layout_width="match_parent"
-    android:layout_height="fill_parent"
-    android:background="@android:color/white"
+    android:layout_height="wrap_content"
     android:orientation="vertical"
-    android:gravity="bottom"
-    app:layout_anchorGravity="bottom">
+    android:layout_gravity="bottom"
+    android:background="@android:color/white" >
 
-    <View android:id="@+id/pad"
-        android:layout_width="fill_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1" />
+    <Space
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_weight="10" />
 
     <!-- Banner to display if WebView is not installed/enabled -->
     <TextView
         android:id="@+id/kmWebViewError"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal|center_vertical"
         android:layout_marginStart="@dimen/fab_margin"
         android:layout_marginEnd="@dimen/fab_margin"
         android:background="@android:color/white"
@@ -32,8 +30,7 @@
         style="@style/Widget.AppCompat.Button.Colored"
         android:background="@android:color/holo_orange_light"
         android:textColor="@android:color/white"
-        android:layout_alignParentEnd="true"
-        android:layout_below="@id/kmWebViewError"
+        android:layout_gravity="bottom|end"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/fab_margin"
@@ -46,4 +43,4 @@
         android:singleLine="true"
         android:text="@string/label_ok" />
 
-</RelativeLayout>
+</LinearLayout>

From cec240a2ce05b6690545583429215fe695ac7bf1 Mon Sep 17 00:00:00 2001
From: Darcy Wong <darcy_wong@sil.org>
Date: Thu, 13 Feb 2025 07:40:07 +0700
Subject: [PATCH 26/76] chore(android): Tweak preamble

---
 .../KMEA/app/src/main/java/com/keyman/engine/KMKeyboard.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/android/KMEA/app/src/main/java/com/keyman/engine/KMKeyboard.java b/android/KMEA/app/src/main/java/com/keyman/engine/KMKeyboard.java
index 3d8a93653f..4061100002 100644
--- a/android/KMEA/app/src/main/java/com/keyman/engine/KMKeyboard.java
+++ b/android/KMEA/app/src/main/java/com/keyman/engine/KMKeyboard.java
@@ -129,7 +129,8 @@ final class KMKeyboard extends WebView {
    * Constructor for KMKeyboard.
    * If System WebView not installed/enabled, will throw AndroidRuntimeException.
    * Can't catch the exception here because super(context) must be the first line.
-   * @param context
+   * @param context {Context}
+   * @param keyboardType {KeyboardType}
    * @throws AndroidRuntimeException
    */
   public KMKeyboard(Context context, KeyboardType keyboardType) throws AndroidRuntimeException {

From 7a20b4f6dd597555634a9ebefbbe116e8e91783f Mon Sep 17 00:00:00 2001
From: Darcy Wong <darcy_wong@sil.org>
Date: Thu, 13 Feb 2025 07:42:36 +0700
Subject: [PATCH 27/76] chore(android): Remove activity_webview_error layout

---
 .../res/layout/activity_webview_error.xml     | 46 -------------------
 1 file changed, 46 deletions(-)
 delete mode 100644 android/KMEA/app/src/main/res/layout/activity_webview_error.xml

diff --git a/android/KMEA/app/src/main/res/layout/activity_webview_error.xml b/android/KMEA/app/src/main/res/layout/activity_webview_error.xml
deleted file mode 100644
index 8b85711b75..0000000000
--- a/android/KMEA/app/src/main/res/layout/activity_webview_error.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/webViewErrorLayout"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:layout_gravity="bottom"
-    android:background="@android:color/white" >
-
-    <Space
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_weight="10" />
-
-    <!-- Banner to display if WebView is not installed/enabled -->
-    <TextView
-        android:id="@+id/kmWebViewError"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/fab_margin"
-        android:layout_marginEnd="@dimen/fab_margin"
-        android:background="@android:color/white"
-        app:drawableStartCompat="@drawable/ic_launcher"
-        android:text="@string/body_switch_keyboard"
-        android:textSize="@dimen/titlebar_label_textsize" />
-
-    <Button
-        android:id="@+id/changeIMEButton"
-        style="@style/Widget.AppCompat.Button.Colored"
-        android:background="@android:color/holo_orange_light"
-        android:textColor="@android:color/white"
-        android:layout_gravity="bottom|end"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/fab_margin"
-        android:layout_marginTop="@dimen/fab_margin"
-        android:layout_marginEnd="@dimen/fab_margin"
-        android:layout_marginBottom="@dimen/fab_margin"
-        android:elevation="1dp"
-        android:paddingStart="@dimen/fab_padding"
-        android:paddingEnd="@dimen/fab_padding"
-        android:singleLine="true"
-        android:text="@string/label_ok" />
-
-</LinearLayout>

From 0cd393a2e92308be202e34a44444289513214830 Mon Sep 17 00:00:00 2001
From: rc-swag <58423624+rc-swag@users.noreply.github.com>
Date: Thu, 13 Feb 2025 11:45:09 +1000
Subject: [PATCH 28/76] docs(windows): whats new keyman 18.0 for windows

---
 windows/docs/help/about/whatsnew.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/windows/docs/help/about/whatsnew.md b/windows/docs/help/about/whatsnew.md
index 4f11c82ec2..c4173bf2fc 100644
--- a/windows/docs/help/about/whatsnew.md
+++ b/windows/docs/help/about/whatsnew.md
@@ -4,6 +4,11 @@ title: What's New in Keyman 18.0 for Windows
 
 Here are some of the new features we have added to Keyman 18.0 for Windows:
 
+- Minimum supported version of Windows is 10.0
+- Updates to Keyman are now applied before Keyman starts for the first time in a session, so Windows no longer needs to be restarted (#10041)
+- Keyman no longer adds a desktop shortcut when it is installed (#11401)
+- Added an option to make Right Alt and Right Control also work for keyboard switching hotkeys if preferred (#11471)
+
 ## Related Topics
 
 -   [Version History](history)

From 19be021a6e7f81fa32c7f20e125e0695d9850493 Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Thu, 13 Feb 2025 10:25:19 +0700
Subject: [PATCH 29/76] chore: improve message color and content for info
 messages

---
 developer/src/kmc/src/messages/infrastructureMessages.ts | 4 ++--
 developer/src/kmc/src/util/NodeCompilerCallbacks.ts      | 6 ++++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/developer/src/kmc/src/messages/infrastructureMessages.ts b/developer/src/kmc/src/messages/infrastructureMessages.ts
index 304e1d5e9f..ee6e3a086d 100644
--- a/developer/src/kmc/src/messages/infrastructureMessages.ts
+++ b/developer/src/kmc/src/messages/infrastructureMessages.ts
@@ -177,7 +177,7 @@ export class InfrastructureMessages {
   static INFO_ProjectNotCopiedSuccessfully = SevInfo | 0x0025;
   static Info_ProjectNotCopiedSuccessfully = (o:{source:string, dest:string}) => ({filename:o.source, ...m(
     this.INFO_ProjectNotCopiedSuccessfully,
-    `'${def(o.source)}' was not successfully copied to '${def(o.dest)}'.`,
+    `Failed to copy '${def(o.source)}' to '${def(o.dest)}'.`,
   )});
 
   // For this message, we override the filename with the passed-in file. A bit of a hack but does the job
@@ -198,7 +198,7 @@ export class InfrastructureMessages {
   static INFO_ProjectNotGeneratedSuccessfully = SevInfo | 0x0028;
   static Info_ProjectNotGeneratedSuccessfully = (o:{id:string}) => ({filename:o.id, ...m(
     this.INFO_ProjectNotGeneratedSuccessfully,
-    `New project '${def(o.id)}' was not successfully generated.`,
+    `Failed to generate new project '${def(o.id)}'.`,
   )});
 
 }
diff --git a/developer/src/kmc/src/util/NodeCompilerCallbacks.ts b/developer/src/kmc/src/util/NodeCompilerCallbacks.ts
index f3cdf1e7b2..94465d4413 100644
--- a/developer/src/kmc/src/util/NodeCompilerCallbacks.ts
+++ b/developer/src/kmc/src/util/NodeCompilerCallbacks.ts
@@ -242,12 +242,18 @@ export class NodeCompilerCallbacks implements CompilerCallbacks {
   messageSpecialColor(event: CompilerEvent) {
     switch(event.code) {
       case InfrastructureMessages.INFO_BuildingFile:
+      case InfrastructureMessages.INFO_CopyingProject:
+      case InfrastructureMessages.INFO_GeneratingProject:
         return color.whiteBright;
       case InfrastructureMessages.INFO_FileNotBuiltSuccessfully:
       case InfrastructureMessages.INFO_ProjectNotBuiltSuccessfully:
+      case InfrastructureMessages.INFO_ProjectNotCopiedSuccessfully:
+      case InfrastructureMessages.INFO_ProjectNotGeneratedSuccessfully:
         return color.red;
       case InfrastructureMessages.INFO_FileBuiltSuccessfully:
       case InfrastructureMessages.INFO_ProjectBuiltSuccessfully:
+      case InfrastructureMessages.INFO_ProjectCopiedSuccessfully:
+      case InfrastructureMessages.INFO_ProjectGeneratedSuccessfully:
         return color.green;
     }
     return null;

From f80393d0acc2b17418ec5df19cd67b7c47fabacb Mon Sep 17 00:00:00 2001
From: Shawn Schantz <shawn_schantz@sil.org>
Date: Thu, 13 Feb 2025 11:01:49 +0700
Subject: [PATCH 30/76] chore(ios): increase version number to 15.6

includes firstvoices and sample projects this time
---
 ios/docs/help/about/whatsnew.md               |  2 +-
 .../KeymanEngine.xcodeproj/project.pbxproj    | 42 +++++++++----------
 .../Config/Keyman-iphoneos.xcconfig           |  2 +-
 .../Config/Keyman-iphonesimulator.xcconfig    |  2 +-
 .../KeymanEngine/Config/Keyman-lib.xcconfig   |  2 +-
 .../Keyman/Keyman.xcodeproj/project.pbxproj   | 18 ++++----
 .../KMSample1.xcodeproj/project.pbxproj       | 10 ++---
 .../KMSample2.xcodeproj/project.pbxproj       | 14 +++----
 .../project.pbxproj                           | 18 ++++----
 .../ios/FirstVoices.xcodeproj/project.pbxproj | 14 +++----
 10 files changed, 63 insertions(+), 61 deletions(-)

diff --git a/ios/docs/help/about/whatsnew.md b/ios/docs/help/about/whatsnew.md
index e5338030f2..30cebb5b9b 100644
--- a/ios/docs/help/about/whatsnew.md
+++ b/ios/docs/help/about/whatsnew.md
@@ -3,6 +3,6 @@ title: What's New in Keyman 18.0 for iPhone and iPad
 ---
 Here are some significant changes to Keyman for iPhone and iPad 18.0:
 
-* Minimum supported version of iOS is 13.0.
+* Minimum supported version of iOS is 15.6.
 * Predictive text and on screen keyboard startup performance improvements (#11784, #11264, #11265)
 * Keyboard size can now be adjusted to your preference (#12571)
\ No newline at end of file
diff --git a/ios/engine/KMEI/KeymanEngine.xcodeproj/project.pbxproj b/ios/engine/KMEI/KeymanEngine.xcodeproj/project.pbxproj
index 7b21b6bc63..d4ad629fe5 100644
--- a/ios/engine/KMEI/KeymanEngine.xcodeproj/project.pbxproj
+++ b/ios/engine/KMEI/KeymanEngine.xcodeproj/project.pbxproj
@@ -1711,7 +1711,7 @@
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				INFOPLIST_FILE = SystemKeyboard/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -1757,7 +1757,7 @@
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				INFOPLIST_FILE = SystemKeyboard/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -1805,7 +1805,7 @@
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				INFOPLIST_FILE = KeymanEngineTests/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 13;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -1849,7 +1849,7 @@
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				INFOPLIST_FILE = KeymanEngineTests/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 13;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -1900,7 +1900,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				INFOPLIST_FILE = KeymanEngine/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 13;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -1955,7 +1955,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				INFOPLIST_FILE = KeymanEngine/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 13;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -1979,7 +1979,7 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = F27FCAF6157FD95E00FBBA20 /* Keyman-lib.xcconfig */;
 			buildSettings = {
-				IPHONEOS_DEPLOYMENT_TARGET = 12.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				STRIP_INSTALLED_PRODUCT = NO;
 				STRIP_STYLE = all;
@@ -1992,7 +1992,7 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = F27FCAF6157FD95E00FBBA20 /* Keyman-lib.xcconfig */;
 			buildSettings = {
-				IPHONEOS_DEPLOYMENT_TARGET = 12.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTS_MACCATALYST = NO;
 			};
@@ -2021,7 +2021,7 @@
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				INFOPLIST_FILE = "KeymanEngine/resources/Keyman.bundle/Contents/Resources/KeymanEngine-Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 13;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -2058,7 +2058,7 @@
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				INFOPLIST_FILE = "KeymanEngine/resources/Keyman.bundle/Contents/Resources/KeymanEngine-Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 13;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -2110,7 +2110,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				KEYMAN_ROOT = "$(SRCROOT)/../../..";
 				SKIP_INSTALL = YES;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
@@ -2151,7 +2151,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				INFOPLIST_FILE = KeymanEngine/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 13;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -2175,7 +2175,7 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = F27FCAF6157FD95E00FBBA20 /* Keyman-lib.xcconfig */;
 			buildSettings = {
-				IPHONEOS_DEPLOYMENT_TARGET = 12.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTS_MACCATALYST = NO;
 			};
@@ -2194,7 +2194,7 @@
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = 3YE4W86L3G;
 				ENABLE_BITCODE = NO;
-				IPHONEOS_DEPLOYMENT_TARGET = 13;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -2244,7 +2244,7 @@
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				INFOPLIST_FILE = SystemKeyboard/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -2292,7 +2292,7 @@
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				INFOPLIST_FILE = KeymanEngineTests/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 13;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -2333,7 +2333,7 @@
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				INFOPLIST_FILE = "KeymanEngine/resources/Keyman.bundle/Contents/Resources/KeymanEngine-Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 13;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -2385,7 +2385,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				KEYMAN_ROOT = "$(SRCROOT)/../../..";
 				SKIP_INSTALL = YES;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG NO_SENTRY";
@@ -2428,7 +2428,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				KEYMAN_ROOT = "$(SRCROOT)/../../..";
 				SKIP_INSTALL = YES;
 				SWIFT_COMPILATION_MODE = wholemodule;
@@ -2449,7 +2449,7 @@
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = 3YE4W86L3G;
 				ENABLE_BITCODE = NO;
-				IPHONEOS_DEPLOYMENT_TARGET = 13;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -2482,7 +2482,7 @@
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = 3YE4W86L3G;
 				ENABLE_BITCODE = NO;
-				IPHONEOS_DEPLOYMENT_TARGET = 13;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
diff --git a/ios/engine/KMEI/KeymanEngine/Config/Keyman-iphoneos.xcconfig b/ios/engine/KMEI/KeymanEngine/Config/Keyman-iphoneos.xcconfig
index 39eb001ec7..5289cd2857 100644
--- a/ios/engine/KMEI/KeymanEngine/Config/Keyman-iphoneos.xcconfig
+++ b/ios/engine/KMEI/KeymanEngine/Config/Keyman-iphoneos.xcconfig
@@ -11,4 +11,4 @@ PRODUCT_NAME = $(TARGET_NAME)
 GCC_PRECOMPILE_PREFIX_HEADER = YES
 GCC_PREFIX_HEADER = KME-iphoneos/KME-iphoneos-Prefix.pch
 
-IPHONEOS_DEPLOYMENT_TARGET = 4.0
+IPHONEOS_DEPLOYMENT_TARGET = 15.6
diff --git a/ios/engine/KMEI/KeymanEngine/Config/Keyman-iphonesimulator.xcconfig b/ios/engine/KMEI/KeymanEngine/Config/Keyman-iphonesimulator.xcconfig
index 67651865fc..b86982c0d2 100644
--- a/ios/engine/KMEI/KeymanEngine/Config/Keyman-iphonesimulator.xcconfig
+++ b/ios/engine/KMEI/KeymanEngine/Config/Keyman-iphonesimulator.xcconfig
@@ -14,4 +14,4 @@ GCC_PREFIX_HEADER = KME-iphonesimulator/KME-iphonesimulator-Prefix.pch
 ARCHS = i386
 VALID_ARCHS = i386
 
-IPHONEOS_DEPLOYMENT_TARGET = 4.0
+IPHONEOS_DEPLOYMENT_TARGET = 15.6
diff --git a/ios/engine/KMEI/KeymanEngine/Config/Keyman-lib.xcconfig b/ios/engine/KMEI/KeymanEngine/Config/Keyman-lib.xcconfig
index 3ea6c6f0f5..06b88f8ae6 100644
--- a/ios/engine/KMEI/KeymanEngine/Config/Keyman-lib.xcconfig
+++ b/ios/engine/KMEI/KeymanEngine/Config/Keyman-lib.xcconfig
@@ -11,4 +11,4 @@ PRODUCT_NAME = $(TARGET_NAME)
 GCC_PRECOMPILE_PREFIX_HEADER = YES
 GCC_PREFIX_HEADER = KeymanEngine/KeymanEngine-Prefix.pch
 
-IPHONEOS_DEPLOYMENT_TARGET = 4.0
+IPHONEOS_DEPLOYMENT_TARGET = 15.6
diff --git a/ios/keyman/Keyman/Keyman.xcodeproj/project.pbxproj b/ios/keyman/Keyman/Keyman.xcodeproj/project.pbxproj
index b69c7f424d..9b2737f12e 100644
--- a/ios/keyman/Keyman/Keyman.xcodeproj/project.pbxproj
+++ b/ios/keyman/Keyman/Keyman.xcodeproj/project.pbxproj
@@ -1131,7 +1131,7 @@
 				GCC_PREFIX_HEADER = "Keyman/Keyman-Prefix.pch";
 				GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";
 				INFOPLIST_FILE = Keyman/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 13;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -1166,7 +1166,7 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "Keyman/Keyman-Prefix.pch";
 				INFOPLIST_FILE = Keyman/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 13;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -1232,7 +1232,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				KEYMAN_ROOT = "$(SRCROOT)/../../..";
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_LDFLAGS = "";
@@ -1284,7 +1284,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				KEYMAN_ROOT = "$(SRCROOT)/../../..";
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
@@ -1319,7 +1319,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				INFOPLIST_FILE = SWKeyboard/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 13;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -1362,7 +1362,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				INFOPLIST_FILE = SWKeyboard/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 13;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -1431,7 +1431,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				KEYMAN_ROOT = "$(SRCROOT)/../../..";
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_LDFLAGS = "";
@@ -1456,7 +1456,7 @@
 				GCC_PREFIX_HEADER = "Keyman/Keyman-Prefix.pch";
 				GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";
 				INFOPLIST_FILE = Keyman/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 13;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -1500,7 +1500,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				INFOPLIST_FILE = SWKeyboard/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 13;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
diff --git a/ios/samples/KMSample1/KMSample1.xcodeproj/project.pbxproj b/ios/samples/KMSample1/KMSample1.xcodeproj/project.pbxproj
index e0fee90879..4dc0be980b 100644
--- a/ios/samples/KMSample1/KMSample1.xcodeproj/project.pbxproj
+++ b/ios/samples/KMSample1/KMSample1.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 52;
+	objectVersion = 54;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -296,7 +296,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = "";
@@ -342,7 +342,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				OTHER_LDFLAGS = "";
 				SDKROOT = iphoneos;
@@ -365,7 +365,7 @@
 					"$(SRCROOT)/../../Carthage/Build/",
 				);
 				INFOPLIST_FILE = KMSample1/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.1;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -390,7 +390,7 @@
 					"$(SRCROOT)/../../Carthage/Build/",
 				);
 				INFOPLIST_FILE = KMSample1/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.1;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
diff --git a/ios/samples/KMSample2/KMSample2.xcodeproj/project.pbxproj b/ios/samples/KMSample2/KMSample2.xcodeproj/project.pbxproj
index 29443db1c7..63ddf79f56 100644
--- a/ios/samples/KMSample2/KMSample2.xcodeproj/project.pbxproj
+++ b/ios/samples/KMSample2/KMSample2.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 52;
+	objectVersion = 54;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -467,7 +467,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = "";
@@ -518,7 +518,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				OTHER_LDFLAGS = "";
 				SDKROOT = iphoneos;
@@ -540,7 +540,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = KMSample2/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.1;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -566,7 +566,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = KMSample2/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.1;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -593,7 +593,7 @@
 					"$(inherited)",
 				);
 				INFOPLIST_FILE = SWKeyboard/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.1;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -619,7 +619,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = SWKeyboard/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.1;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
diff --git a/ios/tools/KeyboardCalibrator/KeyboardCalibrator.xcodeproj/project.pbxproj b/ios/tools/KeyboardCalibrator/KeyboardCalibrator.xcodeproj/project.pbxproj
index 69426b2230..b4237a9938 100644
--- a/ios/tools/KeyboardCalibrator/KeyboardCalibrator.xcodeproj/project.pbxproj
+++ b/ios/tools/KeyboardCalibrator/KeyboardCalibrator.xcodeproj/project.pbxproj
@@ -390,7 +390,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = WHE552KZN5;
 				INFOPLIST_FILE = CalibrationKbd/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -411,7 +411,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = WHE552KZN5;
 				INFOPLIST_FILE = CalibrationKbd/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -546,9 +546,9 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = KeyboardCalibrator/KeyboardCalibrator.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				DEVELOPMENT_TEAM = WHE552KZN5;
+				DEVELOPMENT_TEAM = "";
 				INFOPLIST_FILE = KeyboardCalibrator/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -567,9 +567,9 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = KeyboardCalibrator/KeyboardCalibrator.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				DEVELOPMENT_TEAM = WHE552KZN5;
+				DEVELOPMENT_TEAM = "";
 				INFOPLIST_FILE = KeyboardCalibrator/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -589,7 +589,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = WHE552KZN5;
 				INFOPLIST_FILE = DefaultKeyboardHostTests/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -611,7 +611,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = WHE552KZN5;
 				INFOPLIST_FILE = DefaultKeyboardHostTests/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -632,6 +632,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = WHE552KZN5;
 				INFOPLIST_FILE = DefaultKeyboardHostUITests/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -652,6 +653,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = WHE552KZN5;
 				INFOPLIST_FILE = DefaultKeyboardHostUITests/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
diff --git a/oem/firstvoices/ios/FirstVoices.xcodeproj/project.pbxproj b/oem/firstvoices/ios/FirstVoices.xcodeproj/project.pbxproj
index f11f08ddbb..7546e31557 100644
--- a/oem/firstvoices/ios/FirstVoices.xcodeproj/project.pbxproj
+++ b/oem/firstvoices/ios/FirstVoices.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 52;
+	objectVersion = 54;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -581,7 +581,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEADER_SEARCH_PATHS = "";
-				IPHONEOS_DEPLOYMENT_TARGET = 12.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -633,7 +633,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEADER_SEARCH_PATHS = "";
-				IPHONEOS_DEPLOYMENT_TARGET = 12.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -653,7 +653,7 @@
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = D7TR486TEH;
 				INFOPLIST_FILE = FirstVoices/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				KEYMAN_ROOT = "$(SRCROOT)/../../..";
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
@@ -682,7 +682,7 @@
 				CODE_SIGN_STYLE = Manual;
 				DEVELOPMENT_TEAM = D7TR486TEH;
 				INFOPLIST_FILE = FirstVoices/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				KEYMAN_ROOT = "$(SRCROOT)/../../..";
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
@@ -709,7 +709,7 @@
 				DEVELOPMENT_TEAM = D7TR486TEH;
 				HEADER_SEARCH_PATHS = "";
 				INFOPLIST_FILE = SWKeyboard/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				KEYMAN_ROOT = "$(SRCROOT)/../../..";
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
@@ -740,7 +740,7 @@
 				DEVELOPMENT_TEAM = D7TR486TEH;
 				HEADER_SEARCH_PATHS = "";
 				INFOPLIST_FILE = SWKeyboard/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				KEYMAN_ROOT = "$(SRCROOT)/../../..";
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",

From 3e8ea1360489710b1218740afc9c8d5c1c84e384 Mon Sep 17 00:00:00 2001
From: Shawn Schantz <shawn_schantz@sil.org>
Date: Thu, 13 Feb 2025 11:57:50 +0700
Subject: [PATCH 31/76] chore(ios): remove code conditional upon iOS 13 to iOS
 15

now that iOS 15 is the minimum version,  #available
conditions to handle earlier versions of iOS are unnnecessary
---
 .../Classes/Colors+Extension.swift            |   6 +--
 .../PackageInstallViewController.swift        |  21 ++-------
 .../Keyboard/KeymanWebViewController.swift    |   5 +--
 .../KeyboardHeightViewController.swift        |  10 +----
 .../Classes/PackageWebViewController.swift    |  16 +++----
 .../KeyboardSearchViewController.swift        |  16 +++----
 .../arrow.up.and.down.imageset/Contents.json  |  21 ---------
 .../arrow.up.and.down.png                     | Bin 1568 -> 0 bytes
 ios/keyman/Keyman/Keyman/AppDelegate.swift    |   5 +--
 .../WebBrowserViewController.swift            |  16 ++-----
 .../MainViewController.swift                  |  21 ++-------
 .../Keyman/PackageBrowserViewController.swift |   7 ---
 .../SWKeyboard/KeyboardViewController.swift   |  42 +++++++++---------
 13 files changed, 49 insertions(+), 137 deletions(-)
 delete mode 100644 ios/engine/KMEI/KeymanEngine/Images.xcassets/arrow.up.and.down.imageset/Contents.json
 delete mode 100644 ios/engine/KMEI/KeymanEngine/Images.xcassets/arrow.up.and.down.imageset/arrow.up.and.down.png

diff --git a/ios/engine/KMEI/KeymanEngine/Classes/Colors+Extension.swift b/ios/engine/KMEI/KeymanEngine/Classes/Colors+Extension.swift
index d719e55dd7..4ad4201b6f 100644
--- a/ios/engine/KMEI/KeymanEngine/Classes/Colors+Extension.swift
+++ b/ios/engine/KMEI/KeymanEngine/Classes/Colors+Extension.swift
@@ -13,11 +13,7 @@ import UIKit
 extension Colors {
   public static var systemBackground: UIColor {
     get {
-      if #available(iOS 13.0, *) {
-        return UIColor.systemBackground
-      } else {
-        return UIColor.white
-      }
+      return UIColor.systemBackground
     }
   }
 
diff --git a/ios/engine/KMEI/KeymanEngine/Classes/Installation/PackageInstallViewController.swift b/ios/engine/KMEI/KeymanEngine/Classes/Installation/PackageInstallViewController.swift
index 988a3feea8..390583510d 100644
--- a/ios/engine/KMEI/KeymanEngine/Classes/Installation/PackageInstallViewController.swift
+++ b/ios/engine/KMEI/KeymanEngine/Classes/Installation/PackageInstallViewController.swift
@@ -208,13 +208,6 @@ public class PackageInstallViewController<Resource: LanguageResource>: UIViewCon
       edgesForExtendedLayout = []
 
       rightNavigationMode = .next
-
-      if #available(*, iOS 13.4) {
-        // No icon issues here.
-      } else {
-        tabVC.tabBar.items![0].titlePositionAdjustment = UIOffset(horizontal: 0, vertical: -16)
-        tabVC.tabBar.items![1].titlePositionAdjustment = UIOffset(horizontal: 0, vertical: -16)
-      }
     }
 
     // If there's only one language in the package, hide the language picker.
@@ -357,9 +350,7 @@ public class PackageInstallViewController<Resource: LanguageResource>: UIViewCon
     self.pickingCompletionHandler(selectedResources.map { $0.typedFullID })
 
     // Prevent swipe dismissal.
-    if #available(iOS 13.0, *) {
-      self.isModalInPresentation = true
-    }
+    self.isModalInPresentation = true
 
     // No more selection-manipulation allowed.
     // This matters when there's no welcome page available.
@@ -376,9 +367,7 @@ public class PackageInstallViewController<Resource: LanguageResource>: UIViewCon
     // First, show the package's welcome - if it exists.
     if let welcomeVC = PackageWebViewController(for: package, page: .welcome) {
       // Prevent swipe dismissal.
-      if #available(iOS 13.0, *) {
-        welcomeVC.isModalInPresentation = true
-      }
+      welcomeVC.isModalInPresentation = true
 
       let subNavVC = UINavigationController(rootViewController: welcomeVC)
       _ = subNavVC.view
@@ -502,11 +491,7 @@ public class PackageInstallViewController<Resource: LanguageResource>: UIViewCon
 
   private func setCellStyle(_ cell: UITableViewCell, style: CellStyle) {
     var textColor: UIColor
-    if #available(*, iOS 13.0) {
-      textColor = .label
-    } else {
-      textColor = .black
-    }
+    textColor = .label
 
     switch style {
       case .none:
diff --git a/ios/engine/KMEI/KeymanEngine/Classes/Keyboard/KeymanWebViewController.swift b/ios/engine/KMEI/KeymanEngine/Classes/Keyboard/KeymanWebViewController.swift
index a0c8c6d5e4..e4d88a363a 100644
--- a/ios/engine/KMEI/KeymanEngine/Classes/Keyboard/KeymanWebViewController.swift
+++ b/ios/engine/KMEI/KeymanEngine/Classes/Keyboard/KeymanWebViewController.swift
@@ -164,10 +164,7 @@ class KeymanWebViewController: UIViewController {
 
   override func viewWillAppear(_ animated: Bool) {
     super.viewWillAppear(animated)
-    if #available(iOSApplicationExtension 14.0, *) {
-      self.userContentController.removeAllScriptMessageHandlers()
-    }
-    self.userContentController.add(self, name: keymanWebViewName)
+    self.userContentController.removeAllScriptMessageHandlers()
   }
 
   // Very useful for immediately adjusting the WebView's properties upon loading.
diff --git a/ios/engine/KMEI/KeymanEngine/Classes/KeyboardHeightViewController.swift b/ios/engine/KMEI/KeymanEngine/Classes/KeyboardHeightViewController.swift
index 4326dc52d4..8a79983eaa 100644
--- a/ios/engine/KMEI/KeymanEngine/Classes/KeyboardHeightViewController.swift
+++ b/ios/engine/KMEI/KeymanEngine/Classes/KeyboardHeightViewController.swift
@@ -355,14 +355,8 @@ class KeyboardHeightViewController: UIViewController {
     var arrowSymbolImage: UIImage? = nil
     keyboardResizer.isUserInteractionEnabled = true
     
-    // if using iOS earlier than 13.0, use bitmap image of arrow and non-dynamic gray
-    if #available(iOSApplicationExtension 13.0, *) {
-      arrowSymbolImage = UIImage(systemName: "arrow.up.and.down.square.fill")
-      keyboardResizer.backgroundColor = UIColor.systemGray3 // adapts for light/dark mode
-    } else {
-      arrowSymbolImage = UIImage(named:"arrow.up.and.down", in:engineBundle, compatibleWith:nil)
-      keyboardResizer.backgroundColor = UIColor.systemGray
-    }
+    arrowSymbolImage = UIImage(systemName: "arrow.up.and.down.square.fill")
+    keyboardResizer.backgroundColor = UIColor.systemGray3 // adapts for light/dark mode
     keyboardResizer.image = arrowSymbolImage
     keyboardResizer.layer.cornerRadius = 5
     contentView.addSubview(keyboardResizer)
diff --git a/ios/engine/KMEI/KeymanEngine/Classes/PackageWebViewController.swift b/ios/engine/KMEI/KeymanEngine/Classes/PackageWebViewController.swift
index f6ec682ac8..0277065a7e 100644
--- a/ios/engine/KMEI/KeymanEngine/Classes/PackageWebViewController.swift
+++ b/ios/engine/KMEI/KeymanEngine/Classes/PackageWebViewController.swift
@@ -43,15 +43,13 @@ class PackageWebViewController: UIViewController, WKNavigationDelegate {
     let prefs = WKPreferences()
     prefs.javaScriptEnabled = true
 
-    if #available(iOS 13.0, *) {
-      /**
-        In iPadOS 16 and above WKWebView defaults to lying about its user-agent,
-        telling the web server that it is a mac. We can avoid this with .mobile:
-        */
-      let pref = WKWebpagePreferences.init()
-      pref.preferredContentMode = .mobile
-      config.defaultWebpagePreferences = pref
-    }
+    /**
+      In iPadOS 16 and above WKWebView defaults to lying about its user-agent,
+      telling the web server that it is a mac. We can avoid this with .mobile:
+      */
+    let pref = WKWebpagePreferences.init()
+    pref.preferredContentMode = .mobile
+    config.defaultWebpagePreferences = pref
 
     // Inject a meta viewport tag into the head of the file if it doesn't exist
     let metaViewportInjection = """
diff --git a/ios/engine/KMEI/KeymanEngine/Classes/Resource Management/KeyboardSearchViewController.swift b/ios/engine/KMEI/KeymanEngine/Classes/Resource Management/KeyboardSearchViewController.swift
index 208e5d3ada..713261ff37 100644
--- a/ios/engine/KMEI/KeymanEngine/Classes/Resource Management/KeyboardSearchViewController.swift	
+++ b/ios/engine/KMEI/KeymanEngine/Classes/Resource Management/KeyboardSearchViewController.swift	
@@ -104,15 +104,13 @@ public class KeyboardSearchViewController: UIViewController, WKNavigationDelegat
 
     let config = WKWebViewConfiguration()
 
-    if #available(iOS 13.0, *) {
-      /**
-       In iPadOS 16 and above WKWebView defaults to lying about its user-agent,
-       telling the web server that it is a mac. We can avoid this with .mobile:
-       */
-      let pref = WKWebpagePreferences.init()
-      pref.preferredContentMode = .mobile
-      config.defaultWebpagePreferences = pref
-    }
+    /**
+     In iPadOS 16 and above WKWebView defaults to lying about its user-agent,
+     telling the web server that it is a mac. We can avoid this with .mobile:
+     */
+    let pref = WKWebpagePreferences.init()
+    pref.preferredContentMode = .mobile
+    config.defaultWebpagePreferences = pref
 
     let webView = WKWebView.init(frame: CGRect.zero, configuration: config)
     webView.navigationDelegate = self
diff --git a/ios/engine/KMEI/KeymanEngine/Images.xcassets/arrow.up.and.down.imageset/Contents.json b/ios/engine/KMEI/KeymanEngine/Images.xcassets/arrow.up.and.down.imageset/Contents.json
deleted file mode 100644
index 1dc6b4c767..0000000000
--- a/ios/engine/KMEI/KeymanEngine/Images.xcassets/arrow.up.and.down.imageset/Contents.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "arrow.up.and.down.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
diff --git a/ios/engine/KMEI/KeymanEngine/Images.xcassets/arrow.up.and.down.imageset/arrow.up.and.down.png b/ios/engine/KMEI/KeymanEngine/Images.xcassets/arrow.up.and.down.imageset/arrow.up.and.down.png
deleted file mode 100644
index 3b903f6facc8c76f6f7ca9ac93ada3e245e19541..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1568
zcmeAS@N?(olHy`uVBq!ia0vp^8X(NU1|)m_?Z^dEEa{HEjtmSN`?>!lvI6-E$sR$z
z3=CCj3=9n|3=F@3LJcn%7)lKo7+xhXFj&oCU=S~uvn$XBC=rkv;hE;^%b*2hb1*P5
z3NbJPS&Tr)(4NV_0%kKX08Ih{<^_xh*#%5+S&aqE2sTJzhPB5g1_maB%#etZ2wxwo
z<osN{#FYG`RK1Ga0+0d*n+hu+GdHy)QK2F?C$HG5!d3~a!V1U+3F|8<fR&VF+bTu)
z1}He^7o{qg=^5x5DA{o-C@9zzrKDK}xwt{K19`Se86_nJR{Hwo<>h+i#(Mch>H3D2
zmX`VkM*2oZx<D1W#g%y_i50qe#mW#vVCJ}_7AF^F7L;V>=P7{9O-#x!EwNQn0$BtH
z5O=0lWFl<JD~5Ut=s|sujJ~0sfj%~EC7EeBw1H$G+Q9yTSZ4z=%qk$WA~h${B{MfQ
zuNdewI}-yNuq_x82zMfBjKHN4NdjG?bAC>KQE)+Ga;lvn)Gj0;B-J2STlp7drUC;L
z6l@^n7-CTMHu|72MG9j`1cF6@F=)qSqYqCFc3hU6|CNDBP1w`LF(iWX?ab5Op@Aap
zo0W8&HQxN?6XKHMa1>xM<!U<RDB+tmAt9jN!Kp=p(^i8^OG>45GrLPOn`zbql`038
z#;_%a4PF>tSfR3J-~4yHryqYT`erM=yLtD6-PvzTzs3E2Zr5M?Zfn-9iq#8ua=uz9
zmUbxQ2EW=*ru7f!&fRdz^a;PS@tM+{|DRUP_+jzIt3kYC(hko~qm79rZ`$QJ@9?l{
zm{)f%IQFvUjjnmB-}$OPY@9h7!HtuyDm0c(WZ?^Z&SldT;-C8Ji^NRXg%85BWLo&w
zU6Za^-Tiq-*4l))$vc=I99?;j_eH>j>z}x;91eZ-E2!m;O1YM*{FGD50gp<eE+45B
zWM#5V_TCo6suu2d{gc+>q^+I1J8t`0Yv{Nx5Wk+EX63l&+Lq{!?K8gRJ~I1}T{QDh
zK;x||rDr1xv)(t)fAH4)plifq;UBvTu5B@HUC1;)_-fZ}&)+j<pXB=E>X+|)J#nSA
zUitYWAZ^ksU&+4_D(6evF>{T>+ATSfA_=WhH@+E8{~Ih`-l4nTv+xfdZDHopsJ%BM
z9?2bMP&xkN-{fBbjap0Qs+TN^?Achp^Hs{G3&C?%W}NX8ZLAF6ys2rbsLz^)Z<jt_
z;5jdJ{LRy(<ldcZ?F*!vbiP>rnDT0t&$8V2S~;Q2tL2J?AC(!E-`N;f^NGK>{nFgO
z-j}O;&g(6Dx!vronEQjNuaov$ohjUDT%qr`@~GbYo2^_i?oatXJZ|gkKjglFY3r=-
zj{4m9rU}G+>Rn^^MPzl}V(oif|C#SEU=?dJug#p~kYBZUC+q22rPbH<x!-Rt^ZQcm
z5xqW2DDsS#nEOS)`c+-N1~)g_%2@Co&3aL~n!72y&v0?rnjP<h&%A%Oz~z_p@o!T#
zIwzl)q`Th1caB=nqmr{Xw`YFkHRF`wlrt?npcf>bVE1CX+}fDD!YdLNV{JG-E3ALJ
zprIqPIqKlP8KTP9Urj&o?u2Xd)XU=QrwgrE-!wldv^Qe;<S1vMAF^A7c^r1$U~Y+-
zCh=C~UKYo!1nDczx-Zmbab13S#b4`}dCQT#4S~Pe-$j&3Id5?a1{I*5u6{1-oD!M<
DC9hJi

diff --git a/ios/keyman/Keyman/Keyman/AppDelegate.swift b/ios/keyman/Keyman/Keyman/AppDelegate.swift
index be6667ac4a..4586c0209e 100644
--- a/ios/keyman/Keyman/Keyman/AppDelegate.swift
+++ b/ios/keyman/Keyman/Keyman/AppDelegate.swift
@@ -67,9 +67,8 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     // In iOS 15, navigation bars become transparent by default when the edge
     // of the scrollable content aligns with the edge of the navigation bar.
     // Force the appearance back to the pre-iOS 15 default behavior.
-    if #available(iOS 15, *) {
-        UINavigationBar.appearance().scrollEdgeAppearance = UINavigationBarAppearance()
-    }
+    UINavigationBar.appearance().scrollEdgeAppearance = UINavigationBarAppearance()
+    
     UniversalLinks.externalLinkLauncher = { url in
       UIApplication.shared.open(url)
     }
diff --git a/ios/keyman/Keyman/Keyman/Classes/KMWebBrowser/WebBrowserViewController.swift b/ios/keyman/Keyman/Keyman/Classes/KMWebBrowser/WebBrowserViewController.swift
index e571a90f81..6e17ceb4b3 100644
--- a/ios/keyman/Keyman/Keyman/Classes/KMWebBrowser/WebBrowserViewController.swift
+++ b/ios/keyman/Keyman/Keyman/Classes/KMWebBrowser/WebBrowserViewController.swift
@@ -54,13 +54,9 @@ class WebBrowserViewController: UIViewController, WKNavigationDelegate, UIAlertV
 
     webView.navigationDelegate = self
 
-    if #available(iOS 13.0, *) {
-      // Dark mode settings must be applied through this new property,
-      // its class, and others like it.
-      navBar.standardAppearance.configureWithOpaqueBackground()
-    } else {
-      // Fallback on earlier versions
-    }
+    // Dark mode settings must be applied through this new property,
+    // its class, and others like it.
+    navBar.standardAppearance.configureWithOpaqueBackground()
 
     // Setup NavigationBar
     navbarBackground = KMNavigationBarBackgroundView()
@@ -119,12 +115,6 @@ class WebBrowserViewController: UIViewController, WKNavigationDelegate, UIAlertV
 
   override func viewWillAppear(_ animated: Bool) {
     super.viewWillAppear(animated)
-
-    if #available(iOS 13.0, *) {
-      // 13.0 auto-adjusts the top to avoid the status bar.
-    } else {
-      navBarTopConstraint.constant = AppDelegate.statusBarHeight()
-    }
   }
 
   override func willRotate(to toInterfaceOrientation: UIInterfaceOrientation, duration: TimeInterval) {
diff --git a/ios/keyman/Keyman/Keyman/Classes/MainViewController/MainViewController.swift b/ios/keyman/Keyman/Keyman/Classes/MainViewController/MainViewController.swift
index 35ee78c5db..535698b3c7 100644
--- a/ios/keyman/Keyman/Keyman/Classes/MainViewController/MainViewController.swift
+++ b/ios/keyman/Keyman/Keyman/Classes/MainViewController/MainViewController.swift
@@ -278,13 +278,7 @@ class MainViewController: UIViewController, TextViewDelegate, UIActionSheetDeleg
 
     // Setup NavigationBar
     if let navbar = navigationController?.navigationBar {
-      if #available(iOS 13.0, *) {
-        // Dark mode settings must be applied through this new property,
-        // its class, and others like it.
-        navbar.standardAppearance.configureWithOpaqueBackground()
-      } else {
-        // Fallback on earlier versions
-      }
+      navbar.standardAppearance.configureWithOpaqueBackground()
       navbarBackground = KMNavigationBarBackgroundView()
       navbarBackground.addToNavbar(navbar)
       navbarBackground.setOrientation(UIApplication.shared.statusBarOrientation)
@@ -695,12 +689,7 @@ class MainViewController: UIViewController, TextViewDelegate, UIActionSheetDeleg
 
     let lframe = CGRect(x: 0, y: bframe.origin.y - 1, width: sframe.size.width, height: 1)
     let borderLine = UIView(frame: lframe)
-    if #available(iOS 13.0, *) {
-      borderLine.backgroundColor = UIColor.separator
-    } else {
-      let c: CGFloat = 230.0 / 255.0
-      borderLine.backgroundColor = UIColor(red: c, green: c, blue: c, alpha: 1.0)
-    }
+    borderLine.backgroundColor = UIColor.separator
     containerView.addSubview(borderLine)
 
     let tframe = CGRect(x: 0, y: 0, width: bframe.size.width, height: 40)
@@ -709,11 +698,7 @@ class MainViewController: UIViewController, TextViewDelegate, UIActionSheetDeleg
     textSizeTitle.backgroundColor = UIColor.clear
     textSizeTitle.text = String.init(format: NSLocalizedString("text-size-label", comment: ""), Int(textSize))
     textSizeTitle.textAlignment = .center
-    if #available(iOS 13.0, *) {
-      textSizeTitle.textColor = UIColor.secondaryLabel
-    } else {
-      textSizeTitle.textColor = UIColor.gray
-    }
+    textSizeTitle.textColor = UIColor.secondaryLabel
     textSizeTitle.font = textSizeTitle.font.withSize(14.0)
     containerView.addSubview(textSizeTitle)
 
diff --git a/ios/keyman/Keyman/Keyman/PackageBrowserViewController.swift b/ios/keyman/Keyman/Keyman/PackageBrowserViewController.swift
index c7d3904387..a26922adf5 100644
--- a/ios/keyman/Keyman/Keyman/PackageBrowserViewController.swift
+++ b/ios/keyman/Keyman/Keyman/PackageBrowserViewController.swift
@@ -33,13 +33,6 @@ class PackageBrowserViewController: UIDocumentPickerViewController, UIDocumentPi
                                      bundle: Bundle(for: Manager.self),
                                      comment: "")
 
-      if #available(iOS 13.0, *) {
-        // Easily dismissable without the extra button.
-      } else {
-        self.navigationItem.setLeftBarButton(
-          UIBarButtonItem(barButtonSystemItem: .cancel, target: self, action: #selector(self.doCancel)),
-          animated: true)
-      }
       self.modalPresentationStyle = .fullScreen
   }
 
diff --git a/ios/keyman/Keyman/SWKeyboard/KeyboardViewController.swift b/ios/keyman/Keyman/SWKeyboard/KeyboardViewController.swift
index be5ffb4e39..7d88af2f0b 100644
--- a/ios/keyman/Keyman/SWKeyboard/KeyboardViewController.swift
+++ b/ios/keyman/Keyman/SWKeyboard/KeyboardViewController.swift
@@ -81,28 +81,26 @@ class KeyboardViewController: InputViewController {
   override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
     super.traitCollectionDidChange(previousTraitCollection)
     guard let previousTraitCollection = previousTraitCollection else {return}
-    if #available(iOS 13.0, *) {
-      if previousTraitCollection.hasDifferentColorAppearance(comparedTo: traitCollection) {
-        /* Ensure that the keyboard banner image transitions!  Noting that the backing view isn't in the view hierarchy,
-         * and that manipulating said hierarchy is key for triggering the appearance change
-         * (see https://developer.apple.com/documentation/uikit/uiappearance)...
-         *
-         * We have to reload the banner's backing view to trigger the change.  Thanks, Apple.
-         * The only other alternative - creating a new instance of the view & its controller.
-         *
-         * With loadView, at least we can reuse the old instance, which would serve far better
-         * for engine API calls if we decide to let the base InputViewController perform UIView
-         * render functionality (as a KMEI offering) instead of having it only in our app.
-         * That said, note https://developer.apple.com/documentation/uikit/uiviewcontroller/1621454-loadview:
-         *
-         * > You should never call this method directly.
-         *
-         * Well... I wouldn't, if it weren't the only way to trigger this without requiring a new instance.
-         * We should be fine since we never place the banner's backing view into the actual hierarchy.
-         */
-        topBarImageSource.loadView()
-        setupTopBarImage(size: view.frame.size)
-      }
+    if previousTraitCollection.hasDifferentColorAppearance(comparedTo: traitCollection) {
+      /* Ensure that the keyboard banner image transitions!  Noting that the backing view isn't in the view hierarchy,
+       * and that manipulating said hierarchy is key for triggering the appearance change
+       * (see https://developer.apple.com/documentation/uikit/uiappearance)...
+       *
+       * We have to reload the banner's backing view to trigger the change.  Thanks, Apple.
+       * The only other alternative - creating a new instance of the view & its controller.
+       *
+       * With loadView, at least we can reuse the old instance, which would serve far better
+       * for engine API calls if we decide to let the base InputViewController perform UIView
+       * render functionality (as a KMEI offering) instead of having it only in our app.
+       * That said, note https://developer.apple.com/documentation/uikit/uiviewcontroller/1621454-loadview:
+       *
+       * > You should never call this method directly.
+       *
+       * Well... I wouldn't, if it weren't the only way to trigger this without requiring a new instance.
+       * We should be fine since we never place the banner's backing view into the actual hierarchy.
+       */
+      topBarImageSource.loadView()
+      setupTopBarImage(size: view.frame.size)
     }
   }
 }

From eab497ff7df1876629bf830364de6ba4211fc34b Mon Sep 17 00:00:00 2001
From: Joshua Horton <jahorton@sil.org>
Date: Thu, 13 Feb 2025 09:34:10 +0700
Subject: [PATCH 32/76] feat(android): add DownloadManager enablement check,
 related custom exception

---
 .../keyman/engine/cloud/CloudDownloadMgr.java | 19 +++++++++---
 .../DownloadManagerDisabledException.java     |  7 +++++
 .../keyman/engine/data/CloudRepository.java   | 14 +++++++--
 .../engine/logic/ResourcesUpdateTool.java     |  2 ++
 .../keyman/engine/util/DownloadFileUtils.java | 31 +++++++++++++++++++
 5 files changed, 66 insertions(+), 7 deletions(-)
 create mode 100644 android/KMEA/app/src/main/java/com/keyman/engine/cloud/DownloadManagerDisabledException.java

diff --git a/android/KMEA/app/src/main/java/com/keyman/engine/cloud/CloudDownloadMgr.java b/android/KMEA/app/src/main/java/com/keyman/engine/cloud/CloudDownloadMgr.java
index 8a25ab09ba..edf067221e 100644
--- a/android/KMEA/app/src/main/java/com/keyman/engine/cloud/CloudDownloadMgr.java
+++ b/android/KMEA/app/src/main/java/com/keyman/engine/cloud/CloudDownloadMgr.java
@@ -5,11 +5,13 @@ import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.os.Build;
 import android.util.Log;
 
 import com.keyman.engine.util.KMLog;
+import com.keyman.engine.util.DownloadFileUtils;
 
 import java.io.File;
 import java.util.HashMap;
@@ -210,7 +212,7 @@ public class CloudDownloadMgr{
   public <ModelType,ResultType> void executeAsDownload(Context aContext, String aDownloadIdentifier,
                                 ModelType aTargetModel,
                                 ICloudDownloadCallback<ModelType,ResultType> aCallback,
-                                CloudApiTypes.CloudApiParam... params)
+                                CloudApiTypes.CloudApiParam... params) throws DownloadManagerDisabledException
   {
     if(!isInitialized) {
       Log.w(TAG, "DownloadManager not initialized. Initializing CloudDownloadMgr.");
@@ -219,16 +221,23 @@ public class CloudDownloadMgr{
       KMLog.LogBreadcrumb("CloudDownloadMgr", "CloudDownloadMgr.executeAsDownload() called; already initialized", true);
     }
 
+    DownloadManager downloadManager = DownloadFileUtils.getDownloadManager(aContext);
+    if(downloadManager == null) {
+      aCallback.initializeContext(aContext);
+
+      // Signal the failure state; we literally can't do this right now!
+      // Fortunately, that does mean there's no need to signal via callback.
+      //
+      // Unique custom error so it's easy to explicitly filter.
+      throw new DownloadManagerDisabledException();
+    }
+
     synchronized (downloadSetByDownloadIdentifier) {
 
       if (alreadyDownloadingData(aDownloadIdentifier) || params == null) {
         return;
       }
 
-      DownloadManager downloadManager = (DownloadManager) aContext.getSystemService(Context.DOWNLOAD_SERVICE);
-      if(downloadManager==null)
-        throw new IllegalStateException("DownloadManager is not available");
-
       aCallback.initializeContext(aContext);
 
       CloudApiTypes.CloudDownloadSet<ModelType,ResultType> _downloadSet =
diff --git a/android/KMEA/app/src/main/java/com/keyman/engine/cloud/DownloadManagerDisabledException.java b/android/KMEA/app/src/main/java/com/keyman/engine/cloud/DownloadManagerDisabledException.java
new file mode 100644
index 0000000000..2011ad0eb0
--- /dev/null
+++ b/android/KMEA/app/src/main/java/com/keyman/engine/cloud/DownloadManagerDisabledException.java
@@ -0,0 +1,7 @@
+package com.keyman.engine.cloud;
+
+public class DownloadManagerDisabledException extends RuntimeException {
+  DownloadManagerDisabledException() {
+    super("System service DownloadManager is not available and cannot facilitate downloads or queries.");
+  }
+}
\ No newline at end of file
diff --git a/android/KMEA/app/src/main/java/com/keyman/engine/data/CloudRepository.java b/android/KMEA/app/src/main/java/com/keyman/engine/data/CloudRepository.java
index 4aad0a4e9f..9846dca149 100644
--- a/android/KMEA/app/src/main/java/com/keyman/engine/data/CloudRepository.java
+++ b/android/KMEA/app/src/main/java/com/keyman/engine/data/CloudRepository.java
@@ -13,12 +13,14 @@ import com.keyman.engine.KMManager;
 import com.keyman.engine.KeyboardPickerActivity;
 import com.keyman.engine.R;
 import com.keyman.engine.cloud.CloudApiTypes;
+import com.keyman.engine.cloud.DownloadManagerDisabledException;
 import com.keyman.engine.cloud.impl.CloudCatalogDownloadCallback;
 import com.keyman.engine.cloud.impl.CloudCatalogDownloadReturns;
 import com.keyman.engine.cloud.CloudDataJsonUtil;
 import com.keyman.engine.cloud.CloudDownloadMgr;
 import com.keyman.engine.packages.JSONUtils;
 import com.keyman.engine.util.BCP47;
+import com.keyman.engine.util.DownloadFileUtils;
 import com.keyman.engine.util.KMLog;
 import com.keyman.engine.util.VersionUtils;
 
@@ -366,6 +368,10 @@ public class CloudRepository {
    * @param onFailure  A callback to be triggered upon failure of a query.
    */
   private void downloadMetaDataFromServer(@NonNull Context context, UpdateHandler updateHandler, Runnable onSuccess, Runnable onFailure) {
+    if(DownloadFileUtils.getDownloadManager(context) == null) {
+      onFailure.run();
+      return;
+    }
     boolean cacheValid = getCacheValidity(context);
 
     // For local and PR test builds, force download of metadata
@@ -405,8 +411,12 @@ public class CloudRepository {
         BaseActivity.makeToast(context, R.string.catalog_download_is_running_in_background, Toast.LENGTH_SHORT);
       } else {
         updateIsRunning = true;
-        CloudDownloadMgr.getInstance().executeAsDownload(
-          context, DOWNLOAD_IDENTIFIER_CATALOGUE, memCachedDataset, _download_callback, params);
+        try {
+          CloudDownloadMgr.getInstance().executeAsDownload(
+            context, DOWNLOAD_IDENTIFIER_CATALOGUE, memCachedDataset, _download_callback, params);
+        } catch (DownloadManagerDisabledException e) {
+          onFailure.run();
+        }
       }
     }
   }
diff --git a/android/KMEA/app/src/main/java/com/keyman/engine/logic/ResourcesUpdateTool.java b/android/KMEA/app/src/main/java/com/keyman/engine/logic/ResourcesUpdateTool.java
index 9f02480bf2..8ff46bb0b7 100644
--- a/android/KMEA/app/src/main/java/com/keyman/engine/logic/ResourcesUpdateTool.java
+++ b/android/KMEA/app/src/main/java/com/keyman/engine/logic/ResourcesUpdateTool.java
@@ -122,6 +122,8 @@ public class ResourcesUpdateTool implements KeyboardEventHandler.OnKeyboardDownl
           return;
         }
 
+        // Warning:  can be run by our system keyboard, which will attempt to
+        // display the toast if it or the app is visible!
         BaseActivity.makeToast(currentContext, R.string.update_check_unavailable, Toast.LENGTH_SHORT);
         lastUpdateCheck = Calendar.getInstance();
         updateCheckFailed = true;
diff --git a/android/KMEA/app/src/main/java/com/keyman/engine/util/DownloadFileUtils.java b/android/KMEA/app/src/main/java/com/keyman/engine/util/DownloadFileUtils.java
index c16d3d381d..96ee696074 100644
--- a/android/KMEA/app/src/main/java/com/keyman/engine/util/DownloadFileUtils.java
+++ b/android/KMEA/app/src/main/java/com/keyman/engine/util/DownloadFileUtils.java
@@ -3,7 +3,9 @@
  */
 package com.keyman.engine.util;
 
+import android.app.DownloadManager;
 import android.content.Context;
+import android.content.pm.PackageManager;
 import android.database.Cursor;
 import android.net.Uri;
 import android.provider.OpenableColumns;
@@ -21,6 +23,35 @@ import java.io.InputStream;
 public final class DownloadFileUtils {
   private static final String TAG = "DownloadFileUtils";
 
+  private static final String DOWNLOAD_MANAGER_PACKAGE_NAME = "com.android.providers.downloads";
+
+  /**
+   * Determines whether or not Android's `DownloadManager` service is active;
+   * downloads and cloud queries are impossible when it's disabled.
+   *
+   * This solution is based heavily on
+   * https://gist.github.com/Folyd/b9412bb6e2b06eb511f7.
+   * @return
+   */
+  public static DownloadManager getDownloadManager(Context context) {
+    DownloadManager downloadManager = (DownloadManager) context.getSystemService(Context.DOWNLOAD_SERVICE);
+    if(downloadManager==null) {
+      return null;
+    }
+
+    int state = context.getPackageManager().getApplicationEnabledSetting(DOWNLOAD_MANAGER_PACKAGE_NAME);
+
+    if(
+      state == PackageManager.COMPONENT_ENABLED_STATE_DISABLED ||
+        state == PackageManager.COMPONENT_ENABLED_STATE_DISABLED_USER ||
+        state == PackageManager.COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED
+    ) {
+      return null;
+    };
+
+    return downloadManager;
+  }
+
   /**
    * Small class for returning information about a file downloaded via DownloadManager.
    */

From c3caf7ffffcda7aed026e1b85de4def0b8c2a371 Mon Sep 17 00:00:00 2001
From: Joshua Horton <jahorton@sil.org>
Date: Thu, 13 Feb 2025 10:14:42 +0700
Subject: [PATCH 33/76] fix(android): prevent update-checks from instantly
 crashing app + system keyboard

Fixes: #11568
---
 .../main/java/com/keyman/android/SystemKeyboard.java   | 10 +++++++++-
 .../main/java/com/tavultesoft/kmapro/MainActivity.java |  2 ++
 android/KMAPro/kMAPro/src/main/res/values/strings.xml  |  2 ++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/android/KMAPro/kMAPro/src/main/java/com/keyman/android/SystemKeyboard.java b/android/KMAPro/kMAPro/src/main/java/com/keyman/android/SystemKeyboard.java
index 5ca3de5807..690f36d9ed 100644
--- a/android/KMAPro/kMAPro/src/main/java/com/keyman/android/SystemKeyboard.java
+++ b/android/KMAPro/kMAPro/src/main/java/com/keyman/android/SystemKeyboard.java
@@ -4,6 +4,9 @@
 
 package com.keyman.android;
 
+import com.keyman.engine.cloud.DownloadManagerDisabledException;
+import com.keyman.engine.util.DownloadFileUtils;
+import com.keyman.engine.util.KMLog;
 import com.tavultesoft.kmapro.AdjustLongpressDelayActivity;
 import com.tavultesoft.kmapro.BuildConfig;
 import com.tavultesoft.kmapro.DefaultLanguageResource;
@@ -84,7 +87,12 @@ public class SystemKeyboard extends InputMethodService implements OnKeyboardEven
     boolean mayHaveHapticFeedback = prefs.getBoolean(KeymanSettingsActivity.hapticFeedbackKey, false);
     KMManager.setHapticFeedback(mayHaveHapticFeedback);
 
-    KMManager.executeResourceUpdate(this);
+    // Checking for updates should never be allowed to crash the keyboard.
+    // Just silently fail if this occurs.
+    if(DownloadFileUtils.getDownloadManager(this) != null) {
+      // Will try to emit a toast if it fails - i.e., is not silent.
+      KMManager.executeResourceUpdate(this);
+    }
   }
 
   @Override
diff --git a/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/MainActivity.java b/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/MainActivity.java
index 908d2f4538..68db37f57e 100644
--- a/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/MainActivity.java
+++ b/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/MainActivity.java
@@ -32,6 +32,7 @@ import com.keyman.engine.KeyboardEventHandler.OnKeyboardDownloadEventListener;
 import com.keyman.engine.KeyboardEventHandler.OnKeyboardEventListener;
 import com.keyman.engine.cloud.CloudApiTypes;
 import com.keyman.engine.cloud.CloudDownloadMgr;
+import com.keyman.engine.cloud.DownloadManagerDisabledException;
 import com.keyman.engine.cloud.impl.CloudLexicalModelMetaDataDownloadCallback;
 import com.keyman.engine.data.CloudRepository;
 import com.keyman.engine.data.Dataset;
@@ -154,6 +155,7 @@ public class MainActivity extends BaseActivity implements OnKeyboardEventListene
     }
 
     KMManager.initialize(getApplicationContext(), KeyboardType.KEYBOARD_TYPE_INAPP);
+
     KMManager.executeResourceUpdate(this);
 
     DefaultLanguageResource.install(context);
diff --git a/android/KMAPro/kMAPro/src/main/res/values/strings.xml b/android/KMAPro/kMAPro/src/main/res/values/strings.xml
index 01546f91ba..d10facf639 100644
--- a/android/KMAPro/kMAPro/src/main/res/values/strings.xml
+++ b/android/KMAPro/kMAPro/src/main/res/values/strings.xml
@@ -27,6 +27,8 @@
   <!-- Context: Menu Action -->
   <string name="action_install_updates" comment="Menu notification that keyboard or dictionary updates available">Install Updates</string>
 
+  <!-- Context:  Update check failure notification -->
+  <string name="update_check_impossible" comment="Notification that the app cannot check for keyboard updates">DownloadManager disabled - cannot check for updates</string>
 
   <!-- Context: Title -->
   <string name="title_version" comment="Title of Keyman for Android version">Version: %1$s</string>

From 31af7cfc463a75214bcaa84377fb656bbd66e588 Mon Sep 17 00:00:00 2001
From: Joshua Horton <jahorton@sil.org>
Date: Thu, 13 Feb 2025 13:41:46 +0700
Subject: [PATCH 34/76] chore(android): handle other potentially-affected cases

---
 .../com/tavultesoft/kmapro/MainActivity.java  | 12 ++++++---
 .../engine/KMKeyboardDownloaderActivity.java  | 27 ++++++++++++++-----
 .../keyman/engine/ModelPickerActivity.java    | 13 ++++++---
 ...dLexicalModelMetaDataDownloadCallback.java | 13 ++++++---
 4 files changed, 49 insertions(+), 16 deletions(-)

diff --git a/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/MainActivity.java b/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/MainActivity.java
index 68db37f57e..00a66575ca 100644
--- a/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/MainActivity.java
+++ b/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/MainActivity.java
@@ -979,9 +979,15 @@ public class MainActivity extends BaseActivity implements OnKeyboardEventListene
           aPreparedCloudApiParams.add(new CloudApiTypes.CloudApiParam(
             CloudApiTypes.ApiTarget.KeyboardLexicalModels, url).setType(CloudApiTypes.JSONType.Array));
 
-          CloudDownloadMgr.getInstance().executeAsDownload(
-            context, _downloadid, null, _callback,
-            aPreparedCloudApiParams.toArray(new CloudApiTypes.CloudApiParam[0]));
+          try {
+            CloudDownloadMgr.getInstance().executeAsDownload(
+              context, _downloadid, null, _callback,
+              aPreparedCloudApiParams.toArray(new CloudApiTypes.CloudApiParam[0]));
+          } catch (DownloadManagerDisabledException e) {
+            Toast.makeText(context,
+              context.getString(R.string.update_check_unavailable),
+              Toast.LENGTH_SHORT).show();
+          }
         }
       }
     }
diff --git a/android/KMEA/app/src/main/java/com/keyman/engine/KMKeyboardDownloaderActivity.java b/android/KMEA/app/src/main/java/com/keyman/engine/KMKeyboardDownloaderActivity.java
index e4f3055763..658596ba6f 100644
--- a/android/KMEA/app/src/main/java/com/keyman/engine/KMKeyboardDownloaderActivity.java
+++ b/android/KMEA/app/src/main/java/com/keyman/engine/KMKeyboardDownloaderActivity.java
@@ -10,6 +10,7 @@ import androidx.appcompat.app.AppCompatActivity;
 import com.keyman.engine.cloud.CloudApiTypes;
 import com.keyman.engine.cloud.CloudDataJsonUtil;
 import com.keyman.engine.cloud.CloudDownloadMgr;
+import com.keyman.engine.cloud.DownloadManagerDisabledException;
 import com.keyman.engine.cloud.impl.CloudKeyboardPackageDownloadCallback;
 import com.keyman.engine.data.Keyboard;
 import com.keyman.engine.data.KeyboardController;
@@ -72,7 +73,7 @@ public class KMKeyboardDownloaderActivity extends BaseActivity {
 
   //TODO: move to keyboard manager class
   private static ArrayList<KeyboardEventHandler.OnKeyboardDownloadEventListener> kbDownloadEventListeners = null;
-  
+
   @Override
   public void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
@@ -164,9 +165,15 @@ public class KMKeyboardDownloaderActivity extends BaseActivity {
         context.getString(R.string.keyboard_download_start_in_background),
         Toast.LENGTH_SHORT).show();
 
-      CloudDownloadMgr.getInstance().executeAsDownload(
-        context, _downloadid, null, _callback,
-        aPreparedCloudApiParams.toArray(new CloudApiTypes.CloudApiParam[0]));
+      try {
+        CloudDownloadMgr.getInstance().executeAsDownload(
+          context, _downloadid, null, _callback,
+          aPreparedCloudApiParams.toArray(new CloudApiTypes.CloudApiParam[0]));
+      } catch (DownloadManagerDisabledException e) {
+        Toast.makeText(context,
+          context.getString(R.string.update_check_unavailable),
+          Toast.LENGTH_SHORT).show();
+      }
     }
 
     ((AppCompatActivity) context).finish();
@@ -219,9 +226,15 @@ public class KMKeyboardDownloaderActivity extends BaseActivity {
         context.getString(R.string.dictionary_download_start_in_background),
         Toast.LENGTH_SHORT).show();
 
-      CloudDownloadMgr.getInstance().executeAsDownload(
-        context, _downloadid, null, _callback,
-        aPreparedCloudApiParams.toArray(new CloudApiTypes.CloudApiParam[0]));
+      try {
+        CloudDownloadMgr.getInstance().executeAsDownload(
+          context, _downloadid, null, _callback,
+          aPreparedCloudApiParams.toArray(new CloudApiTypes.CloudApiParam[0]));
+      } catch (DownloadManagerDisabledException e) {
+        Toast.makeText(context,
+          context.getString(R.string.update_check_unavailable),
+          Toast.LENGTH_SHORT).show();
+      }
     }
 
     ((AppCompatActivity) context).finish();
diff --git a/android/KMEA/app/src/main/java/com/keyman/engine/ModelPickerActivity.java b/android/KMEA/app/src/main/java/com/keyman/engine/ModelPickerActivity.java
index 4595aae1e7..82b854d908 100644
--- a/android/KMEA/app/src/main/java/com/keyman/engine/ModelPickerActivity.java
+++ b/android/KMEA/app/src/main/java/com/keyman/engine/ModelPickerActivity.java
@@ -22,6 +22,7 @@ import androidx.appcompat.widget.Toolbar;
 
 import com.keyman.engine.cloud.CloudApiTypes;
 import com.keyman.engine.cloud.CloudDownloadMgr;
+import com.keyman.engine.cloud.DownloadManagerDisabledException;
 import com.keyman.engine.cloud.impl.CloudLexicalModelMetaDataDownloadCallback;
 import com.keyman.engine.data.CloudRepository;
 import com.keyman.engine.data.Dataset;
@@ -110,9 +111,15 @@ public final class ModelPickerActivity extends BaseActivity {
         aPreparedCloudApiParams.add(new CloudApiTypes.CloudApiParam(
           CloudApiTypes.ApiTarget.KeyboardLexicalModels, url).setType(CloudApiTypes.JSONType.Array));
 
-        CloudDownloadMgr.getInstance().executeAsDownload(
-          context, _downloadid, null, _callback,
-          aPreparedCloudApiParams.toArray(new CloudApiTypes.CloudApiParam[0]));
+        try {
+          CloudDownloadMgr.getInstance().executeAsDownload(
+            context, _downloadid, null, _callback,
+            aPreparedCloudApiParams.toArray(new CloudApiTypes.CloudApiParam[0]));
+        } catch (DownloadManagerDisabledException e) {
+          Toast.makeText(context,
+            context.getString(R.string.update_check_unavailable),
+            Toast.LENGTH_SHORT).show();
+        }
       } else {
         Toast.makeText(context,
           context.getString(R.string.cannot_connect),
diff --git a/android/KMEA/app/src/main/java/com/keyman/engine/cloud/impl/CloudLexicalModelMetaDataDownloadCallback.java b/android/KMEA/app/src/main/java/com/keyman/engine/cloud/impl/CloudLexicalModelMetaDataDownloadCallback.java
index 2063d2d10f..79c0f37e70 100644
--- a/android/KMEA/app/src/main/java/com/keyman/engine/cloud/impl/CloudLexicalModelMetaDataDownloadCallback.java
+++ b/android/KMEA/app/src/main/java/com/keyman/engine/cloud/impl/CloudLexicalModelMetaDataDownloadCallback.java
@@ -12,6 +12,7 @@ import com.keyman.engine.R;
 import com.keyman.engine.cloud.CloudApiTypes;
 import com.keyman.engine.cloud.CloudDataJsonUtil;
 import com.keyman.engine.cloud.CloudDownloadMgr;
+import com.keyman.engine.cloud.DownloadManagerDisabledException;
 import com.keyman.engine.cloud.ICloudDownloadCallback;
 import com.keyman.engine.util.KMLog;
 
@@ -111,9 +112,15 @@ public class CloudLexicalModelMetaDataDownloadCallback implements ICloudDownload
 
           BaseActivity.makeToast(aContext, R.string.dictionary_download_start_in_background, Toast.LENGTH_SHORT);
 
-          CloudDownloadMgr.getInstance().executeAsDownload(aContext,
-            _r.additionalDownloadid, null, _callback,
-            _r.additionalDownloads.toArray(new CloudApiTypes.CloudApiParam[0]));
+          try {
+            CloudDownloadMgr.getInstance().executeAsDownload(aContext,
+              _r.additionalDownloadid, null, _callback,
+              _r.additionalDownloads.toArray(new CloudApiTypes.CloudApiParam[0]));
+          } catch (DownloadManagerDisabledException e) {
+            Toast.makeText(aContext,
+              aContext.getString(R.string.update_check_unavailable),
+              Toast.LENGTH_SHORT).show();
+          }
         }
       }
     }

From cb9546fdde4691ca05f0a5e290ab7ee3ec1cc1c1 Mon Sep 17 00:00:00 2001
From: Joshua Horton <jahorton@sil.org>
Date: Thu, 13 Feb 2025 14:08:26 +0700
Subject: [PATCH 35/76] fix(android): extra robustness in cloud-repo-query
 operation

---
 .../src/main/java/com/keyman/engine/data/CloudRepository.java  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/android/KMEA/app/src/main/java/com/keyman/engine/data/CloudRepository.java b/android/KMEA/app/src/main/java/com/keyman/engine/data/CloudRepository.java
index 9846dca149..8e1a8bdf35 100644
--- a/android/KMEA/app/src/main/java/com/keyman/engine/data/CloudRepository.java
+++ b/android/KMEA/app/src/main/java/com/keyman/engine/data/CloudRepository.java
@@ -416,6 +416,9 @@ public class CloudRepository {
             context, DOWNLOAD_IDENTIFIER_CATALOGUE, memCachedDataset, _download_callback, params);
         } catch (DownloadManagerDisabledException e) {
           onFailure.run();
+        } catch (Exception e) {
+          KMLog.LogException(TAG, "Unexpected exception type occurred when trying to query the server", e);
+          onFailure.run();
         }
       }
     }

From 536201f53e251fa3d91969a37e0f94480e208895 Mon Sep 17 00:00:00 2001
From: Joshua Horton <jahorton@sil.org>
Date: Thu, 13 Feb 2025 14:37:55 +0700
Subject: [PATCH 36/76] chore(android): add handling + Sentry logging for
 robustness in case of other sources

---
 .../com/tavultesoft/kmapro/MainActivity.java  | 11 ++++++---
 .../engine/KMKeyboardDownloaderActivity.java  | 23 ++++++++++++++-----
 .../keyman/engine/ModelPickerActivity.java    | 12 +++++++---
 ...dLexicalModelMetaDataDownloadCallback.java | 15 ++++++++----
 4 files changed, 44 insertions(+), 17 deletions(-)

diff --git a/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/MainActivity.java b/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/MainActivity.java
index 00a66575ca..138683b505 100644
--- a/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/MainActivity.java
+++ b/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/MainActivity.java
@@ -979,14 +979,19 @@ public class MainActivity extends BaseActivity implements OnKeyboardEventListene
           aPreparedCloudApiParams.add(new CloudApiTypes.CloudApiParam(
             CloudApiTypes.ApiTarget.KeyboardLexicalModels, url).setType(CloudApiTypes.JSONType.Array));
 
+          Toast errorToast = Toast.makeText(context,
+            context.getString(com.keyman.engine.R.string.update_check_unavailable),
+            Toast.LENGTH_SHORT);
+
           try {
             CloudDownloadMgr.getInstance().executeAsDownload(
               context, _downloadid, null, _callback,
               aPreparedCloudApiParams.toArray(new CloudApiTypes.CloudApiParam[0]));
           } catch (DownloadManagerDisabledException e) {
-            Toast.makeText(context,
-              context.getString(R.string.update_check_unavailable),
-              Toast.LENGTH_SHORT).show();
+            errorToast.show();
+          } catch (Exception e) {
+            errorToast.show();
+            KMLog.LogException(TAG, "Unexpected exception occurred during download attempt", e);
           }
         }
       }
diff --git a/android/KMEA/app/src/main/java/com/keyman/engine/KMKeyboardDownloaderActivity.java b/android/KMEA/app/src/main/java/com/keyman/engine/KMKeyboardDownloaderActivity.java
index 658596ba6f..468433fee0 100644
--- a/android/KMEA/app/src/main/java/com/keyman/engine/KMKeyboardDownloaderActivity.java
+++ b/android/KMEA/app/src/main/java/com/keyman/engine/KMKeyboardDownloaderActivity.java
@@ -15,6 +15,7 @@ import com.keyman.engine.cloud.impl.CloudKeyboardPackageDownloadCallback;
 import com.keyman.engine.data.Keyboard;
 import com.keyman.engine.data.KeyboardController;
 import com.keyman.engine.cloud.impl.CloudLexicalPackageDownloadCallback;
+import com.keyman.engine.util.KMLog;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -165,14 +166,19 @@ public class KMKeyboardDownloaderActivity extends BaseActivity {
         context.getString(R.string.keyboard_download_start_in_background),
         Toast.LENGTH_SHORT).show();
 
+      Toast errorToast = Toast.makeText(context,
+        context.getString(R.string.update_check_unavailable),
+        Toast.LENGTH_SHORT);
+
       try {
         CloudDownloadMgr.getInstance().executeAsDownload(
           context, _downloadid, null, _callback,
           aPreparedCloudApiParams.toArray(new CloudApiTypes.CloudApiParam[0]));
       } catch (DownloadManagerDisabledException e) {
-        Toast.makeText(context,
-          context.getString(R.string.update_check_unavailable),
-          Toast.LENGTH_SHORT).show();
+        errorToast.show();
+      } catch (Exception e) {
+        errorToast.show();
+        KMLog.LogException(TAG, "Unexpected exception occurred during download attempt", e);
       }
     }
 
@@ -226,14 +232,19 @@ public class KMKeyboardDownloaderActivity extends BaseActivity {
         context.getString(R.string.dictionary_download_start_in_background),
         Toast.LENGTH_SHORT).show();
 
+      Toast errorToast = Toast.makeText(context,
+        context.getString(R.string.update_check_unavailable),
+        Toast.LENGTH_SHORT);
+
       try {
         CloudDownloadMgr.getInstance().executeAsDownload(
           context, _downloadid, null, _callback,
           aPreparedCloudApiParams.toArray(new CloudApiTypes.CloudApiParam[0]));
       } catch (DownloadManagerDisabledException e) {
-        Toast.makeText(context,
-          context.getString(R.string.update_check_unavailable),
-          Toast.LENGTH_SHORT).show();
+        errorToast.show();
+      } catch (Exception e) {
+        errorToast.show();
+        KMLog.LogException(TAG, "Unexpected exception occurred during download attempt", e);
       }
     }
 
diff --git a/android/KMEA/app/src/main/java/com/keyman/engine/ModelPickerActivity.java b/android/KMEA/app/src/main/java/com/keyman/engine/ModelPickerActivity.java
index 82b854d908..23b6a9125a 100644
--- a/android/KMEA/app/src/main/java/com/keyman/engine/ModelPickerActivity.java
+++ b/android/KMEA/app/src/main/java/com/keyman/engine/ModelPickerActivity.java
@@ -29,6 +29,7 @@ import com.keyman.engine.data.Dataset;
 import com.keyman.engine.data.LexicalModel;
 import com.keyman.engine.data.adapters.NestedAdapter;
 import com.keyman.engine.util.BCP47;
+import com.keyman.engine.util.KMLog;
 import com.keyman.engine.util.MapCompat;
 
 import java.io.File;
@@ -111,14 +112,19 @@ public final class ModelPickerActivity extends BaseActivity {
         aPreparedCloudApiParams.add(new CloudApiTypes.CloudApiParam(
           CloudApiTypes.ApiTarget.KeyboardLexicalModels, url).setType(CloudApiTypes.JSONType.Array));
 
+        Toast errorToast = Toast.makeText(context,
+          context.getString(R.string.update_check_unavailable),
+          Toast.LENGTH_SHORT);
+
         try {
           CloudDownloadMgr.getInstance().executeAsDownload(
             context, _downloadid, null, _callback,
             aPreparedCloudApiParams.toArray(new CloudApiTypes.CloudApiParam[0]));
         } catch (DownloadManagerDisabledException e) {
-          Toast.makeText(context,
-            context.getString(R.string.update_check_unavailable),
-            Toast.LENGTH_SHORT).show();
+          errorToast.show();
+        } catch (Exception e) {
+          errorToast.show();
+          KMLog.LogException(TAG, "Unexpected exception occurred during download attempt", e);
         }
       } else {
         Toast.makeText(context,
diff --git a/android/KMEA/app/src/main/java/com/keyman/engine/cloud/impl/CloudLexicalModelMetaDataDownloadCallback.java b/android/KMEA/app/src/main/java/com/keyman/engine/cloud/impl/CloudLexicalModelMetaDataDownloadCallback.java
index 79c0f37e70..d5cb08547b 100644
--- a/android/KMEA/app/src/main/java/com/keyman/engine/cloud/impl/CloudLexicalModelMetaDataDownloadCallback.java
+++ b/android/KMEA/app/src/main/java/com/keyman/engine/cloud/impl/CloudLexicalModelMetaDataDownloadCallback.java
@@ -112,14 +112,19 @@ public class CloudLexicalModelMetaDataDownloadCallback implements ICloudDownload
 
           BaseActivity.makeToast(aContext, R.string.dictionary_download_start_in_background, Toast.LENGTH_SHORT);
 
+          Toast errorToast = Toast.makeText(aContext,
+            aContext.getString(R.string.update_check_unavailable),
+            Toast.LENGTH_SHORT);
+
           try {
-            CloudDownloadMgr.getInstance().executeAsDownload(aContext,
-              _r.additionalDownloadid, null, _callback,
+            CloudDownloadMgr.getInstance().executeAsDownload(
+              aContext, _r.additionalDownloadid, null, _callback,
               _r.additionalDownloads.toArray(new CloudApiTypes.CloudApiParam[0]));
           } catch (DownloadManagerDisabledException e) {
-            Toast.makeText(aContext,
-              aContext.getString(R.string.update_check_unavailable),
-              Toast.LENGTH_SHORT).show();
+            errorToast.show();
+          } catch (Exception e) {
+            errorToast.show();
+            KMLog.LogException(TAG, "Unexpected exception occurred during download attempt", e);
           }
         }
       }

From dc17075408a38f6e80a3678c54d5ad5654018940 Mon Sep 17 00:00:00 2001
From: Darcy Wong <darcy_wong@sil.org>
Date: Thu, 13 Feb 2025 14:41:44 +0700
Subject: [PATCH 37/76] fix(android): Remove sendOptionsToKeyboard function
 from Engine API

---
 .../java/com/keyman/android/SystemKeyboard.java   |  2 --
 .../kmapro/AdjustLongpressDelayActivity.java      |  1 -
 .../java/com/tavultesoft/kmapro/MainActivity.java |  3 +--
 android/KMEA/app/src/main/assets/android-host.js  |  8 +++++++-
 .../main/java/com/keyman/engine/KMManager.java    | 15 +++++++++------
 5 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/android/KMAPro/kMAPro/src/main/java/com/keyman/android/SystemKeyboard.java b/android/KMAPro/kMAPro/src/main/java/com/keyman/android/SystemKeyboard.java
index 5ca3de5807..4f5bd29dd3 100644
--- a/android/KMAPro/kMAPro/src/main/java/com/keyman/android/SystemKeyboard.java
+++ b/android/KMAPro/kMAPro/src/main/java/com/keyman/android/SystemKeyboard.java
@@ -250,8 +250,6 @@ public class SystemKeyboard extends InputMethodService implements OnKeyboardEven
       if (exText != null)
         exText = null;
     }
-    // Initialize keyboard options
-    KMManager.sendOptionsToKeyboard();
   }
 
   @Override
diff --git a/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/AdjustLongpressDelayActivity.java b/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/AdjustLongpressDelayActivity.java
index e79cb917ff..596c247d09 100644
--- a/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/AdjustLongpressDelayActivity.java
+++ b/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/AdjustLongpressDelayActivity.java
@@ -133,7 +133,6 @@ public class AdjustLongpressDelayActivity extends BaseActivity {
     // Store the longpress delay as a reference
     // and then update KeymanWeb with the longpress delay
     KMManager.setLongpressDelay(currentDelayTimeMS);
-    KMManager.sendOptionsToKeyboard();
 
     super.onBackPressed();
   }
diff --git a/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/MainActivity.java b/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/MainActivity.java
index 908d2f4538..37eb8eb685 100644
--- a/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/MainActivity.java
+++ b/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/MainActivity.java
@@ -475,8 +475,7 @@ public class MainActivity extends BaseActivity implements OnKeyboardEventListene
 
   @Override
   public void onKeyboardLoaded(KeyboardType keyboardType) {
-    // Initialize keyboard options
-    KMManager.sendOptionsToKeyboard();
+    // Do nothing
   }
 
   @Override
diff --git a/android/KMEA/app/src/main/assets/android-host.js b/android/KMEA/app/src/main/assets/android-host.js
index 0bd199b4d6..155daed493 100644
--- a/android/KMEA/app/src/main/assets/android-host.js
+++ b/android/KMEA/app/src/main/assets/android-host.js
@@ -13,6 +13,7 @@ var bannerImagePath = '';
 var bannerHTMLContents = '';
 var fragmentToggle = 0;
 var deferredBannerCall;
+var longpressDelay = null;
 
 var sentryManager = new KeymanSentryManager({
   hostPlatform: "android"
@@ -71,6 +72,10 @@ function init() {
 
       keyman.refreshOskLayout();
     }
+    // Initialize the longpress delay
+    if(longpressDelay !== null) {
+      setLongpressDelay(longpressDelay);
+    }
   });
 
   keyman.addEventListener('keyboardloaded', setIsChiral);
@@ -128,7 +133,8 @@ function notifyHost(event, params) {
 // Update the KeymanWeb longpress delay
 // delay is in milliseconds
 function setLongpressDelay(delay) {
-  if (keyman.osk) {
+  longpressDelay = delay;
+  if (keyman && keyman.osk) {
     keyman.osk.gestureParams.longpress.waitLength = delay;
     console_debug('setLongpressDelay('+delay+')');
   } else {
diff --git a/android/KMEA/app/src/main/java/com/keyman/engine/KMManager.java b/android/KMEA/app/src/main/java/com/keyman/engine/KMManager.java
index 0e4c261232..13363185cc 100644
--- a/android/KMEA/app/src/main/java/com/keyman/engine/KMManager.java
+++ b/android/KMEA/app/src/main/java/com/keyman/engine/KMManager.java
@@ -724,6 +724,7 @@ public final class KMManager {
       keyboard.showBanner(true);
     }
     setEngineWebViewVersionStatus(appContext, keyboard);
+    sendLongpressDelay();
   }
 
   public static String getLanguagePredictionPreferenceKey(String langID) {
@@ -921,7 +922,7 @@ public final class KMManager {
       copyAsset(context, KMFilename_KmwCss, "", true);
       copyAsset(context, KMFilename_KmwGlobeHintCss, "", true);
       copyAsset(context, KMFilename_Osk_Ttf_Font, "", true);
-      
+
       // Needed until our minimum version of Chrome is 61.0+.
       copyAsset(context, KMFilename_JSPolyfill2, "", true);
 
@@ -2124,7 +2125,7 @@ public final class KMManager {
   }
 
   /**
-   * Set the longpress delay (in milliseconds) as a stored preference.
+   * Set the longpress delay (in milliseconds) as a stored preference and sends to KeymanWeb.
    * Valid range is 300 ms to 1500 ms. Returns true if the preference is successfully stored.
    * @param longpressDelay - int longpress delay in milliseconds
    * @return boolean
@@ -2140,17 +2141,19 @@ public final class KMManager {
     editor.putInt(KMKey_LongpressDelay, longpressDelay);
     editor.commit();
 
+    // Send longpress delay to KeymanWeb
+    sendLongpressDelay();
+
     return true;
   }
 
   /**
-   * Sends options to the KeymanWeb keyboard.
+   * Sends longpress delay to the KeymanWeb keyboard.
    * 1. number of milliseconds to trigger a longpress gesture.
-   * This method requires a keyboard to be loaded for the value to take effect.
    */
-  public static void sendOptionsToKeyboard() {
+  private static void sendLongpressDelay() {
     int longpressDelay = getLongpressDelay();
-    if (isKeyboardLoaded(KeyboardType.KEYBOARD_TYPE_INAPP)) {
+    if (InAppKeyboard != null) {
       InAppKeyboard.loadJavascript(KMString.format("setLongpressDelay(%d)", longpressDelay));
     }
 

From 18d4af5ac12ffc1df9adaecafbd2e63b3e0223df Mon Sep 17 00:00:00 2001
From: Joshua Horton <jahorton@sil.org>
Date: Thu, 13 Feb 2025 14:49:51 +0700
Subject: [PATCH 38/76] chore(android): clean up unused string dev artifact

---
 android/KMAPro/kMAPro/src/main/res/values/strings.xml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/android/KMAPro/kMAPro/src/main/res/values/strings.xml b/android/KMAPro/kMAPro/src/main/res/values/strings.xml
index d10facf639..a0447d0f89 100644
--- a/android/KMAPro/kMAPro/src/main/res/values/strings.xml
+++ b/android/KMAPro/kMAPro/src/main/res/values/strings.xml
@@ -27,9 +27,6 @@
   <!-- Context: Menu Action -->
   <string name="action_install_updates" comment="Menu notification that keyboard or dictionary updates available">Install Updates</string>
 
-  <!-- Context:  Update check failure notification -->
-  <string name="update_check_impossible" comment="Notification that the app cannot check for keyboard updates">DownloadManager disabled - cannot check for updates</string>
-
   <!-- Context: Title -->
   <string name="title_version" comment="Title of Keyman for Android version">Version: %1$s</string>
 

From 8ef559e90e244ee7c02547a3138fb89b2070fc24 Mon Sep 17 00:00:00 2001
From: Joshua Horton <jahorton@sil.org>
Date: Thu, 13 Feb 2025 14:54:34 +0700
Subject: [PATCH 39/76] docs(android): improve doc for new function

---
 .../java/com/keyman/engine/util/DownloadFileUtils.java    | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/android/KMEA/app/src/main/java/com/keyman/engine/util/DownloadFileUtils.java b/android/KMEA/app/src/main/java/com/keyman/engine/util/DownloadFileUtils.java
index 96ee696074..d9315f3f4d 100644
--- a/android/KMEA/app/src/main/java/com/keyman/engine/util/DownloadFileUtils.java
+++ b/android/KMEA/app/src/main/java/com/keyman/engine/util/DownloadFileUtils.java
@@ -26,12 +26,14 @@ public final class DownloadFileUtils {
   private static final String DOWNLOAD_MANAGER_PACKAGE_NAME = "com.android.providers.downloads";
 
   /**
-   * Determines whether or not Android's `DownloadManager` service is active;
-   * downloads and cloud queries are impossible when it's disabled.
+   * Determines whether or not Android's `DownloadManager` service is active, only
+   * returning an instance of DownloadManager when it is currently accessible and enabled.
+   * Downloads and cloud queries are impossible when it's disabled.
    *
    * This solution is based heavily on
    * https://gist.github.com/Folyd/b9412bb6e2b06eb511f7.
-   * @return
+   * @return A valid and enabled reference to the system's DownloadManager service.  May be null
+   * if it is not accessible or is disabled.
    */
   public static DownloadManager getDownloadManager(Context context) {
     DownloadManager downloadManager = (DownloadManager) context.getSystemService(Context.DOWNLOAD_SERVICE);

From fc3a312178396e4b3d92fcc6250a91efa5717686 Mon Sep 17 00:00:00 2001
From: Joshua Horton <joshua_horton@sil.org>
Date: Thu, 13 Feb 2025 15:14:21 +0700
Subject: [PATCH 40/76] chore(web): accept cleanup suggestion

Co-authored-by: Eberhard Beilharz <ermshiperete@users.noreply.github.com>
---
 web/common.inc.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/web/common.inc.sh b/web/common.inc.sh
index 05c924d6ec..d03820069d 100644
--- a/web/common.inc.sh
+++ b/web/common.inc.sh
@@ -105,7 +105,6 @@ function test-headless() {
   fi
   if [[ -n "$TEST_EXTENSIONS" ]]; then
     TEST_OPTS="$TEST_OPTS --extension $TEST_EXTENSIONS"
-    TEST_CD_REQD=true
   fi
 
   if [[ -e .c8rc.json ]]; then

From 1265e8770cb92d15670354ebd05858556d9be6a9 Mon Sep 17 00:00:00 2001
From: Darcy Wong <darcy_wong@sil.org>
Date: Thu, 13 Feb 2025 15:20:33 +0700
Subject: [PATCH 41/76] chore(android/engine): Cleanup else clause

---
 android/KMEA/app/src/main/assets/android-host.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/android/KMEA/app/src/main/assets/android-host.js b/android/KMEA/app/src/main/assets/android-host.js
index 155daed493..ad440d493a 100644
--- a/android/KMEA/app/src/main/assets/android-host.js
+++ b/android/KMEA/app/src/main/assets/android-host.js
@@ -137,8 +137,6 @@ function setLongpressDelay(delay) {
   if (keyman && keyman.osk) {
     keyman.osk.gestureParams.longpress.waitLength = delay;
     console_debug('setLongpressDelay('+delay+')');
-  } else {
-    window.console.log('setLongpressDelay error: keyman.osk undefined');
   }
 }
 

From b3ae7f831a583e6955005c612f3063bdc3e6f7bb Mon Sep 17 00:00:00 2001
From: Darcy Wong <darcy_wong@sil.org>
Date: Thu, 13 Feb 2025 15:21:13 +0700
Subject: [PATCH 42/76] fix(android): Don't set longpress delay for unit tests

---
 android/KMEA/app/src/main/java/com/keyman/engine/KMManager.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/android/KMEA/app/src/main/java/com/keyman/engine/KMManager.java b/android/KMEA/app/src/main/java/com/keyman/engine/KMManager.java
index 13363185cc..72e2d29811 100644
--- a/android/KMEA/app/src/main/java/com/keyman/engine/KMManager.java
+++ b/android/KMEA/app/src/main/java/com/keyman/engine/KMManager.java
@@ -722,9 +722,9 @@ public final class KMManager {
       }
       keyboard.setBanner(KMManager.BannerType.HTML);
       keyboard.showBanner(true);
+      sendLongpressDelay();
     }
     setEngineWebViewVersionStatus(appContext, keyboard);
-    sendLongpressDelay();
   }
 
   public static String getLanguagePredictionPreferenceKey(String langID) {

From aca4ed08611915527a98ddd50ce3c1e6e9da6e74 Mon Sep 17 00:00:00 2001
From: Darcy Wong <darcy_wong@sil.org>
Date: Thu, 13 Feb 2025 15:31:21 +0700
Subject: [PATCH 43/76] docs(android): Document removing sendOptionsToKeyboard
 API

---
 .../engine/KMManager/getLongpressDelay.md     |  1 -
 android/docs/engine/KMManager/index.md        |  3 --
 .../engine/KMManager/sendOptionsToKeyboard.md | 41 -------------------
 .../engine/KMManager/setLongpressDelay.md     |  8 +---
 4 files changed, 2 insertions(+), 51 deletions(-)
 delete mode 100644 android/docs/engine/KMManager/sendOptionsToKeyboard.md

diff --git a/android/docs/engine/KMManager/getLongpressDelay.md b/android/docs/engine/KMManager/getLongpressDelay.md
index 6fb0e872dc..1bc4d3b8cd 100644
--- a/android/docs/engine/KMManager/getLongpressDelay.md
+++ b/android/docs/engine/KMManager/getLongpressDelay.md
@@ -34,5 +34,4 @@ The following code illustrates the use of `getLongpressDelay()`:
 Keyman Engine for Android 18.0: New function.
 
 ## See also
-* [sendOptionsToKeyboard](sendOptionsToKeyboard)
 * [setLongpressDelay](setLongpressDelay)
diff --git a/android/docs/engine/KMManager/index.md b/android/docs/engine/KMManager/index.md
index 9a8cc4a796..519bd8ab55 100644
--- a/android/docs/engine/KMManager/index.md
+++ b/android/docs/engine/KMManager/index.md
@@ -212,9 +212,6 @@ The KMManager is the core class which provides most of the methods and constants
 [`removeKeyboardEventListener()`](removeKeyboardEventListener)
 : removes the specified listener from the list of keyboard event listeners
 
-[`sendOptionsToKeyboard()`](sendOptionsToKeyboard)
-: sends options like longpress delay to the KeymanWeb keyboard
-
 [`setCanAddNewKeyboard()`](setCanAddNewKeyboard)
 : sets whether adding a new keyboard is allowed
 
diff --git a/android/docs/engine/KMManager/sendOptionsToKeyboard.md b/android/docs/engine/KMManager/sendOptionsToKeyboard.md
deleted file mode 100644
index 399dfc7912..0000000000
--- a/android/docs/engine/KMManager/sendOptionsToKeyboard.md
+++ /dev/null
@@ -1,41 +0,0 @@
----
-title: KMManager.sendOptionsToKeyboard()
----
-
-## Summary
-
-The `sendOptionsToKeyboard()` method sends options like longpress delay to the KeymanWeb keyboard.
-
-## Syntax
-
-```java
-KMManager.sendOptionsToKeyboard()
-```
-
-## Description
-Use this method to update options in the KeymanWeb keyboard.
-* Number of milliseconds to trigger a longpress gesture
-
-This method requires a keyboard to be loaded for the values to take effect.
-
-## Examples
-
-### Example: Using `sendOptionsToKeyboard()`
-
-The following code illustrates the use of `sendOptionsToKeyboard()`:
-```java
-    int currentDelayTimeMS = 250;
-
-    // Store currentDelayTimeMS
-    KMManager.setLongpressDelay(currentDelayTimeMS);
-
-    // Apply the keyboard options
-    KMManager.sendOptionsToKeyboard();
-```
-
-## History
-Keyman Engine for Android 18.0: New function.
-
-## See also
-* [getLongpressDelay](getLongpressDelay)
-* [setLongpressDelay](setLongpressDelay)
diff --git a/android/docs/engine/KMManager/setLongpressDelay.md b/android/docs/engine/KMManager/setLongpressDelay.md
index e4666c867b..4d6dda4016 100644
--- a/android/docs/engine/KMManager/setLongpressDelay.md
+++ b/android/docs/engine/KMManager/setLongpressDelay.md
@@ -4,7 +4,7 @@ title: KMManager.setLongpressDelay()
 
 ## Summary
 
-The `setLongpressDelay()` method sets the number of milliseconds to trigger a longpress gesture as a stored preference.
+The `setLongpressDelay()` method sets the number of milliseconds to trigger a longpress gesture as a stored preference and sends it to the KeymanWeb Engine.
 
 ## Syntax
 
@@ -27,11 +27,8 @@ The following code illustrates the use of `setLongpressDelay()`:
 ```java
     int currentDelayTimeMS = 300;
 
-    // Store currentDelayTimeMS
+    // Store currentDelayTimeMS and applies
     KMManager.setLongpressDelay(currentDelayTimeMS);
-
-    // Apply the keyboard options
-    KMManager.sendOptionsToKeyboard();
 ```
 
 ## History
@@ -39,4 +36,3 @@ Keyman Engine for Android 18.0: New function.
 
 ## See also
 * [getLongpressDelay](getLongpressDelay)
-* [sendOptionsToKeyboard](sendOptionsToKeyboard)

From cdf7b9b0b3cde06bf1b4d748d119207be03f6a48 Mon Sep 17 00:00:00 2001
From: Joshua Horton <jahorton@sil.org>
Date: Thu, 13 Feb 2025 15:43:37 +0700
Subject: [PATCH 44/76] chore(web): cleanup shell variable no longer being
 referenced

---
 web/common.inc.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/web/common.inc.sh b/web/common.inc.sh
index d03820069d..5b48464378 100644
--- a/web/common.inc.sh
+++ b/web/common.inc.sh
@@ -99,7 +99,6 @@ function test-headless() {
   fi
 
   TEST_OPTS=
-  TEST_CD_REQD=false
   if builder_has_option --ci; then
     TEST_OPTS="--reporter mocha-teamcity-reporter"
   fi

From f07a565d885457815f044e25d2ee247ba7eb0a8c Mon Sep 17 00:00:00 2001
From: Shawn Schantz <shawn_schantz@sil.org>
Date: Thu, 13 Feb 2025 15:55:30 +0700
Subject: [PATCH 45/76] chore(ios): added back accidentally deleted line

---
 .../KeymanEngine/Classes/Keyboard/KeymanWebViewController.swift  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ios/engine/KMEI/KeymanEngine/Classes/Keyboard/KeymanWebViewController.swift b/ios/engine/KMEI/KeymanEngine/Classes/Keyboard/KeymanWebViewController.swift
index e4d88a363a..341d8e496e 100644
--- a/ios/engine/KMEI/KeymanEngine/Classes/Keyboard/KeymanWebViewController.swift
+++ b/ios/engine/KMEI/KeymanEngine/Classes/Keyboard/KeymanWebViewController.swift
@@ -165,6 +165,7 @@ class KeymanWebViewController: UIViewController {
   override func viewWillAppear(_ animated: Bool) {
     super.viewWillAppear(animated)
     self.userContentController.removeAllScriptMessageHandlers()
+    self.userContentController.add(self, name: keymanWebViewName)
   }
 
   // Very useful for immediately adjusting the WebView's properties upon loading.

From 83f886f6438e26e2b2d25510480afdcbe24e2fa9 Mon Sep 17 00:00:00 2001
From: Darcy Wong <darcy_wong@sil.org>
Date: Thu, 13 Feb 2025 16:06:50 +0700
Subject: [PATCH 46/76] Update
 android/docs/engine/KMManager/setLongpressDelay.md

Co-authored-by: Marc Durdin <marc@durdin.net>
---
 android/docs/engine/KMManager/setLongpressDelay.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/android/docs/engine/KMManager/setLongpressDelay.md b/android/docs/engine/KMManager/setLongpressDelay.md
index 4d6dda4016..118343b432 100644
--- a/android/docs/engine/KMManager/setLongpressDelay.md
+++ b/android/docs/engine/KMManager/setLongpressDelay.md
@@ -4,7 +4,7 @@ title: KMManager.setLongpressDelay()
 
 ## Summary
 
-The `setLongpressDelay()` method sets the number of milliseconds to trigger a longpress gesture as a stored preference and sends it to the KeymanWeb Engine.
+The `setLongpressDelay()` method sets the number of milliseconds to trigger a longpress gesture, applies to the keyboard, and stores preference.
 
 ## Syntax
 

From 91ed7e040bc91d68d894b3877ec4dd09b6b58033 Mon Sep 17 00:00:00 2001
From: Emmanuel Ferdman <emmanuelferdman@gmail.com>
Date: Thu, 13 Feb 2025 01:22:50 -0800
Subject: [PATCH 47/76] docs: update keyboard processor build source

Signed-off-by: Emmanuel Ferdman <emmanuelferdman@gmail.com>
---
 docs/build/linux-ubuntu.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/build/linux-ubuntu.md b/docs/build/linux-ubuntu.md
index 0f531acb59..20770733f4 100644
--- a/docs/build/linux-ubuntu.md
+++ b/docs/build/linux-ubuntu.md
@@ -113,7 +113,7 @@ All dependencies are already installed if you followed the instructions under
 
 Keyman Core can be built with the `core/build.sh` script.
 
-- [Building Keyman Core](../../core/doc/BUILDING.md)
+- [Building Keyman Core](../../core/docs/BUILDING.md)
 
 ## Keyman for Linux
 

From 0bff2d8ff6361a13a4543390b48a228f29d0fbf0 Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Thu, 13 Feb 2025 13:52:27 +0100
Subject: [PATCH 48/76] Update TIER.md

---
 TIER.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/TIER.md b/TIER.md
index 65b2df87f7..4a58007052 100644
--- a/TIER.md
+++ b/TIER.md
@@ -1 +1 @@
-beta
+alpha

From 965aee64f8c6b1cf1efc42d05ad6a54ad85ca2f0 Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Thu, 13 Feb 2025 13:52:57 +0100
Subject: [PATCH 49/76] Update VERSION.md


From 07dac95514b2781cf59d58d5d2047c94a2a7fb7f Mon Sep 17 00:00:00 2001
From: Darcy Wong <darcy_wong@sil.org>
Date: Thu, 13 Feb 2025 21:50:02 +0700
Subject: [PATCH 50/76] Update
 android/KMEA/app/src/main/java/com/keyman/engine/util/WebViewUtils.java

---
 .../app/src/main/java/com/keyman/engine/util/WebViewUtils.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/android/KMEA/app/src/main/java/com/keyman/engine/util/WebViewUtils.java b/android/KMEA/app/src/main/java/com/keyman/engine/util/WebViewUtils.java
index 0993abac0d..de8b37f73e 100644
--- a/android/KMEA/app/src/main/java/com/keyman/engine/util/WebViewUtils.java
+++ b/android/KMEA/app/src/main/java/com/keyman/engine/util/WebViewUtils.java
@@ -68,7 +68,8 @@ public final class WebViewUtils {
    */
   public static SystemWebViewStatus getSystemWebViewStatus(
       Context context) {
-    // Check whether WebView is installed - this also returns true when installed but disabled
+    // Check whether WebView is installed
+    // If the package is installed but disabled, hasSystemFeature() still returns true
     PackageManager packageManager = context.getPackageManager();
     if (!packageManager.hasSystemFeature("android.software.webview")) {
       return SystemWebViewStatus.NOT_INSTALLED;

From df9d8180ecd53867d03b0769fcd2e9ef2b997a4f Mon Sep 17 00:00:00 2001
From: Darcy Wong <darcy_wong@sil.org>
Date: Thu, 13 Feb 2025 21:51:16 +0700
Subject: [PATCH 51/76] refactor(android): Separate checking status from
 displaying panels

---
 .../com/tavultesoft/kmapro/MainActivity.java  | 109 +++++++++++++-----
 1 file changed, 78 insertions(+), 31 deletions(-)

diff --git a/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/MainActivity.java b/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/MainActivity.java
index 98e26959b7..9ff06cdc36 100644
--- a/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/MainActivity.java
+++ b/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/MainActivity.java
@@ -185,7 +185,10 @@ public class MainActivity extends BaseActivity implements OnKeyboardEventListene
     textView.setSelection(textView.getText().length());
 
     // Check WebView enabled and Chrome version
-    checkWebViewAndChromeVersion(context);
+    SystemWebViewStatus webViewStatus = WebViewUtils.getSystemWebViewStatus(context);
+    EngineWebViewVersionStatus chromeStatus = KMManager.getEngineWebViewVersionStatus();
+    updateWebViewIfNeeded(chromeStatus, webViewStatus);
+
     CheckInstallReferrer.checkGooglePlayInstallReferrer(this, context);
     checkGetStarted();
   }
@@ -774,52 +777,93 @@ public class MainActivity extends BaseActivity implements OnKeyboardEventListene
   }
 
   /**
-   * Check that WebView is enabled and Chrome version high enough for Keyman.
-   * If they're not, update the view and button to install/enable the missing app.
-   * @param context
+   * Based on whether Chrome and WebView are installed & enabled,
+   * display the corresponding update panel
+   * @param chromeStatus
+   * @param webViewStatus
    */
-  private void checkWebViewAndChromeVersion(Context context) {
-    final SystemWebViewStatus webViewStatus = WebViewUtils.getSystemWebViewStatus(context);
-    final boolean updateChrome = KMManager.getEngineWebViewVersionStatus() != EngineWebViewVersionStatus.FULL;
-    if (webViewStatus == SystemWebViewStatus.FULL && !updateChrome) {
+  private void updateWebViewIfNeeded(EngineWebViewVersionStatus chromeStatus, SystemWebViewStatus webViewStatus) {
+    if (chromeStatus == EngineWebViewVersionStatus.FULL && webViewStatus == SystemWebViewStatus.FULL) {
       return;
     }
 
-    final TextView textView = (TextView)findViewById((R.id.kmWebViewChromeTextView));
-    String buttonLabel = getString(R.string.button_update_chrome);
     if (webViewStatus == SystemWebViewStatus.NOT_INSTALLED) {
-      textView.setText(getString(R.string.body_install_webview));
-      buttonLabel = getString(R.string.label_install_webview);
+      displayInstallWebView();
     } else if (webViewStatus == SystemWebViewStatus.DISABLED) {
-      textView.setText(R.string.body_enable_webview);
-      buttonLabel = getString(R.string.label_enable_webview);
+      displayEnableWebView();
+    } else {
+      // Otherwise, display update Chrome
+      displayUpdateChrome();
     }
+  }
+
+  private void displayInstallWebView() {
+    TextView textView = (TextView)findViewById((R.id.kmWebViewChromeTextView));
+    textView.setText(getString(R.string.body_install_webview));
+
+    Button button = (Button)findViewById(R.id.webViewChromeButton);
+    button.setText(getString(R.string.label_install_webview));
+    button.setOnClickListener(new View.OnClickListener() {
+      public void onClick(View v) {
+        // Play Store link to install WebView
+        Intent intent = new Intent(Intent.ACTION_VIEW,
+            Uri.parse("https://play.google.com/store/apps/details?id=com.google.android.webview"));
+
+        // Launch intent
+        try {
+          PackageManager packageManager = context.getPackageManager();
+          if (intent.resolveActivity(packageManager) != null) {
+            startActivity(intent);
+          }
+        } catch (android.content.ActivityNotFoundException e) {
+          Toast.makeText(getApplicationContext(), getString(R.string.unable_to_open_browser), Toast.LENGTH_SHORT).show();
+        }
+      }
+    });
 
     LinearLayout webViewChromeLayout = (LinearLayout) findViewById(R.id.checkWebViewChromeLayout);
     webViewChromeLayout.setVisibility(View.VISIBLE);
+  }
+
+  private void displayEnableWebView() {
+    TextView textView = (TextView)findViewById((R.id.kmWebViewChromeTextView));
+    textView.setText(getString(R.string.body_enable_webview));
 
     Button button = (Button)findViewById(R.id.webViewChromeButton);
-    button.setText(buttonLabel);
+    button.setText(getString(R.string.label_enable_webview));
     button.setOnClickListener(new View.OnClickListener() {
       public void onClick(View v) {
-        // Initialize the intent to something (alternate Play Store link to install/update Chrome)
-        Intent intent = new Intent(Intent.ACTION_VIEW,
-          Uri.parse("https://play.google.com/store/apps/details?id=com.android.chrome"));
-        if (webViewStatus == SystemWebViewStatus.NOT_INSTALLED) {
-          // Play Store link to install WebView
-          intent = new Intent(Intent.ACTION_VIEW,
-            Uri.parse("https://play.google.com/store/apps/details?id=com.google.android.webview"));
-        } else if (webViewStatus == SystemWebViewStatus.DISABLED) {
-          // Application settings to enable WebView
-          intent = new Intent("android.settings.APPLICATION_DETAILS_SETTINGS",
-            Uri.parse("package:com.google.android.webview"));
-        } else if (updateChrome) {
-          // Primary Play Store link to install/update Chrome
-          intent = new Intent(Intent.ACTION_VIEW,
-            Uri.parse("market://details?id=com.android.chrome"));
-        }
+        // Application settings to enable WebView
+        Intent intent = new Intent("android.settings.APPLICATION_DETAILS_SETTINGS",
+          Uri.parse("package:com.google.android.webview"));
 
         // Launch intent
+        try {
+          PackageManager packageManager = context.getPackageManager();
+          if (intent.resolveActivity(packageManager) != null) {
+            startActivity(intent);
+          }
+        } catch (android.content.ActivityNotFoundException e) {
+          Toast.makeText(getApplicationContext(), getString(R.string.unable_to_open_browser), Toast.LENGTH_SHORT).show();
+        }
+      }
+    });
+
+    LinearLayout webViewChromeLayout = (LinearLayout) findViewById(R.id.checkWebViewChromeLayout);
+    webViewChromeLayout.setVisibility(View.VISIBLE);
+  }
+
+  private void displayUpdateChrome() {
+    // TextView's default string is to update Chrome
+
+    Button button = (Button)findViewById(R.id.webViewChromeButton);
+    button.setText(getString(R.string.button_update_chrome));
+    button.setOnClickListener(new View.OnClickListener() {
+      public void onClick(View v) {
+        // Primary Play Store link to install/update Chrome
+        Intent intent = new Intent(Intent.ACTION_VIEW,
+          Uri.parse("market://details?id=com.android.chrome"));
+
         try {
           PackageManager packageManager = context.getPackageManager();
           if (intent.resolveActivity(packageManager) != null) {
@@ -837,6 +881,9 @@ public class MainActivity extends BaseActivity implements OnKeyboardEventListene
         }
       }
     });
+
+    LinearLayout webViewChromeLayout = (LinearLayout) findViewById(R.id.checkWebViewChromeLayout);
+    webViewChromeLayout.setVisibility(View.VISIBLE);
   }
 
   private Uri requestPermissionIntentUri;

From d6e7c0b9d1c6a19d3cd8fd971abdae7e0bc8f2b7 Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Fri, 14 Feb 2025 07:45:28 +0700
Subject: [PATCH 52/76] chore: Revert "Merge branch 'master' into beta"

This reverts commit fae3932e15dd2e4e2790f1382a78b096e2e7ce69, reversing
changes made to 793daddb48c6c11eb6beb3632cbd6351a9396fa8.
---
 HISTORY.md                                    |  9 ------
 VERSION.md                                    |  2 +-
 android/docs/engine/guides/in-app/index.md    |  6 ++--
 android/docs/engine/index.md                  |  2 +-
 android/docs/engine/whatsnew.md               |  7 ++++-
 android/docs/help/about/whatsnew.md           |  7 +++--
 android/docs/help/index.md                    |  2 +-
 developer/docs/help/index.md                  |  4 +--
 developer/docs/help/whats-new.md              | 20 +++++++++++--
 developer/src/kmc/src/kmlmp.ts                |  2 +-
 docs/build/linux-ubuntu.md                    |  2 +-
 docs/linux/README.md                          |  2 +-
 docs/minimum-versions.md                      |  2 +-
 docs/minimum-versions.md.in                   |  2 +-
 ios/docs/engine/index.md                      |  2 +-
 ios/docs/help/about/whatsnew.md               |  7 +++--
 ios/docs/help/index.md                        |  2 +-
 linux/debian/control                          |  4 +--
 linux/debian/rules                            |  5 +++-
 linux/docs/help/about/whatsnew.md             | 12 ++++++--
 linux/docs/help/index.md                      |  2 +-
 linux/ibus-keyman/src/keymanutil.c            |  5 ++--
 linux/ibus-keyman/src/test/keymanutil.tests.c | 30 ++++++++++++++-----
 .../keyman_config/downloadkeyboard.py         |  7 ++++-
 .../keyman_config/install_window.py           |  7 ++++-
 .../keyman_config/keyboard_options_view.py    |  7 ++++-
 linux/keyman-config/keyman_config/welcome.py  |  6 +++-
 mac/docs/help/about/whatsnew.md               | 10 +++++--
 mac/docs/help/index.md                        |  2 +-
 resources/build/minimum-versions.inc.sh       |  2 +-
 web/docs/engine/guide/index.md                |  6 ++--
 web/docs/engine/index.md                      | 12 ++++----
 web/docs/engine/reference/core/version.md     |  2 +-
 web/docs/engine/reference/index.md            |  2 +-
 web/docs/engine/whats-new.md                  |  2 +-
 windows/docs/engine/api/index.md              |  6 ++--
 windows/docs/engine/index.md                  |  4 +--
 windows/docs/help/about/whatsnew.md           |  4 +--
 windows/docs/help/index.md                    |  2 +-
 39 files changed, 145 insertions(+), 74 deletions(-)

diff --git a/HISTORY.md b/HISTORY.md
index c88caba4e5..5a5b197557 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,14 +1,5 @@
 # Keyman Version History
 
-## 19.0.2 alpha 2025-02-12
-
-* chore(linux): remove support of Ubuntu 20.04 Focal (#13203)
-
-## 19.0.1 alpha 2025-02-11
-
-* refactor(windows): rename `TKeymanMutex.MutexOwned` to `TakeOwnership` and add `ReleaseOwnership` (#13168)
-* chore: increment to alpha 19.0 (#13187)
-
 ## 18.0.191 beta 2025-02-12
 
 * feat(windows): handle a hard windows reset occurring while downloading updated keyman files (#13128)
diff --git a/VERSION.md b/VERSION.md
index 25720f44a6..60181cc347 100644
--- a/VERSION.md
+++ b/VERSION.md
@@ -1 +1 @@
-19.0.3
+18.0.192
\ No newline at end of file
diff --git a/android/docs/engine/guides/in-app/index.md b/android/docs/engine/guides/in-app/index.md
index 538094ddbb..d788e267bb 100644
--- a/android/docs/engine/guides/in-app/index.md
+++ b/android/docs/engine/guides/in-app/index.md
@@ -6,8 +6,8 @@ Keyman Engine for Android allows you to use any Keyman touch keyboard in your An
 system keyboard app for purchase in the Play Store.<br/>
 This guide will walk you through the steps for creating your first Android app with Keyman Engine for Android.
 
-If you are not familiar with Android development, you will find the
-[Android Developer online training](https://developer.android.com/training/index.html) an invaluable
+If you are not familiar with Android development, you will find the 
+[Android Developer online training](https://developer.android.com/training/index.html) an invaluable 
 resource, and working through some of their tutorials first will help you with the rest of this guide.
 
 ### 1. Install Free Tools
@@ -131,5 +131,5 @@ And there you have it: your first Keyman Engine for Android app!
 ## See Also
 * [Guide: Build a system keyboard app](../system-keyboard/)
 * [Keyman Developer Documentation](/developer/17.0/)
-* [Keyman Engine for Android Documentation](/developer/engine/android/19.0/)
+* [Keyman Engine for Android Documentation](/developer/engine/android/18.0/)
 * [Android Developer Home](https://developer.android.com/index.html)
diff --git a/android/docs/engine/index.md b/android/docs/engine/index.md
index 38f255592b..fa549e4b34 100644
--- a/android/docs/engine/index.md
+++ b/android/docs/engine/index.md
@@ -4,7 +4,7 @@ title: Keyman Engine for Android
 
 ## Overview
 
-Keyman Engine for Android 19.0 is a Java library for Android 5.0 and later versions which enables a fully customisable keyboard layout, both within an app and system-wide.
+Keyman Engine for Android 18.0 is a Java library for Android 5.0 and later versions which enables a fully customisable keyboard layout, both within an app and system-wide.
 Keyboard layouts for Keyman Engine can be created with [Keyman Developer](/developer/17.0), and a [library of existing keyboard layouts](http://keyman.com/developer/keymanweb/keyboards)
 is also available.</p>
 
diff --git a/android/docs/engine/whatsnew.md b/android/docs/engine/whatsnew.md
index 5d6f717f8a..af3f8932d6 100644
--- a/android/docs/engine/whatsnew.md
+++ b/android/docs/engine/whatsnew.md
@@ -1,6 +1,11 @@
 ---
-title: What's New in Keyman Engine 19.0 for Android
+title: What's New in Keyman Engine 18.0 for Android
 ---
 
+## Keyman Engine for Android Breaking Changes: ##
+
+* Change package name from `com.tavultesoft.kmea` to `com.keyman.engine` #7881
+* Update to Java 11 #8543
+
 ## See Also
 * [Keyman Engine for Android Documentation](index)
\ No newline at end of file
diff --git a/android/docs/help/about/whatsnew.md b/android/docs/help/about/whatsnew.md
index d0ca85e93f..0f0e891e42 100644
--- a/android/docs/help/about/whatsnew.md
+++ b/android/docs/help/about/whatsnew.md
@@ -1,6 +1,9 @@
 ---
-title: What's New in Keyman 19.0 for Android
+title: What's New in Keyman 18.0 for Android
 ---
 
-Here are some of the new features we have added to Keyman 19.0 for Android:
+Here are some of the new features we have added to Keyman 18.0 for Android:
 
+* New menu to adjust longpress delay time (#12170, #12185)
+* Support localizations for right-to-left languages (#12215)
+* Handle additional actions for ENTER key (#12125, #12315)
diff --git a/android/docs/help/index.md b/android/docs/help/index.md
index 360af91e6d..62df93195b 100644
--- a/android/docs/help/index.md
+++ b/android/docs/help/index.md
@@ -1,5 +1,5 @@
 ---
-title: Keyman for Android 19.0 Help
+title: Keyman for Android 18.0 Help
 ---
 
 ## [About Keyman](about/)
diff --git a/developer/docs/help/index.md b/developer/docs/help/index.md
index d7fbc4098d..9e9c250abb 100644
--- a/developer/docs/help/index.md
+++ b/developer/docs/help/index.md
@@ -1,5 +1,5 @@
 ---
-title: Keyman Developer 19.0 User Guide
+title: Keyman Developer 18.0 User Guide
 ---
 
 Need help using Keyman Developer to create your keyboard layouts? You'll
@@ -8,7 +8,7 @@ and tutorials, and full reference information.
 
 ## Guides and Tutorials
 -   [What is Keyman Developer?](guides/intro)
--   [What's new in 19.0](whats-new)
+-   [What's new in 18.0](whats-new)
 -   [Developing Keyman keyboard layouts](guides/develop)
 -   [Testing Keyman keyboards](guides/test)
 -   [Distributing Keyman keyboards](guides/distribute)
diff --git a/developer/docs/help/whats-new.md b/developer/docs/help/whats-new.md
index 1005476c3d..d941d0e917 100644
--- a/developer/docs/help/whats-new.md
+++ b/developer/docs/help/whats-new.md
@@ -1,5 +1,21 @@
 ---
-title: What's new in Keyman Developer 19.0
+title: What's new in Keyman Developer 18.0
 ---
 
-Keyman Developer 19 has the following significant changes:
+Keyman Developer 18 has a number of significant changes:
+
+* Updated to Unicode 16.0 (#12393)
+* Improve automatic detection of minimum Keyman version for a keyboard during
+  compilation (#11981, #11982, #11965, #11957)
+* Generate keyboards and lexical models from templates, with `kmc generate`
+  (#11014)
+* Clone existing keyboard and lexical model projects, both from local file
+  system and also from any open source online Keyman keyboard in Keyman Cloud or
+  GitHub, with `kmc copy` and New Project dialogs (#12555, #12586, #13076)
+* Support extending existing `&displaymap` data files when adding new characters
+  (#12622)
+* Font settings for on screen keyboards are now kept consistent with package
+  metadata during compilation (#12949)
+* New npm module @keymanapp/langtags makes langtags.json easily accessible
+  (#13046)
+* Compiler messages now have links to additional documentation (#13156)
diff --git a/developer/src/kmc/src/kmlmp.ts b/developer/src/kmc/src/kmlmp.ts
index a1346ac0d3..bb0cda5e53 100644
--- a/developer/src/kmc/src/kmlmp.ts
+++ b/developer/src/kmc/src/kmlmp.ts
@@ -3,7 +3,7 @@
  * kmlmp - Keyman Lexical Model Package Compiler
  */
 
-// Note: this is a deprecated package and will be removed in Keyman 19.0
+// Note: this is a deprecated package and will be removed in Keyman 18.0
 
 import { Command } from 'commander';
 import { KmpCompiler } from '@keymanapp/kmc-package';
diff --git a/docs/build/linux-ubuntu.md b/docs/build/linux-ubuntu.md
index 98e15185bf..9c0b195474 100644
--- a/docs/build/linux-ubuntu.md
+++ b/docs/build/linux-ubuntu.md
@@ -113,7 +113,7 @@ All dependencies are already installed if you followed the instructions under
 
 Keyman Core can be built with the `core/build.sh` script.
 
-- [Building Keyman Core](../../core/docs/BUILDING.md)
+- [Building Keyman Core](../../core/doc/BUILDING.md)
 
 ## Keyman for Linux
 
diff --git a/docs/linux/README.md b/docs/linux/README.md
index 64ef6c967f..80c1a78434 100644
--- a/docs/linux/README.md
+++ b/docs/linux/README.md
@@ -147,7 +147,7 @@ Run `ibus restart` after installing any of them.
 Keyman tries to activate the keyboard automatically. If you want to activate
 it for a different language, you can do so by following the steps below.
 
-#### GNOME3 (Ubuntu default)
+#### GNOME3 (focal and bionic default, also newer Ubuntu versions)
 
 - Click the connection/sound/shutdown section in the top right. Then the tools
   icon for Settings.
diff --git a/docs/minimum-versions.md b/docs/minimum-versions.md
index 4f67d5a626..3b270f48a4 100644
--- a/docs/minimum-versions.md
+++ b/docs/minimum-versions.md
@@ -4,7 +4,7 @@ title: Keyman Minimum Versions
 
 Changes in [minimum-versions.inc.sh](minimum-versions.inc.sh) should manually be propagated to the linked help files below:
 
-## Keyman 19.0
+## Keyman 18.0
 
 Target Operating System and Platform Versions
 
diff --git a/docs/minimum-versions.md.in b/docs/minimum-versions.md.in
index 41a664d454..ffe508e12f 100644
--- a/docs/minimum-versions.md.in
+++ b/docs/minimum-versions.md.in
@@ -4,7 +4,7 @@ title: Keyman Minimum Versions
 
 Changes in [minimum-versions.inc.sh](minimum-versions.inc.sh) should manually be propagated to the linked help files below:
 
-## Keyman 19.0
+## Keyman 18.0
 
 Target Operating System and Platform Versions
 
diff --git a/ios/docs/engine/index.md b/ios/docs/engine/index.md
index bdba88b741..b87af4e260 100644
--- a/ios/docs/engine/index.md
+++ b/ios/docs/engine/index.md
@@ -4,7 +4,7 @@ title: Keyman for iPhone and iPad Developer Support
 
 ## Overview
 
-The Keyman Engine for iPhone and iPad 19.0 SDK is designed to provide
+The Keyman Engine for iPhone and iPad 18.0 SDK is designed to provide
 advanced international keyboard support to iOS apps.
 
 As a developer, you simply need to use (or subclass) TextView or
diff --git a/ios/docs/help/about/whatsnew.md b/ios/docs/help/about/whatsnew.md
index b123b1f23c..e5338030f2 100644
--- a/ios/docs/help/about/whatsnew.md
+++ b/ios/docs/help/about/whatsnew.md
@@ -1,5 +1,8 @@
 ---
-title: What's New in Keyman 19.0 for iPhone and iPad
+title: What's New in Keyman 18.0 for iPhone and iPad
 ---
+Here are some significant changes to Keyman for iPhone and iPad 18.0:
 
-Here are some of the new features we have added to Keyman for iPhone and iPad 19.0:
+* Minimum supported version of iOS is 13.0.
+* Predictive text and on screen keyboard startup performance improvements (#11784, #11264, #11265)
+* Keyboard size can now be adjusted to your preference (#12571)
\ No newline at end of file
diff --git a/ios/docs/help/index.md b/ios/docs/help/index.md
index cd0f81300e..994bbbda9e 100644
--- a/ios/docs/help/index.md
+++ b/ios/docs/help/index.md
@@ -1,5 +1,5 @@
 ---
-title: Keyman for iPhone and iPad 19.0 Help
+title: Keyman for iPhone and iPad 18.0 Help
 ---
 
 ## [About Keyman](about/)
diff --git a/linux/debian/control b/linux/debian/control
index 7e71df1b7b..e6bc47bdb8 100644
--- a/linux/debian/control
+++ b/linux/debian/control
@@ -10,7 +10,7 @@ Build-Depends:
  debhelper-compat (= 12),
  dh-python,
  gawk,
- gir1.2-webkit2-4.1,
+ gir1.2-webkit2-4.1 | gir1.2-webkit2-4.0,
  ibus,
  libevdev-dev,
  libgtk-3-dev,
@@ -88,7 +88,7 @@ Architecture: all
 Depends:
  dbus-x11,
  dconf-cli,
- gir1.2-webkit2-4.1,
+ gir1.2-webkit2-4.1 | gir1.2-webkit2-4.0,
  keyman-engine,
  python3-bs4,
  python3-fonttools,
diff --git a/linux/debian/rules b/linux/debian/rules
index 5138b58330..8da37f40e4 100755
--- a/linux/debian/rules
+++ b/linux/debian/rules
@@ -66,7 +66,10 @@ override_dh_auto_install:
 	rm $(CURDIR)/debian/keyman/usr/share/locale/*.po*
 	# Don't call `build.sh install` - dh_auto_install does some extra smarts
 	dh_auto_install --sourcedir=linux/keyman-config --buildsystem=pybuild $@
-	dh $@ --with-python3 --with bash-completion
+	# Unfortunately bash-completion 2.10 (focal) doesn't yet provide dh-sequence-bash-completion,
+	# which we could add as build-dependency, so we'll have to explicitly call
+	# dh_bash_completion here instead of using `dh $@ --with-python3 --with bash-completion`
+	dh_bash-completion -O--buildsystem=pybuild
 	dh_python3 -O--buildsystem=pybuild
 
 override_dh_missing:
diff --git a/linux/docs/help/about/whatsnew.md b/linux/docs/help/about/whatsnew.md
index 5521261b96..35edaa60ab 100644
--- a/linux/docs/help/about/whatsnew.md
+++ b/linux/docs/help/about/whatsnew.md
@@ -1,5 +1,13 @@
 ---
-title: What's New in Keyman 19.0 for Linux
+title: What's New in Keyman 18.0 for Linux
 ---
 
-Here are some of the new features we have added to Keyman for Linux 19.0:
+Here are some significant changes to Keyman for Linux 18.0:
+
+- Minimum supported Ubuntu version is now 22.04 Jammy LTS.
+- Other supported versions are Ubuntu 24.04 Noble LTS and
+  Ubuntu 24.10 Oracular. Users that are running an older version of
+  Ubuntu will have to continue using an older Keyman version.
+- Keyman no longer requires a patched version of ibus as Keyman now uses
+  a system service to manage keystroke order (#11535).
+- Added support for simulation of AltGr (right Alt) with Ctrl+Alt (#11852)
diff --git a/linux/docs/help/index.md b/linux/docs/help/index.md
index 329c66f69b..58d245063a 100644
--- a/linux/docs/help/index.md
+++ b/linux/docs/help/index.md
@@ -1,5 +1,5 @@
 ---
-title: Keyman for Linux 19.0 Help
+title: Keyman for Linux 18.0 Help
 ---
 
 Need help using Keyman for Linux? In time, this product documentation will grow and explain frequently asked questions.
diff --git a/linux/ibus-keyman/src/keymanutil.c b/linux/ibus-keyman/src/keymanutil.c
index 4bb0ac4078..9f48f0ffce 100644
--- a/linux/ibus-keyman/src/keymanutil.c
+++ b/linux/ibus-keyman/src/keymanutil.c
@@ -649,8 +649,9 @@ _ptr_array_new_from_array(
 }
 
 // `g_ptr_array_new_from_null_terminated_array` is only available in GLib 2.76, but we're still
-// stuck to 2.72 (Ubuntu 22.04 Jammy). Therefore we copy the implementation here (slightly
-// simplified). Once we're past 2.76 we can use the GLib method directly.
+// stuck to 2.64 (Ubuntu 20.04 Focal) and 2.72 (Ubuntu 22.04 Jammy). Therefore we
+// copy the implementation here (slightly simplified). Once we're past 2.76 we can use the GLib method
+// directly.
 GPtrArray *
 _g_ptr_array_new_from_null_terminated_array(
     gpointer *data,
diff --git a/linux/ibus-keyman/src/test/keymanutil.tests.c b/linux/ibus-keyman/src/test/keymanutil.tests.c
index 56965a41ad..13636857d8 100644
--- a/linux/ibus-keyman/src/test/keymanutil.tests.c
+++ b/linux/ibus-keyman/src/test/keymanutil.tests.c
@@ -123,6 +123,22 @@ _free_tst_kb_data(add_keyboard_data* kb_data) {
 
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(add_keyboard_data, _free_tst_kb_data)
 
+// Newer glib versions have g_assert_cmpstrv which would allow to do
+// g_assert_cmpstrv(result, keyboards);
+// but unfortunately Ubuntu 20.04 Focal doesn't have that, so we roll
+// our own
+void
+_kmn_assert_cmpstrv(gchar** result, gchar** expected) {
+  g_assert_nonnull(result);
+  g_assert_nonnull(expected);
+  int i = 0;
+  for (; result[i] && expected[i]; i++) {
+    g_assert_cmpstr(result[i], ==, expected[i]);
+  }
+  g_assert_null(result[i]);
+  g_assert_null(expected[i]);
+}
+
 //----------------------------------------------------------------------------------------------
 void
 test_keyman_put_keyboard_options_todconf__invalid() {
@@ -510,7 +526,7 @@ test_keyman_set_custom_keyboards__new_key() {
   // Verify
   g_auto(GStrv) result = _get_tst_kbds_key();
   g_assert_nonnull(result);
-  g_assert_cmpstrv(result, keyboards);
+  _kmn_assert_cmpstrv(result, keyboards);
 
   // Cleanup
   _delete_tst_kbds_key();
@@ -530,7 +546,7 @@ test_keyman_set_custom_keyboards__overwrite_key() {
   // Verify
   g_auto(GStrv) result = _get_tst_kbds_key();
   g_assert_nonnull(result);
-  g_assert_cmpstrv(result, keyboards);
+  _kmn_assert_cmpstrv(result, keyboards);
 
   // Cleanup
   _delete_tst_kbds_key();
@@ -549,7 +565,7 @@ test_keyman_set_custom_keyboards__delete_key_NULL() {
   g_auto(GStrv) result = _get_tst_kbds_key();
   gchar* expected[] = {NULL};
   g_assert_nonnull(result);
-  g_assert_cmpstrv(result, expected);
+  _kmn_assert_cmpstrv(result, expected);
 
   // Cleanup
   _delete_tst_kbds_key();
@@ -569,7 +585,7 @@ test_keyman_set_custom_keyboards__delete_key_empty_array() {
   // Verify
   g_auto(GStrv) result = _get_tst_kbds_key();
   g_assert_nonnull(result);
-  g_assert_cmpstrv(result, keyboards);
+  _kmn_assert_cmpstrv(result, keyboards);
 
   // Cleanup
   _delete_tst_kbds_key();
@@ -588,7 +604,7 @@ test_keyman_set_custom_keyboards__invalid_values() {
   g_auto(GStrv) result = _get_tst_kbds_key();
   g_assert_nonnull(result);
   gchar* expected[] = {"fr:/tmp/test/test.kmx", NULL};
-  g_assert_cmpstrv(result, expected);
+  _kmn_assert_cmpstrv(result, expected);
 
   // Cleanup
   _delete_tst_kbds_key();
@@ -606,7 +622,7 @@ test_keyman_get_custom_keyboards__value() {
 
   // Verify
   g_assert_nonnull(result);
-  g_assert_cmpstrv(result, keyboards);
+  _kmn_assert_cmpstrv(result, keyboards);
 
   // Cleanup
   _delete_tst_kbds_key();
@@ -624,7 +640,7 @@ test_keyman_get_custom_keyboards__invalid_values() {
   // Verify
   gchar* expected[] = {"fr:/tmp/test/test.kmx", NULL};
   g_assert_nonnull(result);
-  g_assert_cmpstrv(result, expected);
+  _kmn_assert_cmpstrv(result, expected);
 
   // Cleanup
   _delete_tst_kbds_key();
diff --git a/linux/keyman-config/keyman_config/downloadkeyboard.py b/linux/keyman-config/keyman_config/downloadkeyboard.py
index ca3b091f92..42ff74308d 100755
--- a/linux/keyman-config/keyman_config/downloadkeyboard.py
+++ b/linux/keyman-config/keyman_config/downloadkeyboard.py
@@ -7,7 +7,12 @@ import urllib.parse
 import gi
 
 gi.require_version('Gtk', '3.0')
-gi.require_version('WebKit2', '4.1')
+try:
+    gi.require_version('WebKit2', '4.1')
+except ValueError:
+    # TODO: Remove once we drop support for Ubuntu 20.04 Focal
+    gi.require_version('WebKit2', '4.0')
+
 from gi.repository import Gtk, WebKit2
 
 from keyman_config import KeymanComUrl, _, __releaseversion__, __tier__
diff --git a/linux/keyman-config/keyman_config/install_window.py b/linux/keyman-config/keyman_config/install_window.py
index 1342dd44f6..dda242c7e1 100755
--- a/linux/keyman-config/keyman_config/install_window.py
+++ b/linux/keyman-config/keyman_config/install_window.py
@@ -15,7 +15,12 @@ import packaging.version
 import gi
 
 gi.require_version('Gtk', '3.0')
-gi.require_version('WebKit2', '4.1')
+try:
+    gi.require_version('WebKit2', '4.1')
+except ValueError:
+    # TODO: Remove once we drop support for Ubuntu 20.04 Focal
+    gi.require_version('WebKit2', '4.0')
+
 from gi.repository import Gtk, WebKit2
 
 from keyman_config import _, secure_lookup
diff --git a/linux/keyman-config/keyman_config/keyboard_options_view.py b/linux/keyman-config/keyman_config/keyboard_options_view.py
index 38499a558a..795386d7bf 100644
--- a/linux/keyman-config/keyman_config/keyboard_options_view.py
+++ b/linux/keyman-config/keyman_config/keyboard_options_view.py
@@ -8,7 +8,12 @@ from urllib.parse import parse_qsl, urlencode
 import gi
 
 gi.require_version('Gtk', '3.0')
-gi.require_version('WebKit2', '4.1')
+try:
+    gi.require_version('WebKit2', '4.1')
+except ValueError:
+    # TODO: Remove once we drop support for Ubuntu 20.04 Focal
+    gi.require_version('WebKit2', '4.0')
+
 from gi.repository import Gtk, WebKit2
 
 from keyman_config import _
diff --git a/linux/keyman-config/keyman_config/welcome.py b/linux/keyman-config/keyman_config/welcome.py
index a14d747c6a..af001ea464 100644
--- a/linux/keyman-config/keyman_config/welcome.py
+++ b/linux/keyman-config/keyman_config/welcome.py
@@ -7,7 +7,11 @@ import webbrowser
 import gi
 
 gi.require_version('Gtk', '3.0')
-gi.require_version('WebKit2', '4.1')
+try:
+    gi.require_version('WebKit2', '4.1')
+except ValueError:
+    # TODO: Remove once we drop support for Ubuntu 20.04 Focal
+    gi.require_version('WebKit2', '4.0')
 from gi.repository import Gtk, WebKit2
 
 from keyman_config import _
diff --git a/mac/docs/help/about/whatsnew.md b/mac/docs/help/about/whatsnew.md
index 8cc29bdadb..627ef1a5b0 100644
--- a/mac/docs/help/about/whatsnew.md
+++ b/mac/docs/help/about/whatsnew.md
@@ -1,5 +1,11 @@
 ---
-title: What's New in Keyman 19.0 for macOS
+title: What's New in Keyman 18.0 for macOS
 ---
 
-Here are some of the new features we have added to Keyman 19.0 for macOS:
+Here are some significant changes to Keyman 18.0 for macOS:
+
+* Minimum supported version of macOS is 10.13 High Sierra.
+* Improved handling of Option key and how it relates to Alt key in Keyman keyboards (#12458)
+* Keyman keyboards are now stored in the preferred location, `/Library/Application Support`, instead of `/Documents` (#12106)
+* Removed 'Use Verbose console Logging' option and use Apple unified logging system instead (#12431)
+* Removed 'Always Show OSK' option and automatically remember OSK window state instead (#12355)
\ No newline at end of file
diff --git a/mac/docs/help/index.md b/mac/docs/help/index.md
index 12397a903d..aa507a531e 100644
--- a/mac/docs/help/index.md
+++ b/mac/docs/help/index.md
@@ -1,5 +1,5 @@
 ---
-title: Keyman 19.0 for macOS Help
+title: Keyman 18.0 for macOS Help
 ---
 
 Need help using Keyman for macOS?  You'll find everything you need here, including product documentation,
diff --git a/resources/build/minimum-versions.inc.sh b/resources/build/minimum-versions.inc.sh
index 2e1a2914b1..9fb46cd492 100644
--- a/resources/build/minimum-versions.inc.sh
+++ b/resources/build/minimum-versions.inc.sh
@@ -1,4 +1,4 @@
-# Required minimum versions as of Keyman 19.0
+# Required minimum versions as of Keyman 18.0
 #
 # This is a list of minimum, maximum, and specific versions of any external
 # components or dependencies found in Keyman.
diff --git a/web/docs/engine/guide/index.md b/web/docs/engine/guide/index.md
index 4f59a4ebf0..26e2e42b47 100644
--- a/web/docs/engine/guide/index.md
+++ b/web/docs/engine/guide/index.md
@@ -1,8 +1,8 @@
 ---
-title: KeymanWeb - The Guide
+title: KeymanWeb 18.0 - The Guide
 ---
 
-Welcome to the guide for using KeymanWeb.
+Welcome to the guide for using KeymanWeb 18.0.
 
 -   [Getting Started with Keyman Web](get-started)
 -   [User Interface Design](user-interface-design)
@@ -10,4 +10,4 @@ Welcome to the guide for using KeymanWeb.
 -   [Installing Keyboards](adding-keyboards)
 -   [Additional Examples](examples/)
 
-[Return to the main KeymanWeb page](../)
\ No newline at end of file
+[Return to the main KeymanWeb 18.0 page](../)
\ No newline at end of file
diff --git a/web/docs/engine/index.md b/web/docs/engine/index.md
index 5515112f88..63d14e2fd1 100644
--- a/web/docs/engine/index.md
+++ b/web/docs/engine/index.md
@@ -1,27 +1,27 @@
 ---
-title: Keyman Engine for Web 19.0 Developer Help
+title: Keyman Engine for Web 18.0 Developer Help
 ---
-Keyman Engine for Web 19.0 is the current version of KeymanWeb and
+Keyman Engine for Web 18.0 is the current version of KeymanWeb and
 supports touch devices with custom touch-layouts as well as desktop
 computer browsers.
 
 [Download](https://keyman.com/developer/keymanweb/)
-:   Downloading Keyman Engine for Web
+:   Downloading Keyman Engine for Web 18.0
 
 <!-- -->
 
 [Guide](guide/)
-:   Keyman Engine for Web Guide
+:   Keyman Engine for Web 18.0 Guide
 
 <!-- -->
 
 [Reference](reference)
-:   Keyman Engine for Web Developer Reference
+:   Keyman Engine for Web 18.0 Developer Reference
 
 <!-- -->
 
 [What's New](whats-new)
-:   What's new in Keyman Engine for Web 19.0
+:   What's new in Keyman Engine for Web 18.0
 
 <!-- -->
 
diff --git a/web/docs/engine/reference/core/version.md b/web/docs/engine/reference/core/version.md
index 40b9db4529..7df0978ac8 100644
--- a/web/docs/engine/reference/core/version.md
+++ b/web/docs/engine/reference/core/version.md
@@ -22,7 +22,7 @@ Read only
 
 ### Return Value
 
-`'19.0'` (for KeymanWeb 19.0)
+`'18.0'` (for KeymanWeb 18.0)
 
 ## Description
 
diff --git a/web/docs/engine/reference/index.md b/web/docs/engine/reference/index.md
index f6e5a3a8de..74d83c3931 100644
--- a/web/docs/engine/reference/index.md
+++ b/web/docs/engine/reference/index.md
@@ -1,5 +1,5 @@
 ---
-title: KeymanWeb Reference
+title: KeymanWeb 18.0 Reference
 ---
 
 [KeymanWeb Overview](overview)
diff --git a/web/docs/engine/whats-new.md b/web/docs/engine/whats-new.md
index e220fb9c13..49fa337fe0 100644
--- a/web/docs/engine/whats-new.md
+++ b/web/docs/engine/whats-new.md
@@ -1,3 +1,3 @@
 ---
-title: What's New in KeymanWeb 19.0
+title: What's New in KeymanWeb 18.0
 ---
diff --git a/windows/docs/engine/api/index.md b/windows/docs/engine/api/index.md
index f95332c45a..7032aa0cd2 100644
--- a/windows/docs/engine/api/index.md
+++ b/windows/docs/engine/api/index.md
@@ -1,13 +1,13 @@
 ---
-title: Keyman Engine for Windows API
+title: Keyman Engine for Windows 18.0 API
 ---
 
 ## Introduction
 
-The Keyman Engine for Windows API is implemented in COM. It can be
+The Keyman Engine for Windows 18.0 API is implemented in COM. It can be
 instantiated with `CreateObject("keymanapi.Keyman")`.
 
-> [!Note]
+> [!Note] 
 > This documentation applies to Keyman Engine for Windows versions 14.0 and up.
 
 ## Interface Hierarchy
diff --git a/windows/docs/engine/index.md b/windows/docs/engine/index.md
index 0687433412..acdd77d877 100644
--- a/windows/docs/engine/index.md
+++ b/windows/docs/engine/index.md
@@ -1,8 +1,8 @@
 ---
-title: Keyman Engine for Windows
+title: Keyman Engine for Windows 18.0
 ---
 
-Keyman Engine for Windows gives you the tools to build a customised
+Keyman Engine for Windows 18.0 gives you the tools to build a customised
 desktop keyboarding product for Windows.
 
 **Note:** This documentation applies to Keyman Engine for Windows
diff --git a/windows/docs/help/about/whatsnew.md b/windows/docs/help/about/whatsnew.md
index 723530e09c..c4173bf2fc 100644
--- a/windows/docs/help/about/whatsnew.md
+++ b/windows/docs/help/about/whatsnew.md
@@ -1,8 +1,8 @@
 ---
-title: What's New in Keyman 19.0 for Windows
+title: What's New in Keyman 18.0 for Windows
 ---
 
-Here are some of the new features we have added to Keyman 19.0 for Windows:
+Here are some of the new features we have added to Keyman 18.0 for Windows:
 
 - Minimum supported version of Windows is 10.0
 - Updates to Keyman are now applied before Keyman starts for the first time in a session, so Windows no longer needs to be restarted (#10041)
diff --git a/windows/docs/help/index.md b/windows/docs/help/index.md
index 231ed5fc7d..c7cccc7695 100644
--- a/windows/docs/help/index.md
+++ b/windows/docs/help/index.md
@@ -1,5 +1,5 @@
 ---
-title: Keyman for Windows 19.0 Help
+title: Keyman for Windows 18.0 Help
 ---
 
 Need help using Keyman for Windows? You'll find everything you need here, including product documentation,

From b9e95b927213e431a4a480f07f35a74497251023 Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Fri, 14 Feb 2025 07:45:35 +0700
Subject: [PATCH 53/76] chore: Revert "Update TIER.md"

This reverts commit 0bff2d8ff6361a13a4543390b48a228f29d0fbf0.
---
 TIER.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/TIER.md b/TIER.md
index 4a58007052..65b2df87f7 100644
--- a/TIER.md
+++ b/TIER.md
@@ -1 +1 @@
-alpha
+beta

From 5a634cd74d3da6a27c9ed47b2af179f2607f4a24 Mon Sep 17 00:00:00 2001
From: Keyman Build Agent <buildagent@keyman.com>
Date: Thu, 13 Feb 2025 21:08:12 -0500
Subject: [PATCH 54/76] auto: increment beta version to 18.0.193

---
 HISTORY.md | 10 ++++++++++
 VERSION.md |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/HISTORY.md b/HISTORY.md
index 5a5b197557..1721f9af0a 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,5 +1,15 @@
 # Keyman Version History
 
+## 18.0.192 beta 2025-02-14
+
+* chore(common): Fix 17.0.335 tier in HISTORY.md (#13213)
+* docs(linux): update what's new for 18.0 (#13207)
+* chore(linux): additional code cleanup after Focal removal (#13206)
+* docs(windows): update keyman for windows 18.0 whats-new (#13211)
+* chore: undo master merge (#13238)
+* change(ios): prevent memory leaks from keyboard-related notification observers (#13129)
+* change(ios): mitigate keyboard input-view memory leak by force-discarding WebView (#13169)
+
 ## 18.0.191 beta 2025-02-12
 
 * feat(windows): handle a hard windows reset occurring while downloading updated keyman files (#13128)
diff --git a/VERSION.md b/VERSION.md
index 60181cc347..d8c84f1b9f 100644
--- a/VERSION.md
+++ b/VERSION.md
@@ -1 +1 @@
-18.0.192
\ No newline at end of file
+18.0.193
\ No newline at end of file

From 8910531c10d58329ceed6fbd4dd30c2810b81d17 Mon Sep 17 00:00:00 2001
From: Joshua Horton <jahorton@sil.org>
Date: Fri, 14 Feb 2025 09:09:10 +0700
Subject: [PATCH 55/76] refactor(android): deduplicate handler setup into
 helper method

---
 .../com/tavultesoft/kmapro/MainActivity.java  | 17 ++--------
 .../engine/KMKeyboardDownloaderActivity.java  | 34 ++++---------------
 .../keyman/engine/ModelPickerActivity.java    | 17 ++--------
 .../keyman/engine/cloud/CloudDownloadMgr.java | 23 +++++++++++--
 ...dLexicalModelMetaDataDownloadCallback.java | 17 ++--------
 5 files changed, 36 insertions(+), 72 deletions(-)

diff --git a/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/MainActivity.java b/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/MainActivity.java
index 138683b505..68db37f57e 100644
--- a/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/MainActivity.java
+++ b/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/MainActivity.java
@@ -979,20 +979,9 @@ public class MainActivity extends BaseActivity implements OnKeyboardEventListene
           aPreparedCloudApiParams.add(new CloudApiTypes.CloudApiParam(
             CloudApiTypes.ApiTarget.KeyboardLexicalModels, url).setType(CloudApiTypes.JSONType.Array));
 
-          Toast errorToast = Toast.makeText(context,
-            context.getString(com.keyman.engine.R.string.update_check_unavailable),
-            Toast.LENGTH_SHORT);
-
-          try {
-            CloudDownloadMgr.getInstance().executeAsDownload(
-              context, _downloadid, null, _callback,
-              aPreparedCloudApiParams.toArray(new CloudApiTypes.CloudApiParam[0]));
-          } catch (DownloadManagerDisabledException e) {
-            errorToast.show();
-          } catch (Exception e) {
-            errorToast.show();
-            KMLog.LogException(TAG, "Unexpected exception occurred during download attempt", e);
-          }
+          CloudDownloadMgr.getInstance().executeAsDownload(
+            context, _downloadid, null, _callback,
+            aPreparedCloudApiParams.toArray(new CloudApiTypes.CloudApiParam[0]));
         }
       }
     }
diff --git a/android/KMEA/app/src/main/java/com/keyman/engine/KMKeyboardDownloaderActivity.java b/android/KMEA/app/src/main/java/com/keyman/engine/KMKeyboardDownloaderActivity.java
index 468433fee0..ac875eec0f 100644
--- a/android/KMEA/app/src/main/java/com/keyman/engine/KMKeyboardDownloaderActivity.java
+++ b/android/KMEA/app/src/main/java/com/keyman/engine/KMKeyboardDownloaderActivity.java
@@ -166,20 +166,9 @@ public class KMKeyboardDownloaderActivity extends BaseActivity {
         context.getString(R.string.keyboard_download_start_in_background),
         Toast.LENGTH_SHORT).show();
 
-      Toast errorToast = Toast.makeText(context,
-        context.getString(R.string.update_check_unavailable),
-        Toast.LENGTH_SHORT);
-
-      try {
-        CloudDownloadMgr.getInstance().executeAsDownload(
-          context, _downloadid, null, _callback,
-          aPreparedCloudApiParams.toArray(new CloudApiTypes.CloudApiParam[0]));
-      } catch (DownloadManagerDisabledException e) {
-        errorToast.show();
-      } catch (Exception e) {
-        errorToast.show();
-        KMLog.LogException(TAG, "Unexpected exception occurred during download attempt", e);
-      }
+      CloudDownloadMgr.getInstance().executeAsDownload(
+        context, _downloadid, null, _callback,
+        aPreparedCloudApiParams.toArray(new CloudApiTypes.CloudApiParam[0]));
     }
 
     ((AppCompatActivity) context).finish();
@@ -232,20 +221,9 @@ public class KMKeyboardDownloaderActivity extends BaseActivity {
         context.getString(R.string.dictionary_download_start_in_background),
         Toast.LENGTH_SHORT).show();
 
-      Toast errorToast = Toast.makeText(context,
-        context.getString(R.string.update_check_unavailable),
-        Toast.LENGTH_SHORT);
-
-      try {
-        CloudDownloadMgr.getInstance().executeAsDownload(
-          context, _downloadid, null, _callback,
-          aPreparedCloudApiParams.toArray(new CloudApiTypes.CloudApiParam[0]));
-      } catch (DownloadManagerDisabledException e) {
-        errorToast.show();
-      } catch (Exception e) {
-        errorToast.show();
-        KMLog.LogException(TAG, "Unexpected exception occurred during download attempt", e);
-      }
+      CloudDownloadMgr.getInstance().executeAsDownload(
+        context, _downloadid, null, _callback,
+        aPreparedCloudApiParams.toArray(new CloudApiTypes.CloudApiParam[0]));
     }
 
     ((AppCompatActivity) context).finish();
diff --git a/android/KMEA/app/src/main/java/com/keyman/engine/ModelPickerActivity.java b/android/KMEA/app/src/main/java/com/keyman/engine/ModelPickerActivity.java
index 23b6a9125a..3c1a21f6d9 100644
--- a/android/KMEA/app/src/main/java/com/keyman/engine/ModelPickerActivity.java
+++ b/android/KMEA/app/src/main/java/com/keyman/engine/ModelPickerActivity.java
@@ -112,20 +112,9 @@ public final class ModelPickerActivity extends BaseActivity {
         aPreparedCloudApiParams.add(new CloudApiTypes.CloudApiParam(
           CloudApiTypes.ApiTarget.KeyboardLexicalModels, url).setType(CloudApiTypes.JSONType.Array));
 
-        Toast errorToast = Toast.makeText(context,
-          context.getString(R.string.update_check_unavailable),
-          Toast.LENGTH_SHORT);
-
-        try {
-          CloudDownloadMgr.getInstance().executeAsDownload(
-            context, _downloadid, null, _callback,
-            aPreparedCloudApiParams.toArray(new CloudApiTypes.CloudApiParam[0]));
-        } catch (DownloadManagerDisabledException e) {
-          errorToast.show();
-        } catch (Exception e) {
-          errorToast.show();
-          KMLog.LogException(TAG, "Unexpected exception occurred during download attempt", e);
-        }
+        CloudDownloadMgr.getInstance().executeAsDownload(
+          context, _downloadid, null, _callback,
+          aPreparedCloudApiParams.toArray(new CloudApiTypes.CloudApiParam[0]));
       } else {
         Toast.makeText(context,
           context.getString(R.string.cannot_connect),
diff --git a/android/KMEA/app/src/main/java/com/keyman/engine/cloud/CloudDownloadMgr.java b/android/KMEA/app/src/main/java/com/keyman/engine/cloud/CloudDownloadMgr.java
index edf067221e..adc84b9960 100644
--- a/android/KMEA/app/src/main/java/com/keyman/engine/cloud/CloudDownloadMgr.java
+++ b/android/KMEA/app/src/main/java/com/keyman/engine/cloud/CloudDownloadMgr.java
@@ -9,6 +9,7 @@ import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.os.Build;
 import android.util.Log;
+import android.widget.Toast;
 
 import com.keyman.engine.util.KMLog;
 import com.keyman.engine.util.DownloadFileUtils;
@@ -212,8 +213,26 @@ public class CloudDownloadMgr{
   public <ModelType,ResultType> void executeAsDownload(Context aContext, String aDownloadIdentifier,
                                 ModelType aTargetModel,
                                 ICloudDownloadCallback<ModelType,ResultType> aCallback,
-                                CloudApiTypes.CloudApiParam... params) throws DownloadManagerDisabledException
-  {
+                                CloudApiTypes.CloudApiParam... params) throws DownloadManagerDisabledException {
+    Toast errorToast = Toast.makeText(aContext,
+      // TODO:  reintroduce custom error message
+      aContext.getString(com.keyman.engine.R.string.update_check_unavailable),
+      Toast.LENGTH_SHORT);
+
+    try {
+      executeAsDownloadInternal(aContext, aDownloadIdentifier, aTargetModel, aCallback, params);
+    } catch (DownloadManagerDisabledException e) {
+      errorToast.show();
+    } catch (Exception e) {
+      errorToast.show();
+      KMLog.LogException(TAG, "Unexpected exception occurred during download/query attempt", e);
+    }
+  }
+
+  private <ModelType,ResultType> void executeAsDownloadInternal(Context aContext, String aDownloadIdentifier,
+                                ModelType aTargetModel,
+                                ICloudDownloadCallback<ModelType,ResultType> aCallback,
+                                CloudApiTypes.CloudApiParam... params) throws DownloadManagerDisabledException {
     if(!isInitialized) {
       Log.w(TAG, "DownloadManager not initialized. Initializing CloudDownloadMgr.");
       initialize(aContext);
diff --git a/android/KMEA/app/src/main/java/com/keyman/engine/cloud/impl/CloudLexicalModelMetaDataDownloadCallback.java b/android/KMEA/app/src/main/java/com/keyman/engine/cloud/impl/CloudLexicalModelMetaDataDownloadCallback.java
index d5cb08547b..daeaebf7b8 100644
--- a/android/KMEA/app/src/main/java/com/keyman/engine/cloud/impl/CloudLexicalModelMetaDataDownloadCallback.java
+++ b/android/KMEA/app/src/main/java/com/keyman/engine/cloud/impl/CloudLexicalModelMetaDataDownloadCallback.java
@@ -112,20 +112,9 @@ public class CloudLexicalModelMetaDataDownloadCallback implements ICloudDownload
 
           BaseActivity.makeToast(aContext, R.string.dictionary_download_start_in_background, Toast.LENGTH_SHORT);
 
-          Toast errorToast = Toast.makeText(aContext,
-            aContext.getString(R.string.update_check_unavailable),
-            Toast.LENGTH_SHORT);
-
-          try {
-            CloudDownloadMgr.getInstance().executeAsDownload(
-              aContext, _r.additionalDownloadid, null, _callback,
-              _r.additionalDownloads.toArray(new CloudApiTypes.CloudApiParam[0]));
-          } catch (DownloadManagerDisabledException e) {
-            errorToast.show();
-          } catch (Exception e) {
-            errorToast.show();
-            KMLog.LogException(TAG, "Unexpected exception occurred during download attempt", e);
-          }
+          CloudDownloadMgr.getInstance().executeAsDownload(
+            aContext, _r.additionalDownloadid, null, _callback,
+            _r.additionalDownloads.toArray(new CloudApiTypes.CloudApiParam[0]));
         }
       }
     }

From 0058edb3dd36146b5c6e6deb2bd547a0d74b8621 Mon Sep 17 00:00:00 2001
From: Joshua Horton <jahorton@sil.org>
Date: Fri, 14 Feb 2025 09:18:57 +0700
Subject: [PATCH 56/76] change(android): reintroduce specialized notification

---
 .../com/keyman/engine/cloud/CloudDownloadMgr.java  | 14 +++++++-------
 android/KMEA/app/src/main/res/values/strings.xml   |  3 +++
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/android/KMEA/app/src/main/java/com/keyman/engine/cloud/CloudDownloadMgr.java b/android/KMEA/app/src/main/java/com/keyman/engine/cloud/CloudDownloadMgr.java
index adc84b9960..07023d65a7 100644
--- a/android/KMEA/app/src/main/java/com/keyman/engine/cloud/CloudDownloadMgr.java
+++ b/android/KMEA/app/src/main/java/com/keyman/engine/cloud/CloudDownloadMgr.java
@@ -11,6 +11,7 @@ import android.os.Build;
 import android.util.Log;
 import android.widget.Toast;
 
+import com.keyman.engine.R;
 import com.keyman.engine.util.KMLog;
 import com.keyman.engine.util.DownloadFileUtils;
 
@@ -214,17 +215,16 @@ public class CloudDownloadMgr{
                                 ModelType aTargetModel,
                                 ICloudDownloadCallback<ModelType,ResultType> aCallback,
                                 CloudApiTypes.CloudApiParam... params) throws DownloadManagerDisabledException {
-    Toast errorToast = Toast.makeText(aContext,
-      // TODO:  reintroduce custom error message
-      aContext.getString(com.keyman.engine.R.string.update_check_unavailable),
-      Toast.LENGTH_SHORT);
-
     try {
       executeAsDownloadInternal(aContext, aDownloadIdentifier, aTargetModel, aCallback, params);
     } catch (DownloadManagerDisabledException e) {
-      errorToast.show();
+      Toast.makeText(aContext,
+        aContext.getString(R.string.update_check_download_manager_disabled),
+        Toast.LENGTH_SHORT).show();
     } catch (Exception e) {
-      errorToast.show();
+      Toast.makeText(aContext,
+        aContext.getString(R.string.update_check_unavailable),
+        Toast.LENGTH_SHORT).show();
       KMLog.LogException(TAG, "Unexpected exception occurred during download/query attempt", e);
     }
   }
diff --git a/android/KMEA/app/src/main/res/values/strings.xml b/android/KMEA/app/src/main/res/values/strings.xml
index 5c5d6f3173..e477f36574 100644
--- a/android/KMEA/app/src/main/res/values/strings.xml
+++ b/android/KMEA/app/src/main/res/values/strings.xml
@@ -184,6 +184,9 @@
     <!-- Context: General Updates -->
     <string name="update_check_unavailable" comment="Error message when a Keyman server can't be reached">Failed to access server!</string>
 
+    <!-- Context:  Update-check failure notification -->
+    <string name="update_check_download_manager_disabled" comment="Notification that a system service needed for updates is disabled">DownloadManager disabled - cannot check for updates</string>
+
     <!-- Context: General Updates -->
     <string name="update_check_current" comment="Notification that all resources are up to date">"All resources are up to date!"</string>
 

From 6404ccc5e9f53efc81718eb2ffcdc9f115a65578 Mon Sep 17 00:00:00 2001
From: Darcy Wong <darcy_wong@sil.org>
Date: Fri, 14 Feb 2025 09:43:28 +0700
Subject: [PATCH 57/76] chore(common): Update crowdin strings for Mon

---
 .../src/main/res/values-mnw-rMM/strings.xml   | 16 +++++-
 .../src/main/res/values-mnw-rMM/strings.xml   |  9 ++-
 .../mnw.lproj/Localizable.strings             | 18 ++++++
 .../desktop/kmshell/locale/mnw-MM/strings.xml | 55 ++++++++++++++++++-
 4 files changed, 90 insertions(+), 8 deletions(-)

diff --git a/android/KMAPro/kMAPro/src/main/res/values-mnw-rMM/strings.xml b/android/KMAPro/kMAPro/src/main/res/values-mnw-rMM/strings.xml
index 340a0024ee..bd230d5f4e 100644
--- a/android/KMAPro/kMAPro/src/main/res/values-mnw-rMM/strings.xml
+++ b/android/KMAPro/kMAPro/src/main/res/values-mnw-rMM/strings.xml
@@ -67,6 +67,8 @@
   <!-- Context: Keyman Settings menu -->
   <string name="adjust_keyboard_height" comment="Menu action to adjust keyboard height">ချိၚ်ဆသမၠုၚ်ကဳဗုဒ်ညိ</string>
   <!-- Context: Keyman Settings menu -->
+  <string name="adjust_longpress_delay" comment="Menu action to adjust longpress delay duration">ချိၚ်အခိၚ် ဍဵုလအ်အ်</string>
+  <!-- Context: Keyman Settings menu -->
   <string name="spacebar_caption" comment="Menu action to set the spacebar caption">က္တိုပ်လိက် Spacebar</string>
   <!-- Context: Keyman Settings menu / Spacebar caption -->
   <string name="spacebar_caption_keyboard" comment="Spacebar caption option - keyboard">ကဳဗုဒ်</string>
@@ -87,11 +89,11 @@
   <string name="spacebar_caption_hint_blank" comment="Spacebar caption hint - blank">လ္ပဓမံက်ထ္ၜးမလိက်ပ္ဍဲspacebarညိ</string>
   <!-- Context: Keyman Settings menu / Haptic feedback -->
   <string name="haptic_feedback" comment="haptic feedback on key press">ပ္ဍဲကာလမတက်လိက် ချဳဒတဝ်ညိ</string>
-  <!-- Context: Keyman Settings menu -->
+  <!-- Context: Keyman Settings menu. Removed in Keyman 18 -->
   <string name="show_banner" comment="text suggestions banner">ဓမံက်ထ္ၜးbannerလၟိုန်ညိ</string>
-  <!-- Context: Keyman Settings menu -->
+  <!-- Context: Keyman Settings menu. Removed in Keyman 18 -->
   <string name="show_banner_on" comment="Description when toggle is on">သွက်ဂွံဓမံက်ရုပ်ရဴ</string>
-  <!-- Context: Keyman Settings menu -->
+  <!-- Context: Keyman Settings menu. Removed in Keyman 18 -->
   <string name="show_banner_off" comment="Description when toggle is off">ကၟာတ်လဝ်မ္ဂး မလိက်ချိၚ်ဆလဝ်တံဂှ် ထ္ၜးအဃောပံက်လဝ်ဟေၚ်</string>
   <!-- Context: Keyman Settings menu -->
   <string name="show_send_crash_report" comment="permission for sending crash reports">ကဵုအခေါၚ် ပၠံၚ်လိက်စဳရေၚ်လ္တူ အေန်တာနက်ညိ</string>
@@ -123,6 +125,14 @@
   <string name="rotate_the_device" comment="Second line of adjusting keyboard height">ဂွံချိၚ် လံက်သတိက် လံက်ဇမၠိၚ်ဂှ် ဗဂေတ်ကဵုစက်ပိုဲညိ။</string>
   <!-- Context: Adjust Keyboard Height menu -->
   <string name="reset_to_defaults" comment="Button to reset to default heights">ကလေၚ်သ္ပနူပကတိ</string>
+  <!-- Context: Adjust Longpress Delay Time menu -->
+  <string name="longpress_delay_time" comment="Current longpress delay time (seconds)">အခိၚ်ဖအိၚ်: %1$.1f စက္က</string>
+  <!-- Context: Adjust Longpress Delay Time menu -->
+  <string name="ic_delay_time_up" comment="Make longpress delay longer">ဖအိၚ်အခိၚ်လအ်အ်</string>
+  <!-- Context: Adjust Longpress Delay Time menu -->
+  <string name="ic_delay_time_down" comment="Make longpress delay shorter">ဖအိၚ်အခိၚ်အောန်န်</string>
+  <!-- Context: Adjust Longpress Delay Time menu -->
+  <string name="ic_longpress_delay_slider" comment="Adjust longpress delay time">ဍဵုလအ်အ်သွက် မသရေတ််ဖအိၚ်အခိၚ်</string>
   <!-- Context: Keyman Web Browser -->
   <string name="hint_text" comment="Prompt to type in the browser search bar">ဂၠာဲ ဟွံသေၚ် တက် URL</string>
   <!-- Context: Keyman Web Browser -->
diff --git a/android/KMEA/app/src/main/res/values-mnw-rMM/strings.xml b/android/KMEA/app/src/main/res/values-mnw-rMM/strings.xml
index 8a7742cd81..1ba2e20cbe 100644
--- a/android/KMEA/app/src/main/res/values-mnw-rMM/strings.xml
+++ b/android/KMEA/app/src/main/res/values-mnw-rMM/strings.xml
@@ -131,10 +131,15 @@
     <string name="keyboard_install_toast" comment="Notification when a keyboard is installed">ကဳဗုဒ် %1$s စုတ်လဝ်တုဲ</string>
     <!-- Context: Language Settings Keyboard uninstall strings -->
     <string name="keyboard_deleted_toast" comment="Notification when a keyboard is deleted">ဇိုတ် ကဳဗုဒ်တုဲ</string>
-    <!-- Context: Language Settings menu strings -->
+    <!-- Context: Language Settings menu strings. Removed in Keyman 18 -->
     <string name="enable_corrections" comment="Enable corrections from the suggestion banner">ပံက် ပလေဝ်ဒါန်</string>
-    <!-- Context: Language Settings menu strings -->
+    <!-- Context: Language Settings menu strings. Removed in Keyman 18 -->
     <string name="enable_predictions" comment="Enable predictions from the suggestion banner">ပံက် တၚ်ချိၚ်ခယျဂမၠိုၚ်</string>
+    <!-- Context: Language Settings menu strings - radio buttons -->
+    <string name="suggestions_radio_0" comment="Predictions and corrections disabled">Disable suggestions</string>
+    <string name="suggestions_radio_1" comment="Suggestions Enabled: Predictions with no corrections">တၚ်ချိၚ်ခယျဂမၠိုၚ်ဟေၚ်</string>
+    <string name="suggestions_radio_2" comment="Suggestions Enabled: Predictions with corrections">တၚ်ချၚ်ခယျ ကေုာံ တၚ်ပလေဝ်ဂမၠိုၚ်</string>
+    <string name="suggestions_radio_3" comment="Suggestions Enabled: Predictions with auto-corrections">တၚ်ချိၚ်ခယျနကဵု တၚ်ပလေဝ်အဝ်တဵု</string>
     <!-- Context: Language Settings menu strings -->
     <string name="model_label">အဘိဓာန်</string>
     <plurals name="model_count">
diff --git a/ios/engine/KMEI/KeymanEngine/mnw.lproj/Localizable.strings b/ios/engine/KMEI/KeymanEngine/mnw.lproj/Localizable.strings
index 4a6595036b..a3af4bb5b7 100644
--- a/ios/engine/KMEI/KeymanEngine/mnw.lproj/Localizable.strings
+++ b/ios/engine/KMEI/KeymanEngine/mnw.lproj/Localizable.strings
@@ -226,6 +226,24 @@
 /* Text showing name of spacebar caption - language + keyboard */
 "menu-settings-spacebar-item-languageKeyboard" = "ဘာသာ ကေုာံ ကဳဗုဒ်";
 
+/* Label for the "Adjust Keyboard Height" item on the main settings screen */
+"menu-settings-adjust-keyboard-height" = "ချိၚ်ဆသမၠုၚ်ကဳဗုဒ်ညိ";
+
+/* Title for the "Adjust Keyboard Height" settings child screen */
+"adjust-keyboard-height-title" = "ချိၚ်ကဳဗုဒ်";
+
+/* Label for "Reset to Default Keyboard Height" button on the adjust height screen */
+"button-label-reset-default-keyboard-height" = "ကလေၚ်ကေတ် သမၠုၚ်ကဳဗုဒ် ပကတိ";
+
+/* Instruction text to drag keyboard to resize */
+"keyboard-drag-instructions" = "သ္ဂောံချိၚ်သမၠုၚ်ကဳဗုဒ်ဂှ် ဓဇက်မလဴဂှ်ညိ";
+
+/* Instruction to rotate to adjust landscape keyboard height (displayed when device is portrait) */
+"portrait-keyboard-rotate-instructions" = "ကလေၚ်ကေတ်ဗီုပြၚ်ပကတိ";
+
+/* Instruction to rotate to adjust portrait keyboard height (displayed when device is landscape) */
+"landscape-keyboard-rotate-instructions" = "သ္ဂောံစွံလ္ပါ်ပဇူဂှ် ဗဂေတ်ကဵုစက်ညိ";
+
 /* Short text for notification:  download failure for keyboard */
 "notification-download-failure-keyboard" = "ဂြဲဖျေံကဳဗုဒ်ဟွံအံၚ်ဇၞး";
 
diff --git a/windows/src/desktop/kmshell/locale/mnw-MM/strings.xml b/windows/src/desktop/kmshell/locale/mnw-MM/strings.xml
index 24e47fedc1..eb9809e3a8 100644
--- a/windows/src/desktop/kmshell/locale/mnw-MM/strings.xml
+++ b/windows/src/desktop/kmshell/locale/mnw-MM/strings.xml
@@ -295,6 +295,10 @@
   <string name="koAltGrCtrlAlt" comment="General options - Ctrl+Alt simulates AltGr on computers without AltGr">ပချဳ AltGr နကဵု Ctrl+Alt</string>
   <!-- Context: Configuration Dialog - Options tab -->
   <!-- String Type: FormatString -->
+  <!-- Introduced: 18.0.95 -->
+  <string name="koRightModifierHK" comment="General options - Right Ctrl Alt and Shift trigger hotkey">ကဵုအခေါၚ်ကု မဝ်ဒဳဝှာၚ်ယျာ လ္ပါ်ပုၚ် သွက် မဍဵုတၟေၚ်</string>
+  <!-- Context: Configuration Dialog - Options tab -->
+  <!-- String Type: FormatString -->
   <!-- Introduced: 9.0.480.0 -->
   <string name="koDeadkeyConversion" comment="Advanced options - Base keyboard deadkeys are treated as normal keys">စွံ မဍဵုချိုတ်တ် နကဵု မဍဵု အလောတ်</string>
   <!-- Context: Configuration Dialog - Options tab -->
@@ -323,6 +327,10 @@
   <string name="koShowWelcome" comment="Startup options - show/hide welcome screen">ထ္ၜးမုက်လိက် ဒုၚ်တၠုၚ်</string>
   <!-- Context: Configuration Dialog - Options tab -->
   <!-- String Type: FormatString -->
+  <!-- Modified: 18.0.96.0 -->
+  <string name="koCheckForUpdates" comment="Automatically check for updates and download">Automatically check for updates and download</string>
+  <!-- Context: Configuration Dialog - Options tab -->
+  <!-- String Type: FormatString -->
   <!-- Introduced: 7.0.236.0 -->
   <string name="koTestKeymanFunctioning" comment="Startup options - test for conflicting apps when Product starts">စၟဳစၟတ် အပလဳကေယှေန် ပဠပထုဲမာန် အဃောစ ကဳမာန်</string>
   <!-- Context: Configuration Dialog - Options tab -->
@@ -416,6 +424,14 @@
   <string name="S_Support_Copyright" comment="Support - Product Copyright">တၠမူ © SIL International. အခေါၚ်အဝဵုနွံပေၚ်ၚ်။</string>
   <!-- Context: Configuration Dialog - Support tab -->
   <!-- String Type: PlainText -->
+  <!-- Introduced: 18.0.94.0 -->
+  <string name="S_Support_CreatedBySILGlobal" comment="Created by {SIL Global} ">ညးကၠောန်ဗဒှ်%1$s</string>
+  <!-- Context: Configuration Dialog - Support tab -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 18.0.94.0 -->
+  <string name="S_Support_CopyrightSILGlobal" comment="Copyright © {SIL Global}. All Rights Reserved.">တၠမူ © %1$s။ အခေါၚ်အရာဖအိုတ်ဂှ် ညးပိုၚ်ရောၚ်။</string>
+  <!-- Context: Configuration Dialog - Support tab -->
+  <!-- String Type: PlainText -->
   <!-- Introduced: 7.0.230.0 -->
   <string name="S_Support_Version" comment="Support - version">ပါယှေန်</string>
   <!-- Context: Configuration Dialog - Support tab -->
@@ -442,6 +458,22 @@
   <!-- String Type: PlainText -->
   <!-- Introduced: 7.0.230.0 -->
   <string name="S_Menu_Diagnostics_Diagnostics" comment="Support button submenu - performs a diagnostic report">ဂၠိုၚ်ဂၠါဲပြဿနာ</string>
+  <!-- Context: Configuration Dialog - Update tab -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 18.0.168 -->
+  <string name="S_No_Updates_Available" comment="Update tab - no updates are available">တၚ်သမၠုၚ်က္ဆံၚ်ဟွံမွဲဏီ။</string>
+  <!-- Context: Configuration Dialog - Update tab -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 18.0.168 -->
+  <string name="S_Updates_Available" comment="Update tab - informs user updates are available ">သမၠုၚ်ပ္တိုန်တံဂှ် ယဝ်ကၟာတ်ပံက်ထောံ မုက်လိက်တုဲမ္ဂး ဒှ်ဒတန်ရ။</string>
+  <!-- Context: Configuration Dialog - Update tab pop up -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 18.0.168 -->
+  <string name="S_Update_Restart_Req" comment="Update tab pop up - warns user restart will require restart ">သမၠုၚ်ပ္တိုန်လၟုဟ်မ္ဂး ဒးကၟာတ်ပံက်စက်ဏောၚ်။ </string>
+  <!-- Context: Configuration Dialog - Update on boot pop up -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 18.0.168 -->
+  <string name="S_Ready_To_Install" comment="Update on boot pop up - inform user update about to install">တၚ်သမၠုၚ်က္ဆံၚ်သွက်ကဳမာန် စုတ်မာန်ရ။</string>
   <!-- Context: Download Keyboard Dialog -->
   <!-- String Type: PlainText -->
   <!-- Introduced: 7.0.230.0 -->
@@ -533,6 +565,10 @@
   <string name="SKHotkeyConflicts_Interface" comment="Hotkey dialog - warning of hotkey conflict with hotkey for another interface hotkey">မဍဵုတၟေၚ် %1$s ဒှ်ပြဿနာကု မဍဵုတၟေၚ်တၞဟ်ဟ်ရ။ ယဝ်ဆက်အာမ္ဂး မဍဵုတၟေၚ်တၞဟ်ဟ်ဂှ် သ္အးထောံရောၚ်။ ဆက်အာဟာ\?</string>
   <!-- Context: Online Update Dialog -->
   <!-- String Type: PlainText -->
+  <!-- Introduced: 18.0.230.0 -->
+  <string name="S_Update" comment="Update tab name">တၚ်သမၠုၚ်ပ္တိုန်</string>
+  <!-- Context: Online Update Dialog -->
+  <!-- String Type: PlainText -->
   <!-- Introduced: 7.0.230.0 -->
   <string name="S_Update_Title" comment="Update dialog title, where Keyman = product name">ကပေါတ်တၟိသွက်ကဳမာန်တံကလိဂွံမာန်ယျ</string>
   <!-- Context: Online Update Dialog -->
@@ -602,16 +638,27 @@
   <!-- String Type: FormatString -->
   <!-- Introduced: 8.0.288.0 -->
   <string name="SKUpdate_IconMenuExit" comment="Update icon - exit menu item">ဗ&amp;ဒေါံ စၟဳစၟတ်သမၠုၚ်က္ဆံၚ်အောန်လာၚ်</string>
+  <!-- Context: Update Dialog -->
+  <!-- String Type: FormatString -->
+  <!-- Introduced: 17.0233.0 -->
+  <string name="S_Button_Update_ApplyNow" comment="Apply update now button - update dialog">ပ္တိုန်တၚ်သမၠုၚ်စက်လၟုဟ်</string>
+  <!-- Context: Update Dialog -->
+  <!-- String Type: FormatString -->
+  <!-- Introduced: 17.0233.0 -->
+  <string name="S_Button_Update_CheckNow" comment="Check for updates now button - update dialog">စၟဳစၟတ်သွက် တၚ်သမၠုၚ်ပ္တိုန်တၟိတၟိ</string>
   <!-- Context: Splash Dialog -->
   <!-- String Type: PlainText -->
   <!-- Introduced: 8.0.288.0 -->
-  <string name="S_Splash_Name" comment="Splash major title">ကဳမာန်</string>
   <!-- Context: Splash Dialog -->
   <!-- String Type: PlainText -->
   <!-- Introduced: 8.0.294.0 -->
   <string name="S_Splash_Start" comment="Start Keyman button">စ ကဳမာန်</string>
   <!-- Context: Splash Dialog -->
   <!-- String Type: PlainText -->
+  <!-- Introduced: 18.0 -->
+  <string name="S_Splash_Start_2" comment="Start {Keyman} button">စ %1$s</string>
+  <!-- Context: Splash Dialog -->
+  <!-- String Type: PlainText -->
   <!-- Introduced: 8.0.294.0 -->
   <string name="S_Splash_Exit" comment="Exit button">တိတ်</string>
   <!-- Context: Splash Dialog -->
@@ -653,7 +700,6 @@
   <!-- Context: Formatted Messages -->
   <!-- String Type: FormatString -->
   <!-- Introduced: 7.0.230.0 -->
-  <string name="SKShortApplicationTitle" comment="Product name">ကဳမာအ်</string>
   <!-- Context: Hints -->
   <!-- String Type: PlainText -->
   <!-- Introduced: 7.0.244.0 -->
@@ -777,7 +823,6 @@
   <!-- Context: Formatted Messages -->
   <!-- String Type: FormatString -->
   <!-- Introduced: 7.0.230.0 -->
-  <string name="SKApplicationTitle" comment="Product name used for the title of message boxes and message dialogs">ကဳမာန်</string>
   <!-- Parameters: %1$s = Version number string -->
   <!-- Context: Formatted Messages -->
   <!-- Introduced: 7.0.230.0 -->
@@ -900,6 +945,10 @@
   <!-- String Type: FormatString -->
   <!-- Introduced: 8.0.294.0 -->
   <string name="S_OSK_FontHelper_ChooseKeyboard" comment="OSK Font helper choose keyboard">သ္ဂောံဆဵု မလိက်ကောန်ဍောၚ် မဆေၚ်စပ်တံဂှ် ရုဲကဵု ကဳဗုဒ် ကဳမာန်တံညိ။</string>
+  <!-- Context: OSK Font Helper -->
+  <!-- String Type: FormatString -->
+  <!-- Introduced: 17.0.312.0 -->
+  <string name="S_OSK_FontHelper_NoFonts" comment="OSK Font helper no fonts found for keyboard">မလိက်ဝှတ် မကဵုဖျုန်ကဵု သွက်ကဳဗုက် %1$s ဟွံဆဵုရ.</string>
   <!-- Context: Text Editor -->
   <!-- String Type: FormatString -->
   <!-- Introduced: 10.0.836.0 -->

From c25a23887795ec590cdd20ec5f73d8d971ea8d3d Mon Sep 17 00:00:00 2001
From: Darcy Wong <darcy_wong@sil.org>
Date: Fri, 14 Feb 2025 09:50:37 +0700
Subject: [PATCH 58/76] chore(ios): Update crowdin strings for Czech

---
 .../KeymanEngine/cs.lproj/Localizable.strings  | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/ios/engine/KMEI/KeymanEngine/cs.lproj/Localizable.strings b/ios/engine/KMEI/KeymanEngine/cs.lproj/Localizable.strings
index 0653ed3aeb..7cb2bf6809 100644
--- a/ios/engine/KMEI/KeymanEngine/cs.lproj/Localizable.strings
+++ b/ios/engine/KMEI/KeymanEngine/cs.lproj/Localizable.strings
@@ -226,6 +226,24 @@
 /* Text showing name of spacebar caption - language + keyboard */
 "menu-settings-spacebar-item-languageKeyboard" = "Jazyk a klávesnice";
 
+/* Label for the "Adjust Keyboard Height" item on the main settings screen */
+"menu-settings-adjust-keyboard-height" = "Upravit výšku klávesnice";
+
+/* Title for the "Adjust Keyboard Height" settings child screen */
+"adjust-keyboard-height-title" = "Upravit klávesnici";
+
+/* Label for "Reset to Default Keyboard Height" button on the adjust height screen */
+"button-label-reset-default-keyboard-height" = "Obnovit výchozí výšku klávesnice";
+
+/* Instruction text to drag keyboard to resize */
+"keyboard-drag-instructions" = "Tažením šipky nastavíte výšku klávesnice.";
+
+/* Instruction to rotate to adjust landscape keyboard height (displayed when device is portrait) */
+"portrait-keyboard-rotate-instructions" = "Otočte zařízení pro nastavení na šířku.";
+
+/* Instruction to rotate to adjust portrait keyboard height (displayed when device is landscape) */
+"landscape-keyboard-rotate-instructions" = "Otočte zařízení pro nastavení na výšku.";
+
 /* Short text for notification:  download failure for keyboard */
 "notification-download-failure-keyboard" = "Stahování klávesnice se nezdařilo";
 

From 0490c34236d40bbe64a90a0fd454fd340cc5f13f Mon Sep 17 00:00:00 2001
From: Darcy Wong <darcy_wong@sil.org>
Date: Fri, 14 Feb 2025 09:50:52 +0700
Subject: [PATCH 59/76] chore(windows): Update crowdin strings for Czech

---
 .../desktop/kmshell/locale/cs-CZ/strings.xml  | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/windows/src/desktop/kmshell/locale/cs-CZ/strings.xml b/windows/src/desktop/kmshell/locale/cs-CZ/strings.xml
index e1967680c1..04fbdb92dc 100644
--- a/windows/src/desktop/kmshell/locale/cs-CZ/strings.xml
+++ b/windows/src/desktop/kmshell/locale/cs-CZ/strings.xml
@@ -327,6 +327,10 @@
   <string name="koShowWelcome" comment="Startup options - show/hide welcome screen">Zobrazit úvodní obrazovku</string>
   <!-- Context: Configuration Dialog - Options tab -->
   <!-- String Type: FormatString -->
+  <!-- Modified: 18.0.96.0 -->
+  <string name="koCheckForUpdates" comment="Automatically check for updates and download">Automatically check for updates and download</string>
+  <!-- Context: Configuration Dialog - Options tab -->
+  <!-- String Type: FormatString -->
   <!-- Introduced: 7.0.236.0 -->
   <string name="koTestKeymanFunctioning" comment="Startup options - test for conflicting apps when Product starts">Test pro protichůdné aplikace při spuštění klíče</string>
   <!-- Context: Configuration Dialog - Options tab -->
@@ -454,6 +458,22 @@
   <!-- String Type: PlainText -->
   <!-- Introduced: 7.0.230.0 -->
   <string name="S_Menu_Diagnostics_Diagnostics" comment="Support button submenu - performs a diagnostic report">Diagnostika</string>
+  <!-- Context: Configuration Dialog - Update tab -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 18.0.168 -->
+  <string name="S_No_Updates_Available" comment="Update tab - no updates are available">Žádné dostupné aktualizace.</string>
+  <!-- Context: Configuration Dialog - Update tab -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 18.0.168 -->
+  <string name="S_Updates_Available" comment="Update tab - informs user updates are available ">K dispozici jsou aktualizace, které budou aplikovány při příštím restartu Windows.</string>
+  <!-- Context: Configuration Dialog - Update tab pop up -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 18.0.168 -->
+  <string name="S_Update_Restart_Req" comment="Update tab pop up - warns user restart will require restart ">Aktualizace nyní vyžaduje restart počítače.</string>
+  <!-- Context: Configuration Dialog - Update on boot pop up -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 18.0.168 -->
+  <string name="S_Ready_To_Install" comment="Update on boot pop up - inform user update about to install">Aktualizace Keyman je připravena k instalaci.</string>
   <!-- Context: Download Keyboard Dialog -->
   <!-- String Type: PlainText -->
   <!-- Introduced: 7.0.230.0 -->
@@ -546,6 +566,10 @@ klávesnici, kterou používáte v systému Windows. Klávesnice se automaticky
   <string name="SKHotkeyConflicts_Interface" comment="Hotkey dialog - warning of hotkey conflict with hotkey for another interface hotkey">Klávesa %1$s je v konfliktu s jiným klávesovým zkratkou. Pokud budete pokračovat, ostatní klávesová zkratka bude vymazána. Pokračovat?</string>
   <!-- Context: Online Update Dialog -->
   <!-- String Type: PlainText -->
+  <!-- Introduced: 18.0.230.0 -->
+  <string name="S_Update" comment="Update tab name">Aktualizovat</string>
+  <!-- Context: Online Update Dialog -->
+  <!-- String Type: PlainText -->
   <!-- Introduced: 7.0.230.0 -->
   <string name="S_Update_Title" comment="Update dialog title, where Keyman = product name">K dispozici jsou aktualizované komponenty klíče</string>
   <!-- Context: Online Update Dialog -->
@@ -615,6 +639,14 @@ klávesnici, kterou používáte v systému Windows. Klávesnice se automaticky
   <!-- String Type: FormatString -->
   <!-- Introduced: 8.0.288.0 -->
   <string name="SKUpdate_IconMenuExit" comment="Update icon - exit menu item">E&amp;xit online update check</string>
+  <!-- Context: Update Dialog -->
+  <!-- String Type: FormatString -->
+  <!-- Introduced: 17.0233.0 -->
+  <string name="S_Button_Update_ApplyNow" comment="Apply update now button - update dialog">Aplikovat aktualizaci nyní</string>
+  <!-- Context: Update Dialog -->
+  <!-- String Type: FormatString -->
+  <!-- Introduced: 17.0233.0 -->
+  <string name="S_Button_Update_CheckNow" comment="Check for updates now button - update dialog">Zkontrolovat aktualizace</string>
   <!-- Context: Splash Dialog -->
   <!-- String Type: PlainText -->
   <!-- Introduced: 8.0.288.0 -->

From 051e6c7b1b65c3eadcbca6291c0dbaabfed7ae1e Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Thu, 13 Feb 2025 12:00:44 +0100
Subject: [PATCH 60/76] feat(linux): add `--remote-debug` flag to
 `run-tests.sh` script

This allows to run the tests in a VM and debug them remotely.

Co-authored-by: Darcy Wong <darcy_wong@sil.org>
---
 docs/settings/linux/launch.json              |  2 +-
 linux/ibus-keyman/tests/README.md            | 23 ++++++++++++++++++++
 linux/ibus-keyman/tests/scripts/run-tests.sh |  8 ++++++-
 3 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/docs/settings/linux/launch.json b/docs/settings/linux/launch.json
index fec5afe0ad..d61153c2c6 100644
--- a/docs/settings/linux/launch.json
+++ b/docs/settings/linux/launch.json
@@ -40,7 +40,7 @@
       "valuesFormatting": "parseText"
     },
     {
-      // start: gdbserver 10.3.0.58:2345 /media/sf_Develop/keyman/keyman/linux/build/x86_64/debug/tests/ibus-keyman-tests
+      // start: linux/ibus-keyman/tests/scripts/run-tests.sh --remote-debug --no-surrounding-text --no-wayland -- k_001___basic_input_unicodei
       // then attach debugger in vscode
       "type": "gdb",
       "request": "attach",
diff --git a/linux/ibus-keyman/tests/README.md b/linux/ibus-keyman/tests/README.md
index a97f85d443..8882bcae00 100644
--- a/linux/ibus-keyman/tests/README.md
+++ b/linux/ibus-keyman/tests/README.md
@@ -24,3 +24,26 @@ To run a single test you pass the testname (as found in
 ```bash
 scripts/run-tests.sh -- k_000___null_keyboard k_005___nul_with_initial_context
 ```
+
+## Debugging tests
+
+This is most easily done by running the tests in a VM and then remote debugging
+into the VM. The VM should be the same Linux version as the host, and the
+Keyman repo should be shared with the VM through a shared folder.
+
+Then you can start the `run-tests.sh` script on the VM with the
+`--remote-debug` option. This will start the background services and then
+start a GDB session waiting for the debugger to connect.
+
+For example:
+
+```bash
+linux/ibus-keyman/tests/scripts/run-tests.sh --remote-debug \
+  --no-surrounding-text --no-wayland -- k_001___basic_input_unicodei
+```
+
+On the host, you can then attach to the VM. See the
+`Attach to gdbserver (ibus-keyman integration tests)` configuration
+in `docs/settings/linux/launch.json` for a sample configuration in
+vscode. You'll have to adjust the IP address to match the VM which the
+`run-tests.sh` script will output.
diff --git a/linux/ibus-keyman/tests/scripts/run-tests.sh b/linux/ibus-keyman/tests/scripts/run-tests.sh
index 4b28327259..abb3fe1da3 100755
--- a/linux/ibus-keyman/tests/scripts/run-tests.sh
+++ b/linux/ibus-keyman/tests/scripts/run-tests.sh
@@ -36,6 +36,7 @@ function help() {
   echo "  --help, -h, -?          Display this help"
   echo "  --verbose, -v           Run tests verbosely"
   echo "  --debug                 debug test logging output"
+  echo "  --remote-debug          start gdbserver after setup but prior to running the tests"
   echo "  -k                      passed to GLib testing framework"
   echo "  --tap                   output in TAP format. Passed to GLib testing framework"
   echo "  --surrounding-text      run tests with surrounding texts enabled"
@@ -86,10 +87,14 @@ function run_tests() {
   source "$ENV_FILE"
   echo "DBUS_SESSION_BUS_ADDRESS=$DBUS_SESSION_BUS_ADDRESS"
 
+  if [[ -n ${REMOTE_DEBUG:-} ]]; then
+    echo "===> Now attach debugger to ${REMOTE_HOST}"
+  fi
+
   # Note: -k and --tap are consumed by the GLib testing framework
   #shellcheck disable=SC2068 # we want to split array elements!
   #shellcheck disable=SC2086
-  "${G_TEST_BUILDDIR:-../../build/$(arch)/${CONFIG}/tests}/ibus-keyman-tests" ${ARG_K-} ${ARG_TAP-} \
+  ${REMOTE_DEBUG:-} "${G_TEST_BUILDDIR:-../../build/$(arch)/${CONFIG}/tests}/ibus-keyman-tests" ${ARG_K-} ${ARG_TAP-} \
     ${ARG_VERBOSE-} ${ARG_DEBUG-} ${ARG_SURROUNDING_TEXT-} ${ARG_NO_SURROUNDING_TEXT-} \
     --directory "$TESTDIR" "${DISPLAY_SERVER}" ${TESTFILES[@]}
   echo "# Finished tests."
@@ -111,6 +116,7 @@ while (( $# )); do
     --no-x11) USE_X11=0;;
     --verbose|-v) ARG_VERBOSE=--verbose;;
     --debug) ARG_DEBUG=--debug-log;;
+    --remote-debug) REMOTE_HOST="$(ip route get 8.8.8.8 | sed -E 's/.*src (\S+) .*/\1/;t;d'):2345" && REMOTE_DEBUG="gdbserver ${REMOTE_HOST}";;
     --) shift && break ;;
     *) echo "Error: Unexpected argument \"$1\". Exiting." ; exit 4 ;;
   esac

From af99c1d66883624c6e1055bb7bb764601af4d186 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Thu, 13 Feb 2025 12:00:44 +0100
Subject: [PATCH 61/76] chore(linux): improve the output if dependencies are
 missing

---
 linux/ibus-keyman/src/test/run-tests.sh            | 1 +
 linux/ibus-keyman/tests/scripts/run-single-test.sh | 1 +
 linux/ibus-keyman/tests/scripts/run-tests.sh       | 1 +
 linux/ibus-keyman/tests/scripts/test-helper.inc.sh | 2 +-
 4 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/linux/ibus-keyman/src/test/run-tests.sh b/linux/ibus-keyman/src/test/run-tests.sh
index ae005fcbd6..8161797360 100755
--- a/linux/ibus-keyman/src/test/run-tests.sh
+++ b/linux/ibus-keyman/src/test/run-tests.sh
@@ -15,6 +15,7 @@ fi
 
 if ! which Xvfb > /dev/null || ! which Xephyr > /dev/null || ! which metacity > /dev/null; then
   echo "# Please install Xvfb, Xephyr and metacity before running these tests!"
+  echo "# sudo apt install xvfb xserver-xephyr metacity"
   exit 1
 fi
 
diff --git a/linux/ibus-keyman/tests/scripts/run-single-test.sh b/linux/ibus-keyman/tests/scripts/run-single-test.sh
index f2b2d37aff..b3fc978af1 100755
--- a/linux/ibus-keyman/tests/scripts/run-single-test.sh
+++ b/linux/ibus-keyman/tests/scripts/run-single-test.sh
@@ -16,6 +16,7 @@ fi
 
 if ! which Xvfb > /dev/null || ! which Xephyr > /dev/null || ! which metacity > /dev/null || ! which mutter > /dev/null; then
   echo "Please install Xvfb, Xephyr, metacity and mutter before running these tests!"
+  echo "sudo apt install xvfb xserver-xephyr metacity mutter"
   exit 1
 fi
 
diff --git a/linux/ibus-keyman/tests/scripts/run-tests.sh b/linux/ibus-keyman/tests/scripts/run-tests.sh
index abb3fe1da3..1f26b39a41 100755
--- a/linux/ibus-keyman/tests/scripts/run-tests.sh
+++ b/linux/ibus-keyman/tests/scripts/run-tests.sh
@@ -25,6 +25,7 @@ fi
 
 if ! which Xvfb > /dev/null || ! which Xephyr > /dev/null || ! which metacity > /dev/null || ! which mutter > /dev/null; then
   echo "Please install Xvfb, Xephyr, metacity and mutter before running these tests!"
+  echo "sudo apt install xvfb xserver-xephyr metacity mutter"
   exit 1
 fi
 
diff --git a/linux/ibus-keyman/tests/scripts/test-helper.inc.sh b/linux/ibus-keyman/tests/scripts/test-helper.inc.sh
index 3287acd05c..3a633b3297 100755
--- a/linux/ibus-keyman/tests/scripts/test-helper.inc.sh
+++ b/linux/ibus-keyman/tests/scripts/test-helper.inc.sh
@@ -256,7 +256,7 @@ function _setup_ibus() {
     echo "if kill -9 ${PID}; then ibus restart || ibus start; fi # ibus-daemon" >> "${CLEANUP_FILE}"
   else
     # test run as part of the build
-    echo "kill -9 ${PID} || true" >> "${CLEANUP_FILE}"
+    echo "kill -9 ${PID} || true # ibus-daemon" >> "${CLEANUP_FILE}"
   fi
   echo "${PID} ibus-daemon" >> "${PID_FILE}"
   sleep 1s

From 937f799d2340154497827cbd8a5e5107b9640dbb Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Thu, 13 Feb 2025 18:09:20 +0100
Subject: [PATCH 62/76] chore(linux): update message when running tests

---
 linux/ibus-keyman/tests/scripts/run-single-test.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/linux/ibus-keyman/tests/scripts/run-single-test.sh b/linux/ibus-keyman/tests/scripts/run-single-test.sh
index b3fc978af1..39075421fc 100755
--- a/linux/ibus-keyman/tests/scripts/run-single-test.sh
+++ b/linux/ibus-keyman/tests/scripts/run-single-test.sh
@@ -44,7 +44,7 @@ function help() {
 function run_tests() {
   # Output these lines to stderr - the first line on stdout has to be the TAP version number
   # which running ${TESTFILE} outputs
-  echo "# NOTE: When the tests fail check /tmp/ibus-engine-keyman.log and /tmp/ibus-daemon.log!" >&2
+  echo "# NOTE: When the tests fail check /tmp/ibus-engine-keyman.log, /tmp/ibus-daemon.log and /tmp/km-test-server.log!" >&2
   echo "" >&2
 
   echo "# Starting tests..." >&2

From 84df966c38d957d3b0ca9f3be0ce538be3dee55a Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Tue, 21 Jan 2025 15:49:48 +0100
Subject: [PATCH 63/76] refactor(linux): cleanup code of test fixture

---
 linux/ibus-keyman/tests/testfixture.cpp | 32 +++++++++----------------
 1 file changed, 11 insertions(+), 21 deletions(-)

diff --git a/linux/ibus-keyman/tests/testfixture.cpp b/linux/ibus-keyman/tests/testfixture.cpp
index dab206731d..fb9ac15f5c 100644
--- a/linux/ibus-keyman/tests/testfixture.cpp
+++ b/linux/ibus-keyman/tests/testfixture.cpp
@@ -88,16 +88,6 @@ ibus_keyman_tests_fixture_tear_down(IBusKeymanTestsFixture *fixture, gconstpoint
   delete data;
 }
 
-static void
-set_caps_lock_state(IBusKeymanTestsFixture *fixture, bool caps_lock_on) {
-  set_capslock_indicator((guint32)caps_lock_on);
-}
-
-static bool
-get_caps_lock_state(IBusKeymanTestsFixture *fixture) {
-  return get_capslock_indicator();
-}
-
 static void
 switch_keyboard(IBusKeymanTestsFixture *fixture, const gchar *keyboard) {
   ibus_bus_set_global_engine(fixture->bus, keyboard);
@@ -185,9 +175,9 @@ is_modifier(guint16 keycode) {
 }
 
 static std::list<gdk_key_event>
-get_involved_keys(IBusKeymanTestsFixture *fixture, km::tests::key_event test_event) {
+get_involved_keys(km::tests::key_event test_event) {
   guint modifiers = 0;
-  if (get_caps_lock_state(fixture)) {
+  if (get_capslock_indicator()) {
     modifiers = IBUS_LOCK_MASK;
   }
 
@@ -250,13 +240,13 @@ get_context_keys(std::u16string context) {
 }
 
 static void
-press_keys(IBusKeymanTestsFixture *fixture, km::tests::KmxTestSource & test_source,km::tests::key_event key_event) {
-  auto involved_keys = get_involved_keys(fixture, key_event);
+press_keys(IBusKeymanTestsFixture *fixture, km::tests::key_event key_event) {
+  auto involved_keys = get_involved_keys(key_event);
 
   // press and hold the individual modifier keys, finally the actual key
   std::stack<GdkEventKey> keys_to_release;
   for (auto key = involved_keys.begin(); key != involved_keys.end(); key++) {
-    bool old_caps_lock = get_caps_lock_state(fixture);
+    bool old_caps_lock  = get_capslock_indicator();
     guint lock_modifier = 0;
 
     // KEY_CAPSLOCK behaves a bit strange:
@@ -267,7 +257,7 @@ press_keys(IBusKeymanTestsFixture *fixture, km::tests::KmxTestSource & test_sour
     // - the LOCK_MASK modifier is set on both keypress and release
     // - capslock gets turned off on release
     if (key->keycode == KEY_CAPSLOCK && !old_caps_lock) {
-      set_caps_lock_state(fixture, true);
+      set_capslock_indicator((guint32)true);
       lock_modifier = IBUS_LOCK_MASK;
     }
     GdkEventKey keyEvent = {
@@ -289,7 +279,7 @@ press_keys(IBusKeymanTestsFixture *fixture, km::tests::KmxTestSource & test_sour
     keys_to_release.push(keyEvent);
 
     if (key->keycode == KEY_CAPSLOCK && old_caps_lock) {
-      set_caps_lock_state(fixture, false);
+      set_capslock_indicator((guint32) false);
     }
   }
 
@@ -326,19 +316,19 @@ static void test_source(IBusKeymanTestsFixture *fixture, gconstpointer user_data
   g_settings_sync();
 
   switch_keyboard(fixture, kmxfile.c_str());
-  if (test_source.caps_lock_state() != get_caps_lock_state(fixture)) {
-    set_caps_lock_state(fixture, test_source.caps_lock_state());
+  if (test_source.caps_lock_state() != get_capslock_indicator()) {
+    set_capslock_indicator((guint32)test_source.caps_lock_state());
   }
 
   auto contextKeys = get_context_keys(context);
   for (auto k = contextKeys.begin(); k != contextKeys.end(); k++) {
-    press_keys(fixture, test_source, *k);
+    press_keys(fixture, *k);
   }
 
   gtk_im_context_focus_in(fixture->context);
 
   for (auto p = test_source.next_key(keys); p.vk != 0; p = test_source.next_key(keys)) {
-    press_keys(fixture, test_source, p);
+    press_keys(fixture, p);
   }
 
   if (expected.length() == 0) {

From b8c61b35d78f04d307ec1061a74007e8a347a863 Mon Sep 17 00:00:00 2001
From: Keyman Build Agent <buildagent@keyman.com>
Date: Fri, 14 Feb 2025 13:03:48 -0500
Subject: [PATCH 64/76] auto: increment beta version to 18.0.194

---
 HISTORY.md | 13 +++++++++++++
 VERSION.md |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/HISTORY.md b/HISTORY.md
index 1721f9af0a..9f20c01108 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,5 +1,18 @@
 # Keyman Version History
 
+## 18.0.193 beta 2025-02-14
+
+* chore(developer): add INFO messages for `kmc copy` and `kmc generate` (#13200)
+* fix(android): Remove sendOptionsToKeyboard function from Engine API (#13219)
+* docs(android): Document removing sendOptionsToKeyboard API (#13220)
+* chore(ios): increase minimum ios version to 15 (#13201)
+* fix(android): Catch WebView exceptions and prompt user to install WebView (#13140)
+* chore(common): Update crowdin strings for Mon (#13241)
+* chore(ios,windows): Update Crowdin strings for Czech (#13242)
+* change(web): drop 'dom' unit test concurrency when run in CI mode (#13141)
+* chore(web): ensure /web/build.sh clean triggers all predictive-text child actions (#13158)
+* chore(web): fix coverage-reporting artifact (#13196)
+
 ## 18.0.192 beta 2025-02-14
 
 * chore(common): Fix 17.0.335 tier in HISTORY.md (#13213)
diff --git a/VERSION.md b/VERSION.md
index d8c84f1b9f..94543bc7b5 100644
--- a/VERSION.md
+++ b/VERSION.md
@@ -1 +1 @@
-18.0.193
\ No newline at end of file
+18.0.194
\ No newline at end of file

From 81a47ddb1493c4d6b31edf5102d47c2f0340303a Mon Sep 17 00:00:00 2001
From: Darcy Wong <darcy_wong@sil.org>
Date: Mon, 17 Feb 2025 07:05:37 +0700
Subject: [PATCH 65/76] fix(android): Use TIER.md to determine Play Store tier

---
 android/KMAPro/kMAPro/build.gradle       | 5 +++--
 oem/firstvoices/android/app/build.gradle | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/android/KMAPro/kMAPro/build.gradle b/android/KMAPro/kMAPro/build.gradle
index 11ec4efd2d..06c9e41051 100644
--- a/android/KMAPro/kMAPro/build.gradle
+++ b/android/KMAPro/kMAPro/build.gradle
@@ -67,6 +67,7 @@ android {
     productFlavors {
     }
 
+    String tier = new File('../../TIER.md').getText('UTF-8').trim();
     applicationVariants.all { variant ->
         // Append tag to app name to help differentiate versions for app testers:
         //  - stable builds have no suffix
@@ -75,7 +76,7 @@ android {
         //  - PR builds also have "-test-1234" suffix (where 1234 is PR#)
         // Gradle sync will nullify these values, so have a fallback
         String appSuffix = ''
-        String tag = VERSION_TAG ? VERSION_TAG : '-' + new File('../../TIER.md').getText('UTF-8');
+        String tag = VERSION_TAG ? VERSION_TAG : '-' + tier;
         if (tag.startsWithAny("-beta", "beta")) {
             appSuffix = ' Beta';
         } else if (tag.startsWithAny("-alpha", "alpha")) {
@@ -127,7 +128,7 @@ if (env_keys_json_file != null && file(env_keys_json_file).exists()) {
 
         // Deactivate lower conflicting version APKs
         resolutionStrategy.set(com.github.triplet.gradle.androidpublisher.ResolutionStrategy.IGNORE)
-        switch (System.env.TIER) {
+        switch (tier) {
             case 'beta':
                 track.set("beta")
                 println "TIER set to beta"
diff --git a/oem/firstvoices/android/app/build.gradle b/oem/firstvoices/android/app/build.gradle
index fa5dc5a127..301880e965 100644
--- a/oem/firstvoices/android/app/build.gradle
+++ b/oem/firstvoices/android/app/build.gradle
@@ -54,6 +54,7 @@ android {
     productFlavors {
     }
 
+    String tier = new File('../../../TIER.md').getText('UTF-8').trim();
     applicationVariants.all { variant ->
         // Adjust output name to "firstvoices-${VERSION_MD}.apk"
         variant.outputs.all {
@@ -95,7 +96,7 @@ if (env_keys_json_file != null && file(env_keys_json_file).exists()) {
 
         // Deactivate lower conflicting version APKs
         resolutionStrategy.set(com.github.triplet.gradle.androidpublisher.ResolutionStrategy.IGNORE)
-        switch (System.env.TIER) {
+        switch (tier) {
             case 'beta':
                 track.set("beta")
                 println "TIER set to beta"

From 51d9aead774283c4db92c85020dadf82db3a2621 Mon Sep 17 00:00:00 2001
From: Darcy Wong <darcy_wong@sil.org>
Date: Mon, 17 Feb 2025 07:18:52 +0700
Subject: [PATCH 66/76] fix(android): Fix gradle syntax

---
 android/KMAPro/kMAPro/build.gradle       | 2 +-
 oem/firstvoices/android/app/build.gradle | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/android/KMAPro/kMAPro/build.gradle b/android/KMAPro/kMAPro/build.gradle
index 06c9e41051..94a29347b7 100644
--- a/android/KMAPro/kMAPro/build.gradle
+++ b/android/KMAPro/kMAPro/build.gradle
@@ -128,7 +128,7 @@ if (env_keys_json_file != null && file(env_keys_json_file).exists()) {
 
         // Deactivate lower conflicting version APKs
         resolutionStrategy.set(com.github.triplet.gradle.androidpublisher.ResolutionStrategy.IGNORE)
-        switch (tier) {
+        switch (String.valueOf(tier)) {
             case 'beta':
                 track.set("beta")
                 println "TIER set to beta"
diff --git a/oem/firstvoices/android/app/build.gradle b/oem/firstvoices/android/app/build.gradle
index 301880e965..dfe37e3c59 100644
--- a/oem/firstvoices/android/app/build.gradle
+++ b/oem/firstvoices/android/app/build.gradle
@@ -96,7 +96,7 @@ if (env_keys_json_file != null && file(env_keys_json_file).exists()) {
 
         // Deactivate lower conflicting version APKs
         resolutionStrategy.set(com.github.triplet.gradle.androidpublisher.ResolutionStrategy.IGNORE)
-        switch (tier) {
+        switch (String.valueOf(tier)) {
             case 'beta':
                 track.set("beta")
                 println "TIER set to beta"

From 81e84b6147f7a672db0bfc249b9bd7ca14aed270 Mon Sep 17 00:00:00 2001
From: Joshua Horton <jahorton@sil.org>
Date: Mon, 17 Feb 2025 09:28:17 +0700
Subject: [PATCH 67/76] chore(android): remove unused imports

---
 .../kMAPro/src/main/java/com/keyman/android/SystemKeyboard.java  | 1 -
 .../src/main/java/com/tavultesoft/kmapro/MainActivity.java       | 1 -
 .../java/com/keyman/engine/KMKeyboardDownloaderActivity.java     | 1 -
 .../app/src/main/java/com/keyman/engine/ModelPickerActivity.java | 1 -
 .../cloud/impl/CloudLexicalModelMetaDataDownloadCallback.java    | 1 -
 5 files changed, 5 deletions(-)

diff --git a/android/KMAPro/kMAPro/src/main/java/com/keyman/android/SystemKeyboard.java b/android/KMAPro/kMAPro/src/main/java/com/keyman/android/SystemKeyboard.java
index 690f36d9ed..7528f9589d 100644
--- a/android/KMAPro/kMAPro/src/main/java/com/keyman/android/SystemKeyboard.java
+++ b/android/KMAPro/kMAPro/src/main/java/com/keyman/android/SystemKeyboard.java
@@ -4,7 +4,6 @@
 
 package com.keyman.android;
 
-import com.keyman.engine.cloud.DownloadManagerDisabledException;
 import com.keyman.engine.util.DownloadFileUtils;
 import com.keyman.engine.util.KMLog;
 import com.tavultesoft.kmapro.AdjustLongpressDelayActivity;
diff --git a/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/MainActivity.java b/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/MainActivity.java
index 68db37f57e..9f938a722f 100644
--- a/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/MainActivity.java
+++ b/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/MainActivity.java
@@ -32,7 +32,6 @@ import com.keyman.engine.KeyboardEventHandler.OnKeyboardDownloadEventListener;
 import com.keyman.engine.KeyboardEventHandler.OnKeyboardEventListener;
 import com.keyman.engine.cloud.CloudApiTypes;
 import com.keyman.engine.cloud.CloudDownloadMgr;
-import com.keyman.engine.cloud.DownloadManagerDisabledException;
 import com.keyman.engine.cloud.impl.CloudLexicalModelMetaDataDownloadCallback;
 import com.keyman.engine.data.CloudRepository;
 import com.keyman.engine.data.Dataset;
diff --git a/android/KMEA/app/src/main/java/com/keyman/engine/KMKeyboardDownloaderActivity.java b/android/KMEA/app/src/main/java/com/keyman/engine/KMKeyboardDownloaderActivity.java
index ac875eec0f..66d81457dd 100644
--- a/android/KMEA/app/src/main/java/com/keyman/engine/KMKeyboardDownloaderActivity.java
+++ b/android/KMEA/app/src/main/java/com/keyman/engine/KMKeyboardDownloaderActivity.java
@@ -10,7 +10,6 @@ import androidx.appcompat.app.AppCompatActivity;
 import com.keyman.engine.cloud.CloudApiTypes;
 import com.keyman.engine.cloud.CloudDataJsonUtil;
 import com.keyman.engine.cloud.CloudDownloadMgr;
-import com.keyman.engine.cloud.DownloadManagerDisabledException;
 import com.keyman.engine.cloud.impl.CloudKeyboardPackageDownloadCallback;
 import com.keyman.engine.data.Keyboard;
 import com.keyman.engine.data.KeyboardController;
diff --git a/android/KMEA/app/src/main/java/com/keyman/engine/ModelPickerActivity.java b/android/KMEA/app/src/main/java/com/keyman/engine/ModelPickerActivity.java
index 3c1a21f6d9..9e8c4088cb 100644
--- a/android/KMEA/app/src/main/java/com/keyman/engine/ModelPickerActivity.java
+++ b/android/KMEA/app/src/main/java/com/keyman/engine/ModelPickerActivity.java
@@ -22,7 +22,6 @@ import androidx.appcompat.widget.Toolbar;
 
 import com.keyman.engine.cloud.CloudApiTypes;
 import com.keyman.engine.cloud.CloudDownloadMgr;
-import com.keyman.engine.cloud.DownloadManagerDisabledException;
 import com.keyman.engine.cloud.impl.CloudLexicalModelMetaDataDownloadCallback;
 import com.keyman.engine.data.CloudRepository;
 import com.keyman.engine.data.Dataset;
diff --git a/android/KMEA/app/src/main/java/com/keyman/engine/cloud/impl/CloudLexicalModelMetaDataDownloadCallback.java b/android/KMEA/app/src/main/java/com/keyman/engine/cloud/impl/CloudLexicalModelMetaDataDownloadCallback.java
index daeaebf7b8..62f65a96ed 100644
--- a/android/KMEA/app/src/main/java/com/keyman/engine/cloud/impl/CloudLexicalModelMetaDataDownloadCallback.java
+++ b/android/KMEA/app/src/main/java/com/keyman/engine/cloud/impl/CloudLexicalModelMetaDataDownloadCallback.java
@@ -12,7 +12,6 @@ import com.keyman.engine.R;
 import com.keyman.engine.cloud.CloudApiTypes;
 import com.keyman.engine.cloud.CloudDataJsonUtil;
 import com.keyman.engine.cloud.CloudDownloadMgr;
-import com.keyman.engine.cloud.DownloadManagerDisabledException;
 import com.keyman.engine.cloud.ICloudDownloadCallback;
 import com.keyman.engine.util.KMLog;
 

From c2434c45aa326c548b9906a9661538b29320e92f Mon Sep 17 00:00:00 2001
From: Joshua Horton <jahorton@sil.org>
Date: Mon, 17 Feb 2025 09:42:00 +0700
Subject: [PATCH 68/76] change(android): drop no-op line, unneeded exception
 handler

---
 .../com/keyman/engine/cloud/CloudDownloadMgr.java    |  7 +++----
 .../java/com/keyman/engine/data/CloudRepository.java | 12 +++---------
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/android/KMEA/app/src/main/java/com/keyman/engine/cloud/CloudDownloadMgr.java b/android/KMEA/app/src/main/java/com/keyman/engine/cloud/CloudDownloadMgr.java
index 07023d65a7..4d78041d99 100644
--- a/android/KMEA/app/src/main/java/com/keyman/engine/cloud/CloudDownloadMgr.java
+++ b/android/KMEA/app/src/main/java/com/keyman/engine/cloud/CloudDownloadMgr.java
@@ -242,10 +242,9 @@ public class CloudDownloadMgr{
 
     DownloadManager downloadManager = DownloadFileUtils.getDownloadManager(aContext);
     if(downloadManager == null) {
-      aCallback.initializeContext(aContext);
-
-      // Signal the failure state; we literally can't do this right now!
-      // Fortunately, that does mean there's no need to signal via callback.
+      // The callback object provided to us provides no way to directly signal a
+      // failure.  That said, we can also immediately detect that we WILL fail and
+      // corresponding error _now_, rather than later.
       //
       // Unique custom error so it's easy to explicitly filter.
       throw new DownloadManagerDisabledException();
diff --git a/android/KMEA/app/src/main/java/com/keyman/engine/data/CloudRepository.java b/android/KMEA/app/src/main/java/com/keyman/engine/data/CloudRepository.java
index 8e1a8bdf35..f9cee7b5c0 100644
--- a/android/KMEA/app/src/main/java/com/keyman/engine/data/CloudRepository.java
+++ b/android/KMEA/app/src/main/java/com/keyman/engine/data/CloudRepository.java
@@ -411,15 +411,9 @@ public class CloudRepository {
         BaseActivity.makeToast(context, R.string.catalog_download_is_running_in_background, Toast.LENGTH_SHORT);
       } else {
         updateIsRunning = true;
-        try {
-          CloudDownloadMgr.getInstance().executeAsDownload(
-            context, DOWNLOAD_IDENTIFIER_CATALOGUE, memCachedDataset, _download_callback, params);
-        } catch (DownloadManagerDisabledException e) {
-          onFailure.run();
-        } catch (Exception e) {
-          KMLog.LogException(TAG, "Unexpected exception type occurred when trying to query the server", e);
-          onFailure.run();
-        }
+        CloudDownloadMgr.getInstance().executeAsDownload(
+          context, DOWNLOAD_IDENTIFIER_CATALOGUE, memCachedDataset, _download_callback, params);
+        // if it fails, we should `updateIsRunning = false`, right?
       }
     }
   }

From 1c2c845b4cb721cd96ce8a05f2e90c6e5713c292 Mon Sep 17 00:00:00 2001
From: Joshua Horton <jahorton@sil.org>
Date: Mon, 17 Feb 2025 09:43:30 +0700
Subject: [PATCH 69/76] chore(android): drop unreferenced KMLog import

---
 .../java/com/keyman/engine/KMKeyboardDownloaderActivity.java   | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/android/KMEA/app/src/main/java/com/keyman/engine/KMKeyboardDownloaderActivity.java b/android/KMEA/app/src/main/java/com/keyman/engine/KMKeyboardDownloaderActivity.java
index 66d81457dd..7bca1e00fc 100644
--- a/android/KMEA/app/src/main/java/com/keyman/engine/KMKeyboardDownloaderActivity.java
+++ b/android/KMEA/app/src/main/java/com/keyman/engine/KMKeyboardDownloaderActivity.java
@@ -13,8 +13,7 @@ import com.keyman.engine.cloud.CloudDownloadMgr;
 import com.keyman.engine.cloud.impl.CloudKeyboardPackageDownloadCallback;
 import com.keyman.engine.data.Keyboard;
 import com.keyman.engine.data.KeyboardController;
-import com.keyman.engine.cloud.impl.CloudLexicalPackageDownloadCallback;
-import com.keyman.engine.util.KMLog;
+import com.keyman.engine.cloud.impl.CloudLexicalPackageDownloadCallback;=
 
 import java.util.ArrayList;
 import java.util.HashMap;

From 2437ff5cc26beace5ba6fab8629138779a2a721f Mon Sep 17 00:00:00 2001
From: Joshua Horton <jahorton@sil.org>
Date: Mon, 17 Feb 2025 09:45:05 +0700
Subject: [PATCH 70/76] chore(android): and another, plus removal of accidental
 typo

---
 .../kMAPro/src/main/java/com/keyman/android/SystemKeyboard.java | 1 -
 .../java/com/keyman/engine/KMKeyboardDownloaderActivity.java    | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/android/KMAPro/kMAPro/src/main/java/com/keyman/android/SystemKeyboard.java b/android/KMAPro/kMAPro/src/main/java/com/keyman/android/SystemKeyboard.java
index 7528f9589d..d5a4aea69f 100644
--- a/android/KMAPro/kMAPro/src/main/java/com/keyman/android/SystemKeyboard.java
+++ b/android/KMAPro/kMAPro/src/main/java/com/keyman/android/SystemKeyboard.java
@@ -5,7 +5,6 @@
 package com.keyman.android;
 
 import com.keyman.engine.util.DownloadFileUtils;
-import com.keyman.engine.util.KMLog;
 import com.tavultesoft.kmapro.AdjustLongpressDelayActivity;
 import com.tavultesoft.kmapro.BuildConfig;
 import com.tavultesoft.kmapro.DefaultLanguageResource;
diff --git a/android/KMEA/app/src/main/java/com/keyman/engine/KMKeyboardDownloaderActivity.java b/android/KMEA/app/src/main/java/com/keyman/engine/KMKeyboardDownloaderActivity.java
index 7bca1e00fc..3f96c18289 100644
--- a/android/KMEA/app/src/main/java/com/keyman/engine/KMKeyboardDownloaderActivity.java
+++ b/android/KMEA/app/src/main/java/com/keyman/engine/KMKeyboardDownloaderActivity.java
@@ -13,7 +13,7 @@ import com.keyman.engine.cloud.CloudDownloadMgr;
 import com.keyman.engine.cloud.impl.CloudKeyboardPackageDownloadCallback;
 import com.keyman.engine.data.Keyboard;
 import com.keyman.engine.data.KeyboardController;
-import com.keyman.engine.cloud.impl.CloudLexicalPackageDownloadCallback;=
+import com.keyman.engine.cloud.impl.CloudLexicalPackageDownloadCallback;
 
 import java.util.ArrayList;
 import java.util.HashMap;

From 252a31ada2480cd24b339715978bfbd025633373 Mon Sep 17 00:00:00 2001
From: Joshua Horton <jahorton@sil.org>
Date: Mon, 17 Feb 2025 09:47:28 +0700
Subject: [PATCH 71/76] chore(android): removing each KMLog one at a time,
 apparently

---
 .../app/src/main/java/com/keyman/engine/ModelPickerActivity.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/android/KMEA/app/src/main/java/com/keyman/engine/ModelPickerActivity.java b/android/KMEA/app/src/main/java/com/keyman/engine/ModelPickerActivity.java
index 9e8c4088cb..4595aae1e7 100644
--- a/android/KMEA/app/src/main/java/com/keyman/engine/ModelPickerActivity.java
+++ b/android/KMEA/app/src/main/java/com/keyman/engine/ModelPickerActivity.java
@@ -28,7 +28,6 @@ import com.keyman.engine.data.Dataset;
 import com.keyman.engine.data.LexicalModel;
 import com.keyman.engine.data.adapters.NestedAdapter;
 import com.keyman.engine.util.BCP47;
-import com.keyman.engine.util.KMLog;
 import com.keyman.engine.util.MapCompat;
 
 import java.io.File;

From cdafdd70a3e820036186b2a6888fe1d5dfde3ace Mon Sep 17 00:00:00 2001
From: Joshua Horton <jahorton@sil.org>
Date: Mon, 17 Feb 2025 10:26:18 +0700
Subject: [PATCH 72/76] change(android): adds boolean return to
 executeAsDownload

---
 .../java/com/keyman/engine/cloud/CloudDownloadMgr.java   | 9 +++++++--
 .../java/com/keyman/engine/data/CloudRepository.java     | 8 ++++++--
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/android/KMEA/app/src/main/java/com/keyman/engine/cloud/CloudDownloadMgr.java b/android/KMEA/app/src/main/java/com/keyman/engine/cloud/CloudDownloadMgr.java
index 4d78041d99..bb8ee190b6 100644
--- a/android/KMEA/app/src/main/java/com/keyman/engine/cloud/CloudDownloadMgr.java
+++ b/android/KMEA/app/src/main/java/com/keyman/engine/cloud/CloudDownloadMgr.java
@@ -210,23 +210,28 @@ public class CloudDownloadMgr{
    * @param params the cloud api params for download
    * @param <ModelType> the target models type
    * @param <ResultType> the cloud requests result type
+   * @return `false` if the download request cannot be executed; `true` otherwise.
    */
-  public <ModelType,ResultType> void executeAsDownload(Context aContext, String aDownloadIdentifier,
+  public <ModelType,ResultType> boolean executeAsDownload(Context aContext, String aDownloadIdentifier,
                                 ModelType aTargetModel,
                                 ICloudDownloadCallback<ModelType,ResultType> aCallback,
-                                CloudApiTypes.CloudApiParam... params) throws DownloadManagerDisabledException {
+                                CloudApiTypes.CloudApiParam... params) {
     try {
       executeAsDownloadInternal(aContext, aDownloadIdentifier, aTargetModel, aCallback, params);
     } catch (DownloadManagerDisabledException e) {
       Toast.makeText(aContext,
         aContext.getString(R.string.update_check_download_manager_disabled),
         Toast.LENGTH_SHORT).show();
+      return false;
     } catch (Exception e) {
       Toast.makeText(aContext,
         aContext.getString(R.string.update_check_unavailable),
         Toast.LENGTH_SHORT).show();
       KMLog.LogException(TAG, "Unexpected exception occurred during download/query attempt", e);
+      return false;
     }
+
+    return true;
   }
 
   private <ModelType,ResultType> void executeAsDownloadInternal(Context aContext, String aDownloadIdentifier,
diff --git a/android/KMEA/app/src/main/java/com/keyman/engine/data/CloudRepository.java b/android/KMEA/app/src/main/java/com/keyman/engine/data/CloudRepository.java
index f9cee7b5c0..4676d59c77 100644
--- a/android/KMEA/app/src/main/java/com/keyman/engine/data/CloudRepository.java
+++ b/android/KMEA/app/src/main/java/com/keyman/engine/data/CloudRepository.java
@@ -411,9 +411,13 @@ public class CloudRepository {
         BaseActivity.makeToast(context, R.string.catalog_download_is_running_in_background, Toast.LENGTH_SHORT);
       } else {
         updateIsRunning = true;
-        CloudDownloadMgr.getInstance().executeAsDownload(
+        boolean executionStarted = CloudDownloadMgr.getInstance().executeAsDownload(
           context, DOWNLOAD_IDENTIFIER_CATALOGUE, memCachedDataset, _download_callback, params);
-        // if it fails, we should `updateIsRunning = false`, right?
+        if(!executionStarted) {
+          // Since we couldn't initiate the execution's async components,
+          // we need to immediately clear the update-running flag.
+          updateIsRunning = false;
+        }
       }
     }
   }

From 2ff1947538bb8b4cf83f7c50b339304730bc7b9d Mon Sep 17 00:00:00 2001
From: Keyman Build Agent <buildagent@keyman.com>
Date: Mon, 17 Feb 2025 13:03:00 -0500
Subject: [PATCH 73/76] auto: increment beta version to 18.0.195

---
 HISTORY.md | 8 ++++++++
 VERSION.md | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/HISTORY.md b/HISTORY.md
index 9f20c01108..40ea47c70a 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,5 +1,13 @@
 # Keyman Version History
 
+## 18.0.194 beta 2025-02-17
+
+* fix(android): Use TIER.md to determine Play Store tier (#13259)
+* fix(android): prevent update-checks from crashing system keyboard and app if `DownloadManager` is disabled (#13218)
+* feat(linux): add `--remote-debug` flag to `run-tests.sh` script (#13233)
+* chore(linux): improve output when running tests (#13247)
+* refactor(linux): cleanup code of test fixture (#13248)
+
 ## 18.0.193 beta 2025-02-14
 
 * chore(developer): add INFO messages for `kmc copy` and `kmc generate` (#13200)
diff --git a/VERSION.md b/VERSION.md
index 94543bc7b5..ef8be26f80 100644
--- a/VERSION.md
+++ b/VERSION.md
@@ -1 +1 @@
-18.0.194
\ No newline at end of file
+18.0.195
\ No newline at end of file

From cbf3bd545494798622f8815f6675d99dfe361dbb Mon Sep 17 00:00:00 2001
From: rc-swag <58423624+rc-swag@users.noreply.github.com>
Date: Mon, 17 Feb 2025 13:40:51 +1000
Subject: [PATCH 74/76] fix(windows): remove sentry report on firstrun in idle
 state

Remove the error message reporting to sentry if the firstrun
event is recieved in the idle state.

Fixes: #13217
---
 .../kmshell/main/Keyman.System.UpdateStateMachine.pas    | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/windows/src/desktop/kmshell/main/Keyman.System.UpdateStateMachine.pas b/windows/src/desktop/kmshell/main/Keyman.System.UpdateStateMachine.pas
index afce261cfa..a6cf9bd2e5 100644
--- a/windows/src/desktop/kmshell/main/Keyman.System.UpdateStateMachine.pas
+++ b/windows/src/desktop/kmshell/main/Keyman.System.UpdateStateMachine.pas
@@ -159,6 +159,7 @@ type
     procedure HandleDownload; override;
     procedure HandleAbort; override;
     procedure HandleInstallNow; override;
+    procedure HandleFirstRun; override;
   end;
 
   UpdateAvailableState = class(TState)
@@ -669,6 +670,14 @@ begin
   // Do Nothing
 end;
 
+procedure IdleState.HandleFirstRun;
+begin
+  // This would be the case if it was a clean first time install of Keyman
+  // and not an update. However, incase it was some sort of failed update
+  // clean any cached files.
+  bucStateContext.RemoveCachedFiles;
+end;
+
 { UpdateAvailableState }
 
 procedure UpdateAvailableState.StartDownloadProcess;

From 8421409c254b10b03b1c82be4fb15a3634dc6e10 Mon Sep 17 00:00:00 2001
From: Joshua Horton <jahorton@sil.org>
Date: Tue, 18 Feb 2025 11:33:47 +0700
Subject: [PATCH 75/76] docs(web): adjusts manual-control example to use
 promise-chaining

Fixes: #13267
---
 .../engine/guide/examples/__manual-control.html   | 13 ++++---------
 web/docs/engine/guide/examples/manual-control.md  | 15 +++++++--------
 2 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/web/docs/engine/guide/examples/__manual-control.html b/web/docs/engine/guide/examples/__manual-control.html
index 9ccc74824c..4680400e4d 100644
--- a/web/docs/engine/guide/examples/__manual-control.html
+++ b/web/docs/engine/guide/examples/__manual-control.html
@@ -6,21 +6,16 @@
   <script type='text/javascript' src='js/laokeys_load.js'></script>
 
   <script type="text/javascript">
-
-    var KWControl = null;
-
     function SetupDocument()
     {
-      keyman.init();
-      KWControl = document.getElementById('KWControl');
-      keyman.setActiveKeyboard('laokeys');
-      keyman.osk.hide();
+      keyman.init().then(function() {
+        keyman.setActiveKeyboard('laokeys');
+        keyman.osk.hide();
+      });
     }
 
     function KWControlClick()
     {
-      var KWControl = document.getElementById('KWControl');
-
       if(keyman.osk.isEnabled()) {
         keyman.osk.hide();
       } else {
diff --git a/web/docs/engine/guide/examples/manual-control.md b/web/docs/engine/guide/examples/manual-control.md
index 2f0f57021a..1087c518c8 100644
--- a/web/docs/engine/guide/examples/manual-control.md
+++ b/web/docs/engine/guide/examples/manual-control.md
@@ -14,13 +14,12 @@ Include the following script in the HEAD of your page:
   function SetupDocument()
   {
     /* Make sure that Keyman is initialized (we can't guarantee initialization order) */
-    keyman.init();
-
-    KWControl = document.getElementById('KWControl');
-    /* Prevents automatic display of the onscreen keyboard. (default automatic) */
-    keyman.osk.hide();
-    /* Select the LaoKeys keyboard */
-    keyman.setActiveKeyboard('laokeys');
+    keyman.init().then(function () {
+      /* Prevents automatic display of the onscreen keyboard. (default automatic) */
+      keyman.osk.hide();
+      /* Select the LaoKeys keyboard */
+      keyman.setActiveKeyboard('laokeys');
+    });
   }
 
   /* KWControlClick: Called when user clicks on the KWControl IMG */
@@ -56,7 +55,7 @@ And finally, include the control img for KeymanWeb:
 
 ```html
 <!-- Display the KeymanWeb icon for the user to click on -->
-<img style="border: solid 1px black; padding: 2px 2px 3px 2px" src='kmicon.png' alt='KeymanWeb' onclick='KWControlClick()' id='KWControl' />
+<img style="border: solid 1px black; padding: 2px 2px 3px 2px" src='kmicon.png' alt='KeymanWeb' onclick='KWControlClick()' />
 ```
 
 ## API References

From 0d3aa0a43cf3ae1a716b652ae6e9a4094ecbb675 Mon Sep 17 00:00:00 2001
From: Keyman Build Agent <buildagent@keyman.com>
Date: Tue, 18 Feb 2025 13:02:26 -0500
Subject: [PATCH 76/76] auto: increment beta version to 18.0.196

---
 HISTORY.md | 4 ++++
 VERSION.md | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/HISTORY.md b/HISTORY.md
index 40ea47c70a..538bb5da2e 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,5 +1,9 @@
 # Keyman Version History
 
+## 18.0.195 beta 2025-02-18
+
+* docs(web): use promise-chaining in manual-control example (#13272)
+
 ## 18.0.194 beta 2025-02-17
 
 * fix(android): Use TIER.md to determine Play Store tier (#13259)
diff --git a/VERSION.md b/VERSION.md
index ef8be26f80..6a43aea978 100644
--- a/VERSION.md
+++ b/VERSION.md
@@ -1 +1 @@
-18.0.195
\ No newline at end of file
+18.0.196
\ No newline at end of file