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

use a callback for copy/move result

Browse source
This commit is contained in:
tibbi 2017-04-01 17:59:14 +02:00
parent 77d8bce189
commit 8d1145e038
2 changed files with 22 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
app/src/main/kotlin/com/simplemobiletools/gallery/activities/SimpleActivity.kt
View file

@ -13,11 +13,13 @@ import java.io.File
import java.util.*
open class SimpleActivity : BaseSimpleActivity() {
var copyMoveCallback: (() -> Unit)? = null
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
}
protected fun copyMoveFilesTo(source: String, files: ArrayList<File>, isCopyOperation: Boolean, copyMoveListener: CopyMoveTask.CopyMoveListener) {
protected fun copyMoveFilesTo(source: String, files: ArrayList<File>, isCopyOperation: Boolean, callback: () -> Unit) {
copyMoveCallback = callback
val currPath = source.trimEnd('/')
PickAlbumDialog(this, currPath) {
val destinationFolder = File(it)
@ -69,4 +71,21 @@ open class SimpleActivity : BaseSimpleActivity() {
}
}
}
private val copyMoveListener = object : CopyMoveTask.CopyMoveListener {
override fun copySucceeded(copyOnly: Boolean, copiedAll: Boolean) {
if (copyOnly) {
toast(if (copiedAll) R.string.copying_success else R.string.copying_success_partial)
} else {
toast(if (copiedAll) R.string.moving_success else R.string.moving_success_partial)
}
copyMoveCallback?.invoke()
copyMoveCallback = null
}
override fun copyFailed() {
toast(R.string.copy_move_failed)
copyMoveCallback = null
}
}
}

16
app/src/main/kotlin/com/simplemobiletools/gallery/activities/ViewPagerActivity.kt
View file

@ -18,7 +18,6 @@ import android.util.DisplayMetrics
import android.view.Menu
import android.view.MenuItem
import android.view.View
import com.simplemobiletools.commons.asynctasks.CopyMoveTask
import com.simplemobiletools.commons.dialogs.ConfirmationDialog
import com.simplemobiletools.commons.dialogs.PropertiesDialog
import com.simplemobiletools.commons.dialogs.RenameItemDialog
@ -188,22 +187,11 @@ class ViewPagerActivity : SimpleActivity(), ViewPager.OnPageChangeListener, View
private fun copyMoveTo(isCopyOperation: Boolean) {
val currPath = File(getCurrentPath()).parent.trimEnd('/')
val files = ArrayList<File>(1).apply { add(getCurrentFile()) }
copyMoveFilesTo(currPath, files, isCopyOperation, copyMoveListener)
}
private val copyMoveListener = object : CopyMoveTask.CopyMoveListener {
override fun copySucceeded(copyOnly: Boolean, copiedAll: Boolean) {
if (copyOnly) {
toast(if (copiedAll) R.string.copying_success else R.string.copying_success_partial)
} else {
copyMoveFilesTo(currPath, files, isCopyOperation) {
if (!isCopyOperation) {
reloadViewPager()
toast(if (copiedAll) R.string.moving_success else R.string.moving_success_partial)
}
}
override fun copyFailed() {
toast(R.string.copy_move_failed)
}
}
private fun saveImageAs() {