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

use real_file_path at photoVideoActivity better

This commit is contained in:
tibbi 2018-02-20 16:05:50 +01:00
parent b70292652b
commit 66993d784e
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -65,7 +65,7 @@ class EditActivity : SimpleActivity(), CropImageView.OnCropImageCompleteListener
saveUri = when {
intent.extras?.containsKey(REAL_FILE_PATH) == true -> {
val realPath = intent.extras.get(REAL_FILE_PATH) as String
val realPath = intent.extras.getString(REAL_FILE_PATH)
if (realPath.startsWith(OTG_PATH)) {
Uri.parse(realPath)
} else {

9
app/src/main/kotlin/com/simplemobiletools/gallery/activities/PhotoVideoActivity.kt
View File

@ -11,7 +11,6 @@ import android.view.View
import com.simplemobiletools.commons.dialogs.PropertiesDialog
import com.simplemobiletools.commons.extensions.*
import com.simplemobiletools.commons.helpers.IS_FROM_GALLERY
import com.simplemobiletools.commons.helpers.OTG_PATH
import com.simplemobiletools.commons.helpers.PERMISSION_WRITE_STORAGE
import com.simplemobiletools.commons.helpers.REAL_FILE_PATH
import com.simplemobiletools.gallery.R
@ -60,10 +59,10 @@ open class PhotoVideoActivity : SimpleActivity(), ViewPagerFragment.FragmentList
private fun checkIntent(savedInstanceState: Bundle? = null) {
mUri = intent.data ?: return
if (intent.extras?.containsKey(REAL_FILE_PATH) == true) {
val realPath = intent.extras.get(REAL_FILE_PATH) as String
if (!realPath.startsWith(OTG_PATH)) {
mUri = Uri.fromFile(File(realPath))
}
val realPath = intent.extras.getString(REAL_FILE_PATH)
sendViewPagerIntent(realPath)
finish()
return
}
mIsFromGallery = intent.getBooleanExtra(IS_FROM_GALLERY, false)

4
app/src/main/kotlin/com/simplemobiletools/gallery/activities/ViewPagerActivity.kt
View File

@ -172,6 +172,10 @@ class ViewPagerActivity : SimpleActivity(), ViewPager.OnPageChangeListener, View
}
}
if (intent.extras?.containsKey(REAL_FILE_PATH) == true) {
mPath = intent.extras.getString(REAL_FILE_PATH)
}
if (mPath.isEmpty()) {
toast(R.string.unknown_error_occurred)
finish()