From b22798de4401173fa121ea58344ddca7bb18d328 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Fri, 10 Jul 2026 11:44:46 +0200
Subject: [PATCH] fix(android): add permissions for Sentry and set default
 keyboard

This change fixes two problems that cause a script error in Sample1 app:
- add internet access permissions so that the Sentry server can be reached
- explicitly set the default keyboard since sil_euro_latin keyboard is not
  included in the sample apps. This works around #16215.

Fixes: #16180
Build-bot: release:android
---
 android/Samples/KMSample1/app/src/main/AndroidManifest.xml     | 3 +++
 .../app/src/main/java/com/keyman/kmsample1/MainActivity.java   | 3 ++-
 android/Samples/KMSample2/app/src/main/AndroidManifest.xml     | 3 +++
 .../app/src/main/java/com/keyman/kmsample2/SystemKeyboard.java | 3 ++-
 android/Tests/KeyboardHarness/app/src/main/AndroidManifest.xml | 3 +++
 5 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/android/Samples/KMSample1/app/src/main/AndroidManifest.xml b/android/Samples/KMSample1/app/src/main/AndroidManifest.xml
index 3385b035cc..c903366c8d 100644
--- a/android/Samples/KMSample1/app/src/main/AndroidManifest.xml
+++ b/android/Samples/KMSample1/app/src/main/AndroidManifest.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- allow Sentry reports -->
+    <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
 
     <application
         android:allowBackup="true"
diff --git a/android/Samples/KMSample1/app/src/main/java/com/keyman/kmsample1/MainActivity.java b/android/Samples/KMSample1/app/src/main/java/com/keyman/kmsample1/MainActivity.java
index 1cc8529389..9cc0052fd0 100644
--- a/android/Samples/KMSample1/app/src/main/java/com/keyman/kmsample1/MainActivity.java
+++ b/android/Samples/KMSample1/app/src/main/java/com/keyman/kmsample1/MainActivity.java
@@ -64,6 +64,7 @@ public class MainActivity extends BaseActivity implements OnKeyboardEventListene
       KMManager.KMDefault_KeyboardFont,  // Font for KMSample1 text field
       KMManager.KMDefault_KeyboardFont); // Font for OSK
     KMManager.addKeyboard(this, kbInfo);
+    KMManager.setDefaultKeyboard(kbInfo); // Workaround for #16215
 
     // Add a dictionary
     HashMap<String, String>lexicalModelInfo = new HashMap<String, String>();
@@ -132,7 +133,7 @@ public class MainActivity extends BaseActivity implements OnKeyboardEventListene
   public void onConfigurationChanged(Configuration newConfig) {
     super.onConfigurationChanged(newConfig);
   	KMManager.onConfigurationChanged(newConfig);
-	
+
 	  resizeTextView(textView.isKeyboardVisible());
 	  lastOrientation = newConfig.orientation;
   }
diff --git a/android/Samples/KMSample2/app/src/main/AndroidManifest.xml b/android/Samples/KMSample2/app/src/main/AndroidManifest.xml
index 4c2ada08ad..eb2ffd215b 100644
--- a/android/Samples/KMSample2/app/src/main/AndroidManifest.xml
+++ b/android/Samples/KMSample2/app/src/main/AndroidManifest.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- allow Sentry reports -->
+    <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
 
     <application
         android:allowBackup="true"
diff --git a/android/Samples/KMSample2/app/src/main/java/com/keyman/kmsample2/SystemKeyboard.java b/android/Samples/KMSample2/app/src/main/java/com/keyman/kmsample2/SystemKeyboard.java
index f4a611e66e..d8dc127bec 100644
--- a/android/Samples/KMSample2/app/src/main/java/com/keyman/kmsample2/SystemKeyboard.java
+++ b/android/Samples/KMSample2/app/src/main/java/com/keyman/kmsample2/SystemKeyboard.java
@@ -57,6 +57,7 @@ public class SystemKeyboard extends InputMethodService implements OnKeyboardEven
       KMManager.KMDefault_KeyboardFont,  // Font for KMSample2
       KMManager.KMDefault_KeyboardFont); // Font for OSK
     KMManager.addKeyboard(this, kbInfo);
+    KMManager.setDefaultKeyboard(kbInfo); // Workaround for #16215
 
     // Add a dictionary
     HashMap<String, String>lexicalModelInfo = new HashMap<String, String>();
@@ -262,4 +263,4 @@ public class SystemKeyboard extends InputMethodService implements OnKeyboardEven
   public boolean onKeyLongPress(int keyCode, KeyEvent event) {
     return interpreter.onKeyLongPress(keyCode, event);
   }
-}
\ No newline at end of file
+}
diff --git a/android/Tests/KeyboardHarness/app/src/main/AndroidManifest.xml b/android/Tests/KeyboardHarness/app/src/main/AndroidManifest.xml
index 3385b035cc..c903366c8d 100644
--- a/android/Tests/KeyboardHarness/app/src/main/AndroidManifest.xml
+++ b/android/Tests/KeyboardHarness/app/src/main/AndroidManifest.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- allow Sentry reports -->
+    <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
 
     <application
         android:allowBackup="true"