Merge pull request #7 from jamalex/pew_webview

Add usesCleartextTraffic flag so webview works for Android 9 & 10, and --fileprovider-paths support

Author: kollivier

pythonforandroid/bootstraps/common/build/build.py

@@ -469,6 +469,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',
@@ -674,6 +677,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

@@ -32,6 +32,7 @@ android {
         targetSdkVersion {{ android_api }}
         versionCode {{ args.numeric_version }}
         versionName '{{ args.version }}'
+        multiDexEnabled true
     }
 
 	{% if debug_build -%}
@@ -98,4 +99,6 @@ dependencies {
     compile '{{ depend }}'
     {%- endfor %}
     {%- endif %}
+    compile 'com.android.support:support-v4:26.1.0'
+    compile 'com.android.support:multidex:1.0.3'
 }

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

@@ -132,6 +132,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/bootstraps/webview/build/templates/AndroidManifest.tmpl.xml

@@ -49,7 +49,8 @@
                  android:icon="@drawable/icon"
                  android:allowBackup="true"
                  android:theme="{{args.android_apptheme}}{% if not args.window %}.Fullscreen{% endif %}"
-                 android:hardwareAccelerated="true" >
+                 android:hardwareAccelerated="true"
+                 android:usesCleartextTraffic="true" >
         {% for l in args.android_used_libs %}
         <uses-library android:name="{{ l }}" />
         {% endfor %}
@@ -92,6 +93,19 @@
             </intent-filter>
         </receiver>
         {% endif %}
+
+        {% 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

@@ -955,7 +955,8 @@ def apk(self, args):
         # we can't leave it until later as the build.py scripts assume
         # they are in the current directory.
         fix_args = ('--dir', '--private', '--add-jar', '--add-source',
-                    '--whitelist', '--blacklist', '--presplash', '--icon')
+                    '--whitelist', '--blacklist', '--presplash', '--icon', 
+                    '--fileprovider-paths')
         unknown_args = args.unknown_args
         for i, arg in enumerate(unknown_args):
             argx = arg.split('=')