Mirrors/FossifyGallery
2
0
Fork 1
mirror of https://github.com/FossifyOrg/Gallery.git synced 2024-11-23 04:57:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

take the file uri scheme into account when editing and saving files

Browse source
This commit is contained in:
tibbi 2016-10-08 12:44:04 +02:00
parent b2cea47c8d
commit ca65ead9a7
8 changed files with 41 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -18,6 +18,7 @@ import java.io.IOException
class EditActivity : SimpleActivity(), CropImageView.OnCropImageCompleteListener {
val TAG: String = EditActivity::class.java.simpleName
lateinit var uri: Uri
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
@ -29,6 +30,13 @@ class EditActivity : SimpleActivity(), CropImageView.OnCropImageCompleteListener
return
}
uri = intent.data
if (uri.scheme != "file" && uri.scheme != "content") {
toast(R.string.unknown_file_location)
finish()
return
}
crop_image_view.apply {
guidelines = CropImageView.Guidelines.OFF
setOnCropImageCompleteListener(this@EditActivity)
@ -57,7 +65,8 @@ class EditActivity : SimpleActivity(), CropImageView.OnCropImageCompleteListener
override fun onCropImageComplete(view: CropImageView, result: CropImageView.CropResult) {
if (result.error == null) {
val path = intent.data.path
if (uri.scheme == "file") {
val path = uri.path
val file = File(path)
var out: FileOutputStream? = null
try {
@ -67,6 +76,7 @@ class EditActivity : SimpleActivity(), CropImageView.OnCropImageCompleteListener
} catch (e: Exception) {
Log.e(TAG, "Crop compressing failed $e")
toast(R.string.image_editing_failed)
finish()
} finally {
try {
out?.close()
@ -76,8 +86,15 @@ class EditActivity : SimpleActivity(), CropImageView.OnCropImageCompleteListener
}
MediaScannerConnection.scanFile(applicationContext, arrayOf(path), null, { path: String, uri: Uri ->
setResult(Activity.RESULT_OK, intent)
finish()
})
} else if (uri.scheme == "content") {
} else {
toast(R.string.unknown_file_location)
finish()
}
} else {
toast("${getString(R.string.image_croping_failed)} ${result.error.message}")
}

1
app/src/main/res/values-de/strings.xml
View file

@ -52,6 +52,7 @@
<string name="image_editing_failed">Image editing failed</string>
<string name="edit_image_with">Edit image with:</string>
<string name="no_editor_found">No image editor found</string>
<string name="unknown_file_location">Unknown file location</string>
<!-- About -->
<string name="about">Über</string>

1
app/src/main/res/values-es/strings.xml
View file

@ -52,6 +52,7 @@
<string name="image_editing_failed">Image editing failed</string>
<string name="edit_image_with">Edit image with:</string>
<string name="no_editor_found">No image editor found</string>
<string name="unknown_file_location">Unknown file location</string>
<!-- About -->
<string name="about">Acerca de</string>

1
app/src/main/res/values-it/strings.xml
View file

@ -52,6 +52,7 @@
<string name="image_editing_failed">Image editing failed</string>
<string name="edit_image_with">Edit image with:</string>
<string name="no_editor_found">No image editor found</string>
<string name="unknown_file_location">Unknown file location</string>
<!-- About -->
<string name="about">Informazioni</string>

1
app/src/main/res/values-ja/strings.xml
View file

@ -52,6 +52,7 @@
<string name="image_editing_failed">Image editing failed</string>
<string name="edit_image_with">Edit image with:</string>
<string name="no_editor_found">No image editor found</string>
<string name="unknown_file_location">Unknown file location</string>
<!-- About -->
<string name="about">アプリについて</string>

1
app/src/main/res/values-pt-rPT/strings.xml
View file

@ -52,6 +52,7 @@
<string name="image_editing_failed">Image editing failed</string>
<string name="edit_image_with">Edit image with:</string>
<string name="no_editor_found">No image editor found</string>
<string name="unknown_file_location">Unknown file location</string>
<!-- About -->
<string name="about">Sobre</string>

1
app/src/main/res/values-sv/strings.xml
View file

@ -52,6 +52,7 @@
<string name="image_editing_failed">Image editing failed</string>
<string name="edit_image_with">Edit image with:</string>
<string name="no_editor_found">No image editor found</string>
<string name="unknown_file_location">Unknown file location</string>
<!-- About -->
<string name="about">Om</string>

1
app/src/main/res/values/strings.xml
View file

@ -52,6 +52,7 @@
<string name="image_editing_failed">Image editing failed</string>
<string name="edit_image_with">Edit image with:</string>
<string name="no_editor_found">No image editor found</string>
<string name="unknown_file_location">Unknown file location</string>
<!-- About -->
<string name="about">About</string>