Renamed library_file_paths.xml to prevent name clashes

Refs #644
CanHub · Jan 7, 2025 · 277e073 · 277e073
1 parent 1ea2a05
commit 277e073
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/cropper/src/main/AndroidManifest.xml b/cropper/src/main/AndroidManifest.xml
@@ -17,7 +17,7 @@
         android:grantUriPermissions="true">
       <meta-data
           android:name="android.support.FILE_PROVIDER_PATHS"
-          android:resource="@xml/library_file_paths"/>
+          android:resource="@xml/cropper_library_file_paths"/>
     </provider>
     <activity
         android:name="com.canhub.cropper.CropImageActivity"

diff --git a/cropper/src/main/kotlin/com/canhub/cropper/CropFileProvider.kt b/cropper/src/main/kotlin/com/canhub/cropper/CropFileProvider.kt
@@ -7,7 +7,7 @@ import androidx.core.content.FileProvider
  *
  * See https://developer.android.com/guide/topics/manifest/provider-element.html for details.
  */
-class CropFileProvider() : FileProvider(R.xml.library_file_paths) {
+class CropFileProvider() : FileProvider(R.xml.cropper_library_file_paths) {
  // This class intentionally left blank.
  // https://android-review.googlesource.com/c/platform/frameworks/support/+/1978527
 }
diff --git a/...r/src/main/res/xml/library_file_paths.xml → ...in/res/xml/cropper_library_file_paths.xml b/...r/src/main/res/xml/library_file_paths.xml → ...in/res/xml/cropper_library_file_paths.xml