Add optional android fileprovider.

Author: Fak3

pythonforandroid/bootstraps/common/build/build.py

@@ -537,6 +537,9 @@ def make_package(args):
         remove('AndroidManifest.xml')
     shutil.copy(manifest_path, 'AndroidManifest.xml')
 
+    if args.fileprovider_paths:
+        shutil.copy(args.fileprovider_paths, join(res_dir, "xml/file_paths.xml"))
+
     # gradle build templates
     render(
         'build.tmpl.gradle',
@@ -785,6 +788,8 @@ def parse_args_and_make_package(args=None):
     ap.add_argument('--depend', dest='depends', action='append',
                     help=('Add a external dependency '
                           '(eg: com.android.support:appcompat-v7:19.0.1)'))
+    ap.add_argument('--fileprovider-paths', dest='fileprovider_paths',
+                    help=('Add fileprovider paths xml file'))
     # The --sdk option has been removed, it is ignored in favour of
     # --android-api handled by toolchain.py
     ap.add_argument('--sdk', dest='sdk_version', default=-1,

pythonforandroid/bootstraps/common/build/src/main/res/xml/.gitkeep

@@ -0,0 +1 @@
+ 

pythonforandroid/bootstraps/common/build/templates/build.tmpl.gradle

@@ -37,6 +37,7 @@ android {
         versionCode {{ args.numeric_version }}
         versionName '{{ args.version }}'
         manifestPlaceholders = {{ args.manifest_placeholders}}
+        multiDexEnabled true
     }
 
 
@@ -81,7 +82,7 @@ android {
     }
 
     compileOptions {
-    	{% if args.enable_androidx %}
+        {% if args.enable_androidx %}
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
 	{% else %}
@@ -127,5 +128,7 @@ dependencies {
     {% if args.presplash_lottie %}
     implementation 'com.airbnb.android:lottie:3.4.0'
     {%- endif %}
+    implementation 'com.android.support:support-v4:26.1.0'
+    implementation 'com.android.support:multidex:1.0.3'
 }
 

pythonforandroid/bootstraps/sdl2/build/templates/AndroidManifest.tmpl.xml

@@ -141,6 +141,18 @@
     {% for a in args.add_activity  %}
     <activity android:name="{{ a }}"></activity>
     {% endfor %}
+    
+    {% if args.fileprovider_paths %}
+    <provider
+        android:name="android.support.v4.content.FileProvider"
+        android:authorities="{{ args.package }}.fileprovider"
+        android:exported="false"
+        android:grantUriPermissions="true">
+        <meta-data
+            android:name="android.support.FILE_PROVIDER_PATHS"
+            android:resource="@xml/file_paths"/>
+    </provider>
+    {% endif %}
     </application>
 
 </manifest>

pythonforandroid/toolchain.py

@@ -987,7 +987,8 @@ def _fix_args(args):
         """
 
         fix_args = ('--dir', '--private', '--add-jar', '--add-source',
-                    '--whitelist', '--blacklist', '--presplash', '--icon')
+                    '--whitelist', '--blacklist', '--presplash', '--icon',
+                    '--fileprovider-paths')
         unknown_args = args.unknown_args
 
         for asset in args.assets: