mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-26 20:33:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix SecurityException crash when accessing picker URIs after app restart

Browse source
This commit is contained in:
Sonal Yadav 2025-08-16 18:29:34 +05:30
parent fe3b90a938
commit 5110c0a7c8
1 changed files with 29 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

29
app/src/main/java/fr/free/nrw/commons/upload/ImageProcessingService.kt
View file

@ -129,11 +129,38 @@ class ImageProcessingService @Inject constructor(
*/ */
fun checkIfFileAlreadyExists(originalFilePath: Uri, modifiedFilePath: Uri): Single<Int> { fun checkIfFileAlreadyExists(originalFilePath: Uri, modifiedFilePath: Uri): Single<Int> {
return Single.zip( return Single.zip(
checkDuplicateImage(inputStream = appContext.contentResolver.openInputStream(originalFilePath)!!), // Handle SecurityException for picker URIs that have lost permission
Single.defer {
try {
val inputStream = appContext.contentResolver.openInputStream(originalFilePath)
if (inputStream != null) {
checkDuplicateImage(inputStream = inputStream)
} else {
Single.just(IMAGE_OK)
}
} catch (e: SecurityException) {
Timber.w(e, "Security exception accessing picker URI - permission lost after app restart")
Single.just(IMAGE_OK)
} catch (e: Exception) {
Timber.e(e, "Error accessing original file URI")
Single.just(IMAGE_OK)
}
},
// Handle exceptions for modified file path
Single.defer {
try {
checkDuplicateImage(inputStream = fileUtilsWrapper.getFileInputStream(modifiedFilePath.path)) checkDuplicateImage(inputStream = fileUtilsWrapper.getFileInputStream(modifiedFilePath.path))
} catch (e: Exception) {
Timber.e(e, "Error accessing modified file")
Single.just(IMAGE_OK)
}
}
) { resultForOriginal, resultForDuplicate -> ) { resultForOriginal, resultForDuplicate ->
return@zip if (resultForOriginal == IMAGE_DUPLICATE || resultForDuplicate == IMAGE_DUPLICATE) return@zip if (resultForOriginal == IMAGE_DUPLICATE || resultForDuplicate == IMAGE_DUPLICATE)
IMAGE_DUPLICATE else IMAGE_OK IMAGE_DUPLICATE else IMAGE_OK
}.onErrorReturn { error ->
Timber.e(error, "Error during duplicate file check")
IMAGE_OK
} }
} }