Removed file provider workaround to fix security issue

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

Hide file tree

Showing 2 changed files with 5 additions and 14 deletions.
diff --git a/cropper/src/main/kotlin/com/canhub/cropper/BitmapUtils.kt b/cropper/src/main/kotlin/com/canhub/cropper/BitmapUtils.kt
@@ -457,18 +457,8 @@ internal object BitmapUtils {
       }
       // We have this because of a HUAWEI path bug when we use getUriForFile
       if (SDK_INT >= 29) {
-        try {
-          val file = File.createTempFile(
-            "cropped",
-            ext,
-            context.getExternalFilesDir(Environment.DIRECTORY_PICTURES),
-          )
-          getUriForFile(context, file)
-        } catch (e: Exception) {
-          Log.e("AIC", "${e.message}")
-          val file = File.createTempFile("cropped", ext, context.cacheDir)
-          getUriForFile(context, file)
-        }
+        val file = File.createTempFile("cropped", ext, context.cacheDir)
+        getUriForFile(context, file)
       } else {
         Uri.fromFile(File.createTempFile("cropped", ext, context.cacheDir))
       }

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