Skip to content

Commit fc3d4e7

Browse files
authored
Removed file provider workaround to fix security issue (#659)
1 parent 7813906 commit fc3d4e7

File tree

4 files changed

+5
-15
lines changed

4 files changed

+5
-15
lines changed

cropper/src/main/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
android:grantUriPermissions="true">
1818
<meta-data
1919
android:name="android.support.FILE_PROVIDER_PATHS"
20-
android:resource="@xml/library_file_paths"/>
20+
android:resource="@xml/cropper_library_file_paths"/>
2121
</provider>
2222
<activity
2323
android:name="com.canhub.cropper.CropImageActivity"

cropper/src/main/kotlin/com/canhub/cropper/BitmapUtils.kt

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import android.graphics.Rect
1111
import android.graphics.RectF
1212
import android.net.Uri
1313
import android.os.Build.VERSION.SDK_INT
14-
import android.os.Environment
1514
import android.util.Log
1615
import android.util.Pair
1716
import androidx.exifinterface.media.ExifInterface
@@ -457,18 +456,8 @@ internal object BitmapUtils {
457456
}
458457
// We have this because of a HUAWEI path bug when we use getUriForFile
459458
if (SDK_INT >= 29) {
460-
try {
461-
val file = File.createTempFile(
462-
"cropped",
463-
ext,
464-
context.getExternalFilesDir(Environment.DIRECTORY_PICTURES),
465-
)
466-
getUriForFile(context, file)
467-
} catch (e: Exception) {
468-
Log.e("AIC", "${e.message}")
469-
val file = File.createTempFile("cropped", ext, context.cacheDir)
470-
getUriForFile(context, file)
471-
}
459+
val file = File.createTempFile("cropped", ext, context.cacheDir)
460+
getUriForFile(context, file)
472461
} else {
473462
Uri.fromFile(File.createTempFile("cropped", ext, context.cacheDir))
474463
}

cropper/src/main/kotlin/com/canhub/cropper/CropFileProvider.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import androidx.core.content.FileProvider
77
*
88
* See https://developer.android.com/guide/topics/manifest/provider-element.html for details.
99
*/
10-
class CropFileProvider : FileProvider() {
10+
class CropFileProvider : FileProvider(R.xml.cropper_library_file_paths) {
1111
// This class intentionally left blank.
12+
// https://android-review.googlesource.com/c/platform/frameworks/support/+/1978527
1213
}

0 commit comments

Comments
 (0)