fenix/Simple-Gallery
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Gallery.git synced 2025-06-05 21:59:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

do not allow picking the source folder as the destination at copy/move

Browse Source
This commit is contained in:
tibbi
2017-02-28 22:07:43 +01:00
parent 9cae71b7ab
commit 4b104fc8d6
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/CopyDialog.kt
View File

@ -24,7 +24,7 @@ class CopyDialog(val activity: SimpleActivity, val files: ArrayList<File>, val c
var destinationPath = "" var destinationPath = ""
view.destination.setOnClickListener { view.destination.setOnClickListener {
PickAlbumDialog(activity) { PickAlbumDialog(activity, sourcePath) {
destinationPath = it destinationPath = it
view.destination.text = activity.humanizePath(it) view.destination.text = activity.humanizePath(it)
} }

12
app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/PickAlbumDialog.kt
View File

@ -6,6 +6,7 @@ import android.support.v7.widget.RecyclerView
import android.view.LayoutInflater import android.view.LayoutInflater
import com.simplemobiletools.commons.dialogs.FilePickerDialog import com.simplemobiletools.commons.dialogs.FilePickerDialog
import com.simplemobiletools.commons.extensions.setupDialogStuff import com.simplemobiletools.commons.extensions.setupDialogStuff
import com.simplemobiletools.commons.extensions.toast
import com.simplemobiletools.gallery.R import com.simplemobiletools.gallery.R
import com.simplemobiletools.gallery.activities.SimpleActivity import com.simplemobiletools.gallery.activities.SimpleActivity
import com.simplemobiletools.gallery.adapters.DirectoryAdapter import com.simplemobiletools.gallery.adapters.DirectoryAdapter
@ -13,7 +14,7 @@ import com.simplemobiletools.gallery.asynctasks.GetDirectoriesAsynctask
import com.simplemobiletools.gallery.extensions.config import com.simplemobiletools.gallery.extensions.config
import kotlinx.android.synthetic.main.dialog_album_picker.view.* import kotlinx.android.synthetic.main.dialog_album_picker.view.*
class PickAlbumDialog(val activity: SimpleActivity, val callback: (path: String) -> Unit) { class PickAlbumDialog(val activity: SimpleActivity, val sourcePath: String, val callback: (path: String) -> Unit) {
var directoriesGrid: RecyclerView var directoriesGrid: RecyclerView
init { init {
@ -29,8 +30,13 @@ class PickAlbumDialog(val activity: SimpleActivity, val callback: (path: String)
GetDirectoriesAsynctask(activity, false, false) { GetDirectoriesAsynctask(activity, false, false) {
val adapter = DirectoryAdapter(activity, it, null) { val adapter = DirectoryAdapter(activity, it, null) {
callback.invoke(it.path) if (it.path.trimEnd('/') == sourcePath) {
dismiss() activity.toast(R.string.source_and_destination_same)
return@DirectoryAdapter
} else {
callback.invoke(it.path)
dismiss()
}
} }
directoriesGrid.adapter = adapter directoriesGrid.adapter = adapter
}.execute() }.execute()