couple edits to URI obtaining at Edit activity
This commit is contained in:
parent
cb3b3b65d6
commit
6eeece124a
1 changed files with 13 additions and 8 deletions
|
@ -63,15 +63,20 @@ class EditActivity : SimpleActivity(), CropImageView.OnCropImageCompleteListener
|
|||
return
|
||||
}
|
||||
|
||||
saveUri = when {
|
||||
intent.extras?.containsKey(REAL_FILE_PATH) == true -> {
|
||||
if (intent.extras?.containsKey(REAL_FILE_PATH) == true) {
|
||||
val realPath = intent.extras.getString(REAL_FILE_PATH)
|
||||
if (realPath.startsWith(OTG_PATH)) {
|
||||
Uri.parse(realPath)
|
||||
uri = when {
|
||||
realPath.startsWith(OTG_PATH) -> Uri.parse(realPath)
|
||||
realPath.startsWith("file:/") -> Uri.parse(realPath)
|
||||
else -> Uri.fromFile(File(realPath))
|
||||
}
|
||||
} 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
|
||||
else -> uri
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue