fenix
/
Simple-Gallery
mirror of https://github.com/SimpleMobileTools/Simple-Gallery.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

check for unknown file path at editing remote images

This commit is contained in:
tibbi 2016-10-08 22:42:11 +02:00
parent 7cd62075e7
commit aebfa078e1
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/kotlin/com/simplemobiletools/gallery/activities/EditActivity.kt
View File

@ -69,13 +69,19 @@ class EditActivity : SimpleActivity(), CropImageView.OnCropImageCompleteListener
if (uri.scheme == "file") { if (uri.scheme == "file") {
saveBitmapToFile(result.bitmap, uri.path) saveBitmapToFile(result.bitmap, uri.path)
} else if (uri.scheme == "content") { } else if (uri.scheme == "content") {
saveBitmapToFile(result.bitmap, convertMediaUriToPath(uri)) val newPath = convertMediaUriToPath(uri) ?: ""
if (!newPath.isEmpty()) {
saveBitmapToFile(result.bitmap, newPath)
} else {
toast(R.string.image_editing_failed)
finish()
}
} else { } else {
toast(R.string.unknown_file_location) toast(R.string.unknown_file_location)
finish() finish()
} }
} else { } else {
toast("${getString(R.string.image_editing_failed)} ${result.error.message}") toast("${getString(R.string.image_editing_failed)}: ${result.error.message}")
} }
} }
@ -118,7 +124,7 @@ class EditActivity : SimpleActivity(), CropImageView.OnCropImageCompleteListener
} }
} }
private fun convertMediaUriToPath(uri: Uri): String { private fun convertMediaUriToPath(uri: Uri): String? {
val proj = arrayOf(MediaStore.Images.Media.DATA) val proj = arrayOf(MediaStore.Images.Media.DATA)
val cursor = contentResolver.query(uri, proj, null, null, null) val cursor = contentResolver.query(uri, proj, null, null, null)
val index = cursor.getColumnIndexOrThrow(MediaStore.Images.Media.DATA) val index = cursor.getColumnIndexOrThrow(MediaStore.Images.Media.DATA)