From 759c6228c34317f9c52df725b0d327113ec999c0 Mon Sep 17 00:00:00 2001
From: Peter Surda <peter@bitmessage.at>
Date: Fri, 29 Mar 2024 19:11:40 +0800
Subject: [PATCH] Android build fixes

- updates requirements as per Play Store
- can build aab on release
---
 .buildbot/android/build.sh      | 15 +++++++++++++--
 .buildbot/android/test.sh       |  6 ++++++
 packages/android/buildozer.spec | 12 +++++++-----
 3 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/.buildbot/android/build.sh b/.buildbot/android/build.sh
index 10176ef3..52f563f7 100755
--- a/.buildbot/android/build.sh
+++ b/.buildbot/android/build.sh
@@ -2,8 +2,19 @@
 export LC_ALL=en_US.UTF-8
 export LANG=en_US.UTF-8
 pushd packages/android
-buildozer android debug || exit $?
+
+BUILDMODE=debug
+
+if [ "$BUILDBOT_JOBNAME" = "android" -a \
+     "$BUILDBOT_REPOSITORY" = "https://github.com/Bitmessage/PyBitmessage" -a \
+     "$BUILDBOT_BRANCH" = "v0.6" ]; then
+   sed -e 's/android.release_artifact *=.*/release_artifact = aab/' -i "" buildozer.spec
+   BUILDMODE=release
+fi 
+
+buildozer android $BUILDMODE || exit $?
 popd
 
 mkdir -p ../out
-cp packages/android/bin/*.apk ../out
+RELEASE_ARTIFACT=$(grep release_artifact packages/android/buildozer.spec |cut -d= -f2|tr -Cd 'a-z')
+cp packages/android/bin/*.${RELEASE_ARTIFACT} ../out
diff --git a/.buildbot/android/test.sh b/.buildbot/android/test.sh
index b61fac85..65a0fe7d 100755
--- a/.buildbot/android/test.sh
+++ b/.buildbot/android/test.sh
@@ -1,5 +1,11 @@
 #!/bin/bash
 
+RELEASE_ARTIFACT=$(grep release_artifact packages/android/buildozer.spec |cut -d= -f2|tr -Cd 'a-z')
+
+if [ $RELEASE_ARTIFACT = "aab" ]; then
+	exit
+fi
+
 unzip -p packages/android/bin/*.apk assets/private.tar \
     | tar --list -z > package.list
 cat package.list
diff --git a/packages/android/buildozer.spec b/packages/android/buildozer.spec
index c98717b4..14afa47d 100644
--- a/packages/android/buildozer.spec
+++ b/packages/android/buildozer.spec
@@ -1,13 +1,13 @@
 [app]
 
 # (str) Title of your application
-title = mockone
+title = PyBitmessage Mock
 
 # (str) Package name
-package.name = mock
+package.name = pybitmessagemock
 
 # (str) Package domain (needed for android/ios packaging)
-package.domain = org.mock
+package.domain = at.bitmessage
 
 # (str) Source code where the main.py live
 source.dir = ../../src
@@ -28,7 +28,7 @@ source.include_exts = py,png,jpg,kv,atlas,tflite,sql
 #source.exclude_patterns = license,images/*/*.jpg
 
 # (str) Application versioning (method 1)
-version = 0.1
+version = 0.1.1
 
 # (str) Application versioning (method 2)
 # version.regex = __version__ = ['"](.*)['"]
@@ -92,7 +92,7 @@ fullscreen = 0
 
 # (int) Android API to use  (targetSdkVersion AND compileSdkVersion)
 # note: when changing, Dockerfile also needs to be changed to install corresponding build tools
-android.api = 28
+android.api = 33
 
 # (int) Minimum API required. You will need to set the android.ndk_api to be as low as this value.
 android.minapi = 21
@@ -243,6 +243,8 @@ android.allow_backup = True
 # Usage example : android.manifest_placeholders = [myCustomUrl:\"org.kivy.customurl\"]
 # android.manifest_placeholders = [:]
 
+android.release_artifact = apk
+
 #
 # Python for android (p4a) specific
 #