fix #1940, properly decode uris after image editing

This commit is contained in:
tibbi 2020-10-24 10:02:13 +02:00
parent bf5f5ae341
commit 304bcd37fc
2 changed files with 2 additions and 2 deletions

View File

@ -77,7 +77,7 @@ android {
} }
dependencies { dependencies {
implementation 'com.simplemobiletools:commons:5.31.3' implementation 'com.simplemobiletools:commons:5.31.6'
implementation 'com.theartofdev.edmodo:android-image-cropper:2.8.0' implementation 'com.theartofdev.edmodo:android-image-cropper:2.8.0'
implementation 'it.sephiroth.android.exif:library:1.0.1' implementation 'it.sephiroth.android.exif:library:1.0.1'
implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.19' implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.19'

View File

@ -104,7 +104,7 @@ class NewEditActivity : SimpleActivity() {
if (requestCode == PESDK_EDIT_IMAGE) { if (requestCode == PESDK_EDIT_IMAGE) {
val extras = resultData?.extras val extras = resultData?.extras
val resultPath = extras?.get(RESULT_URI)?.toString() ?: "" val resultPath = extras?.get(RESULT_URI)?.toString() ?: ""
val sourcePath = extras?.get(SOURCE_URI)?.toString() ?: "" val sourcePath = Uri.decode(extras?.get(SOURCE_URI)?.toString() ?: "")
val settings = extras?.getParcelable<SettingsList>(SETTINGS_LIST) val settings = extras?.getParcelable<SettingsList>(SETTINGS_LIST)
if (settings != null) { if (settings != null) {
val brush = settings.getSettingsModel(BrushSettings::class.java) val brush = settings.getSettingsModel(BrushSettings::class.java)