From 0175ca917d3f8dbace93cb4459f77b2ec28f618d Mon Sep 17 00:00:00 2001
From: Mark Qvist <mark@unsigned.io>
Date: Fri, 31 May 2024 13:45:55 +0200
Subject: [PATCH] Updated build manifests

---
 sbapp/buildozer.spec                   | 11 +++++++----
 sbapp/patches/AndroidManifest.tmpl.xml | 23 ++++++++---------------
 2 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/sbapp/buildozer.spec b/sbapp/buildozer.spec
index 3e08678..74f51d4 100644
--- a/sbapp/buildozer.spec
+++ b/sbapp/buildozer.spec
@@ -10,13 +10,17 @@ source.exclude_patterns = app_storage/*,venv/*,Makefile,./Makefil*,requirements,
 
 version.regex = __version__ = ['"](.*)['"]
 version.filename = %(source.dir)s/main.py
-android.numeric_version = 20240522
+android.numeric_version = 20240530
 
 # Cryptography recipe is currently broken, using RNS-internal crypto for now. Since
 # relevant PRs have now been merged in Kivy/P4A, the next release will hopefully allow
 # building a non-ancient PyCa/Cryptography distribution again. When this happens, add
 # the "cryptography" dependency back in here.
-requirements = kivy==2.3.0,libbz2,pillow==10.2.0,qrcode==7.3.1,usb4a,usbserial4a,libwebp
+requirements = kivy==2.3.0,libbz2,pillow==10.2.0,qrcode==7.3.1,usb4a,usbserial4a,libwebp,cryptography
+
+android.gradle_dependencies =  com.android.support:support-compat:28.0.0
+#android.enable_androidx = True
+#android.add_aars = patches/support-compat-28.0.0.aar
 
 p4a.local_recipes = ../Others/python-for-android/pythonforandroid/recipes
 
@@ -30,7 +34,7 @@ fullscreen = 0
 
 android.permissions = INTERNET,POST_NOTIFICATIONS,WAKE_LOCK,FOREGROUND_SERVICE,CHANGE_WIFI_MULTICAST_STATE,BLUETOOTH_CONNECT,ACCESS_NETWORK_STATE,ACCESS_FINE_LOCATION,ACCESS_COARSE_LOCATION,MANAGE_EXTERNAL_STORAGE,ACCESS_BACKGROUND_LOCATION
 
-android.api = 30
+android.api = 31
 android.minapi = 24
 android.ndk = 25b
 android.skip_update = False
@@ -42,7 +46,6 @@ android.archs = arm64-v8a,armeabi-v7a
 services = sidebandservice:services/sidebandservice.py:foreground
 android.whitelist = lib-dynload/termios.so
 android.manifest.intent_filters = patches/intent-filter.xml
-android.add_aars = patches/support-compat-28.0.0.aar
 
 [buildozer]
 log_level = 2
diff --git a/sbapp/patches/AndroidManifest.tmpl.xml b/sbapp/patches/AndroidManifest.tmpl.xml
index 140814c..e7a005f 100644
--- a/sbapp/patches/AndroidManifest.tmpl.xml
+++ b/sbapp/patches/AndroidManifest.tmpl.xml
@@ -3,7 +3,6 @@
      com.gamemaker.game
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="{{ args.package }}"
       android:versionCode="{{ args.numeric_version }}"
       android:versionName="{{ args.version }}"
       android:installLocation="auto">
@@ -46,16 +45,7 @@
 
     {{ args.extra_manifest_xml }}
 
-
-    <!-- Create a Java class extending SDLActivity and place it in a
-         directory under src matching the package, e.g.
-            src/com/gamemaker/game/MyGame.java
-
-         then replace "SDLActivity" with the name of your class (e.g. "MyGame")
-         in the XML below.
-
-         An example Java class can be found in README-android.txt
-    -->
+    <!-- Add android:extractNativeLibs="true" when building for API level >= 28 -->
     <application android:label="@string/app_name"
                  {% if debug %}android:debuggable="true"{% endif %}
                  android:icon="@mipmap/icon"
@@ -83,19 +73,22 @@
                   {% endif %}
                   >
 
-            {% if args.launcher %}
             <intent-filter>
+            {% if args.launcher %}            
                 <action android:name="org.kivy.LAUNCH" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <data android:scheme="{{ url_scheme }}" />
-            </intent-filter>
             {% else  %}
-            <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
             {% endif %}
 
+            {% if args.home_app %}
+                <category android:name="android.intent.category.HOME" />
+                <category android:name="android.intent.category.DEFAULT" />
+            {% endif %}
+            </intent-filter>
+
             {%- if args.intent_filters -%}
             {{- args.intent_filters -}}
             {%- endif -%}