fix fileprovide

kalu-github · Mar 23, 2021 · 9574940 · 9574940
1 parent e522c48
commit 9574940
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 7 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -30,10 +30,10 @@ android {
     }
     productFlavors {
         activity {
-            buildConfigField("int","RequestMode", "1")
+            buildConfigField("int", "RequestMode", "1")
         }
         fragment {
-            buildConfigField("int","RequestMode", "2")
+            buildConfigField("int", "RequestMode", "2")
         }
     }
 }
@@ -48,8 +48,8 @@ dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
 
     // lib_crop_native
-//    implementation(name: 'lib_crop_native-release', ext: 'aar')
-     implementation project(':lib_crop_native')
+    implementation(name: 'lib_crop_release_20210323', ext: 'aar')
+    // implementation project(':lib_crop_native')
 
     implementation "androidx.exifinterface:exifinterface:${androidx_exifinterface_version}"
     implementation "androidx.transition:transition:${androidx_transition_version}"

diff --git a/app/libs/lib_crop_release_20210323.aar b/app/libs/lib_crop_release_20210323.aar
diff --git a/lib_crop_java/src/main/AndroidManifest.xml b/lib_crop_java/src/main/AndroidManifest.xml
@@ -9,8 +9,8 @@
         android:allowBackup="false"
         android:requestLegacyExternalStorage="true">
         <provider
-            android:name="androidx.core.content.FileProvider"
-            android:authorities="${applicationId}.provider"
+            android:name="com.yalantis.ucrop.fileprovider.CropFileProvider"
+            android:authorities="${applicationId}.crop.fileprovider"
             android:exported="false"
             android:grantUriPermissions="true">
             <meta-data

diff --git a/lib_crop_java/src/main/java/com/yalantis/ucrop/fileprovider/CropFileProvider.java b/lib_crop_java/src/main/java/com/yalantis/ucrop/fileprovider/CropFileProvider.java
@@ -0,0 +1,7 @@
+package com.yalantis.ucrop.fileprovider;
+
+import androidx.annotation.Keep;
+
+@Keep
+public class CropFileProvider extends androidx.core.content.FileProvider {
+}
diff --git a/lib_crop_java/src/main/res/xml/crop_fileprovider.xml b/lib_crop_java/src/main/res/xml/crop_fileprovider.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<paths xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="ResourceName">
+    <external-path name="Pictures" path="."/>
+</paths>
diff --git a/lib_crop_native/src/main/AndroidManifest.xml b/lib_crop_native/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     package="com.yalantis.ucrop">
 
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />