From 8817d240e2c8e6cb7b0a4ab76100964b1fd976ff Mon Sep 17 00:00:00 2001
From: Darcy Wong <darcy_wong@sil.org>
Date: Mon, 5 Feb 2024 08:31:49 +0700
Subject: [PATCH] fix(android/app): Cleanup AndroidManifest handling of *.kmp

---
 .../kMAPro/src/main/AndroidManifest.xml       | 35 ++++---------------
 1 file changed, 7 insertions(+), 28 deletions(-)

diff --git a/android/KMAPro/kMAPro/src/main/AndroidManifest.xml b/android/KMAPro/kMAPro/src/main/AndroidManifest.xml
index 7a90ccc957..41cda823b8 100644
--- a/android/KMAPro/kMAPro/src/main/AndroidManifest.xml
+++ b/android/KMAPro/kMAPro/src/main/AndroidManifest.xml
@@ -103,6 +103,9 @@
         <data
           android:mimeType="application/octet-stream"
           android:scheme="content" />
+        <data
+          android:mimeType="application/x-keyman-package"
+          android:scheme="content" />
       </intent-filter>
 
       <!--
@@ -121,19 +124,7 @@
 
         <data android:scheme="file" />
         <data android:host="*" />
-
-        <!--
-                     Work around Android's ugly primitive PatternMatcher
-                     implementation that can't cope with finding a . early in
-                     the path unless it's explicitly matched.
-                -->
-        <data android:pathPattern=".*\\.kmp" />
-        <data android:pathPattern=".*\\..*\\.kmp" />
-        <data android:pathPattern=".*\\..*\\..*\\.kmp" />
-        <data android:pathPattern=".*\\..*\\..*\\..*\\.kmp" />
-        <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\.kmp" />
-        <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\.kmp" />
-        <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\.kmp" />
+        <data android:pathPattern="/.*\\.kmp" />
       </intent-filter>
 
       <!--
@@ -154,19 +145,7 @@
         <data android:scheme="file" />
         <data android:host="*" />
         <data android:mimeType="*/*" />
-
-        <!--
-                     Work around Android's ugly primitive PatternMatcher
-                     implementation that can't cope with finding a . early in
-                     the path unless it's explicitly matched.
-                -->
-        <data android:pathPattern=".*\\.kmp" />
-        <data android:pathPattern=".*\\..*\\.kmp" />
-        <data android:pathPattern=".*\\..*\\..*\\.kmp" />
-        <data android:pathPattern=".*\\..*\\..*\\..*\\.kmp" />
-        <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\.kmp" />
-        <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\.kmp" />
-        <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\.kmp" />
+        <data android:pathPattern="/.*\\.kmp" />
       </intent-filter>
       <intent-filter>
         <action android:name="android.intent.action.VIEW" />
@@ -177,11 +156,11 @@
         <!-- http:// and  https:// protocols -->
         <data
           android:host="*"
-          android:pathPattern=".*\\.kmp"
+          android:pathPattern="/.*\\.kmp"
           android:scheme="http" />
         <data
           android:host="*"
-          android:pathPattern=".*\\.kmp"
+          android:pathPattern="/.*\\.kmp"
           android:scheme="https" />
       </intent-filter>