From 1dc785b20318911425f4437a4fcb494151122311 Mon Sep 17 00:00:00 2001
From: Joshua Horton <joshua_horton@sil.org>
Date: Tue, 18 Aug 2026 14:35:40 -0500
Subject: [PATCH] fix(android): fix deep links for keyman.com-based downloads

Build-bot: skip release:android
---
 .../kMAPro/src/main/AndroidManifest.xml       | 46 +++++++++++++++----
 .../java/com/keyman/engine/util/KMPLink.java  |  2 +-
 2 files changed, 39 insertions(+), 9 deletions(-)

diff --git a/android/KMAPro/kMAPro/src/main/AndroidManifest.xml b/android/KMAPro/kMAPro/src/main/AndroidManifest.xml
index ed23e920d96..2ee5cfbe5ac 100644
--- a/android/KMAPro/kMAPro/src/main/AndroidManifest.xml
+++ b/android/KMAPro/kMAPro/src/main/AndroidManifest.xml
@@ -209,16 +209,46 @@
         <category android:name="android.intent.category.DEFAULT" />
         <category android:name="android.intent.category.BROWSABLE" />
 
-        <data
-          android:host="keyman-staging.com"
-          android:scheme="http"
-          android:pathPrefix="/keyboards/install" />
+        <!-- Our servers' initial folder represents a language code. -->
+        <data android:host="keyman-staging.com" />
+        <data android:scheme="http" />
+        <!-- Matches 2-letter language folders specifically. -->
+        <data android:pathPattern="/.._*/keyboards/install/.*" />
+        <!-- Matches 2-letter language folders specifically. -->
+        <data android:pathPattern="/..._*/keyboards/install/.*" />
+        <!-- Matches 4-letter language folders specifically. -->
+        <data android:pathPattern="/...._*/keyboards/install/.*" />
+        <!-- Matches 5-letter language folders specifically. -->
+        <data android:pathPattern="/....._*/keyboards/install/.*" />
+        <!-- Matches 6-letter language folders specifically. -->
+        <data android:pathPattern="/......_*/keyboards/install/.*" />
+        <!-- Matches 7-letter language folders specifically. -->
+        <data android:pathPattern="/......._*/keyboards/install/.*" />
+      </intent-filter>
 
-        <data
-          android:host="keyman.com"
-          android:scheme="https"
-          android:pathPrefix="/keyboards/install" />
+      <intent-filter android:priority="50" android:autoVerify="true">
+        <!-- KMAPro should also be able to handle /keyboards/install links and convert to /go/package/download -->
+        <action android:name="android.intent.action.VIEW" />
+
+        <category android:name="android.intent.category.DEFAULT" />
+        <category android:name="android.intent.category.BROWSABLE" />
 
+        <!-- Our servers' initial folder represents a language code. -->
+        <data android:host="keyman.com" />
+        <data android:scheme="https" />
+        <!-- Must rely on the .._* pattern when targetSdk < 31 -->
+        <!-- Matches 2-letter language folders specifically. -->
+        <data android:pathPattern="/.._*/keyboards/install/.*" />
+        <!-- Matches 3-letter language folders specifically. -->
+        <data android:pathPattern="/..._*/keyboards/install/.*" />
+        <!-- Matches 4-letter language folders specifically. -->
+        <data android:pathPattern="/...._*/keyboards/install/.*" />
+        <!-- Matches 5-letter language folders specifically. -->
+        <data android:pathPattern="/....._*/keyboards/install/.*" />
+        <!-- Matches 6-letter language folders specifically. -->
+        <data android:pathPattern="/......_*/keyboards/install/.*" />
+        <!-- Matches 7-letter language folders specifically. -->
+        <data android:pathPattern="/......._*/keyboards/install/.*" />
       </intent-filter>
 
     </activity>
diff --git a/android/KMEA/app/src/main/java/com/keyman/engine/util/KMPLink.java b/android/KMEA/app/src/main/java/com/keyman/engine/util/KMPLink.java
index c26b64776d9..586ff171f3b 100644
--- a/android/KMEA/app/src/main/java/com/keyman/engine/util/KMPLink.java
+++ b/android/KMEA/app/src/main/java/com/keyman/engine/util/KMPLink.java
@@ -23,7 +23,7 @@ public final class KMPLink {
   public static final String KMP_PRODUCTION_HOST = "keyman.com";
   public static final String KMP_STAGING_HOST =  "keyman.com"; // #7227 disabling: "keyman-staging.com";
 
-  private static final String KMP_INSTALL_KEYBOARDS_PATTERN_FORMATSTR = "^http(s)?://(%s|%s)/keyboards/install/([^\\?/]+)(\\?(.+))?$";
+  private static final String KMP_INSTALL_KEYBOARDS_PATTERN_FORMATSTR = "^http(s)?://(%s|%s)/[^/]*/keyboards/install/([^\\?/]+)(\\?(.+))?$";
   private static final String installPatternFormatStr = KMString.format(KMP_INSTALL_KEYBOARDS_PATTERN_FORMATSTR,
     KMP_PRODUCTION_HOST,
     KMP_STAGING_HOST);