Kivy/Android:

- android-sdk update to 36
- android-ndk update to 28c
- kivy update to 2.3.1
- fixed: externalStorage option for Android 11++

Author: lufebe16

README.android

@@ -67,10 +67,12 @@ Additional user supplied data:
   NOTE:
   To be able to add additional resources to your app, you need to
   enable storage access in the android settings for the app. Go to
-  Settings/Apps/PySolFC/Permissions.
+  Settings/Apps/PySolFC/Permissions. As of Android 11++ the storage
+  permissions may have been moved away from the 'Apps' settings into
+  the 'Special permissions' settings screen.
 
-  Resources are stored in ~/.PySolFC/. On an android device this is
-  equivalent to /sdcard/.PySolFC/.
+  With these permissions enabled resources are then stored in ~/.PySolFC/.
+  On an android device this is equivalent to /sdcard/.PySolFC/.
 
   Additional cardsets can be installed in ~/.PySolFC/cardsets/.
   Important: Cardsets must use the 'png' image format. Use

buildozer/buildozer.spec

@@ -103,7 +103,7 @@ android.permissions = WRITE_EXTERNAL_STORAGE, MANAGE_EXTERNAL_STORAGE
 #android.features = android.hardware.usb.host
 
 # (int) Target Android API, should be as high as possible.
-android.api = 34
+android.api = 36
 
 # (int) Minimum API your APK / AAB will support.
 #android.minapi = 21
@@ -112,7 +112,7 @@ android.api = 34
 #android.sdk = 20
 
 # (str) Android NDK version to use
-#android.ndk = 23b
+android.ndk = 28c
 
 # (int) Android NDK API to use. This is the minimum API your app will support, it should usually match android.minapi.
 #android.ndk_api = 21

buildozer/helpers/setbuildvars

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-VP4A='c63d8e2a91ce7180811a37eae489f772fb766a9d'
+VP4A=$(cat buildozer.spec | grep -e "^p4a[.]commit" | sed -E "s/.*= *([0-9,A-F,a-f]*).*/\1/")
 VBUILDOZER='3ebc09e885457db4747e67a1250c2aea1ca7a046'
 VCPYTHON='v3.11.5'
 VCYTHON='3.0.10'

buildozer/pipreq.txt

@@ -1,10 +1,10 @@
 attrs==23.2.0
 build==1.2.1
--e git+https://github.com/kivy/buildozer.git@3ebc09e885457db4747e67a1250c2aea1ca7a046#egg=buildozer
+git+https://github.com/kivy/buildozer.git@3ebc09e885457db4747e67a1250c2aea1ca7a046#egg=buildozer
 certifi==2024.2.2
 colorama==0.4.6
 configobj==5.0.8
-Kivy==2.3.0
+Kivy==2.3.1
 pip==24.0
 pysol_cards==0.16.0
 setuptools==69.1.1

pysollib/kivy/androidperms.py

@@ -30,6 +30,7 @@ def __init__(self):
         self.build = jnius.autoclass("android.os.Build")
         self.version = jnius.autoclass("android.os.Build$VERSION")
         self.vcodes = jnius.autoclass("android.os.Build$VERSION_CODES")
+        self.environment = jnius.autoclass("android.os.Environment")
 
     def getPerm(self, permission):
         if jnius is None:
@@ -42,8 +43,11 @@ def getPerms(self, permissions):
         if jnius is None:
             return True
         haveperms = True
-        for perm in permissions:
-            haveperms = haveperms and self.getPerm(perm)
+        if self.version.SDK_INT > 29:
+            haveperms = self.environment.isExternalStorageManager();
+        else:
+            for perm in permissions:
+                haveperms = haveperms and self.getPerm(perm)
         return haveperms
 
     # invoke the permissions dialog