PatchesAndForks/FossifyGalleryVisibilityPatch
1
0
Fork 0
forked from Mirrors/FossifyGallery
Code Pull requests Activity

couple edits to URI obtaining at Edit activity

Browse source
This commit is contained in:
tibbi 2018-03-22 15:43:27 +01:00
parent cb3b3b65d6
commit 6eeece124a
1 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
app/src/main/kotlin/com/simplemobiletools/gallery/activities/EditActivity.kt
View file

@ -63,15 +63,20 @@ class EditActivity : SimpleActivity(), CropImageView.OnCropImageCompleteListener
return return
} }
saveUri = when { if (intent.extras?.containsKey(REAL_FILE_PATH) == true) {
intent.extras?.containsKey(REAL_FILE_PATH) == true -> {
val realPath = intent.extras.getString(REAL_FILE_PATH) val realPath = intent.extras.getString(REAL_FILE_PATH)
if (realPath.startsWith(OTG_PATH)) { uri = when {
Uri.parse(realPath) realPath.startsWith(OTG_PATH) -> Uri.parse(realPath)
realPath.startsWith("file:/") -> Uri.parse(realPath)
else -> Uri.fromFile(File(realPath))
}
} else { } else {
Uri.fromFile(File(realPath)) (getRealPathFromURI(uri))?.apply {
uri = Uri.fromFile(File(this))
} }
} }
saveUri = when {
intent.extras?.containsKey(MediaStore.EXTRA_OUTPUT) == true -> intent.extras!!.get(MediaStore.EXTRA_OUTPUT) as Uri intent.extras?.containsKey(MediaStore.EXTRA_OUTPUT) == true -> intent.extras!!.get(MediaStore.EXTRA_OUTPUT) as Uri
else -> uri else -> uri
} }