From 2c9c91396a3ff3cf211c70f771012c2106136de3 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Mon, 5 Dec 2016 18:05:46 +0100
Subject: [PATCH] at copy from the main screen, copy the directory content

---
 .../simplemobiletools/gallery/adapters/DirectoryAdapter.kt  | 6 +++++-
 .../com/simplemobiletools/gallery/dialogs/CopyDialog.kt     | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/DirectoryAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/DirectoryAdapter.kt
index df397e332..25690886c 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/DirectoryAdapter.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/DirectoryAdapter.kt
@@ -14,6 +14,7 @@ import com.bumptech.glide.signature.StringSignature
 import com.simplemobiletools.filepicker.asynctasks.CopyMoveTask
 import com.simplemobiletools.filepicker.dialogs.ConfirmationDialog
 import com.simplemobiletools.filepicker.extensions.isAStorageRootFolder
+import com.simplemobiletools.filepicker.extensions.isImageVideoGif
 import com.simplemobiletools.filepicker.extensions.scanPaths
 import com.simplemobiletools.filepicker.extensions.toast
 import com.simplemobiletools.fileproperties.dialogs.PropertiesDialog
@@ -165,7 +166,10 @@ class DirectoryAdapter(val activity: SimpleActivity, val dirs: MutableList<Direc
     private fun displayCopyDialog() {
         val files = ArrayList<File>()
         val positions = multiSelector.selectedPositions
-        positions.forEach { files.add(File(dirs[it].path)) }
+        positions.forEach {
+            val dir = File(dirs[it].path)
+            files.addAll(dir.listFiles().filter { it.isFile && it.isImageVideoGif() })
+        }
 
         CopyDialog(activity, files, object : CopyMoveTask.CopyMoveListener {
             override fun copySucceeded(deleted: Boolean, copiedAll: Boolean) {
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/CopyDialog.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/CopyDialog.kt
index d48877d54..50a221186 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/CopyDialog.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/dialogs/CopyDialog.kt
@@ -9,9 +9,9 @@ import com.simplemobiletools.filepicker.extensions.humanizePath
 import com.simplemobiletools.filepicker.extensions.isPathOnSD
 import com.simplemobiletools.filepicker.extensions.scanFiles
 import com.simplemobiletools.filepicker.extensions.toast
-import com.simplemobiletools.gallery.helpers.Config
 import com.simplemobiletools.gallery.R
 import com.simplemobiletools.gallery.activities.SimpleActivity
+import com.simplemobiletools.gallery.helpers.Config
 import kotlinx.android.synthetic.main.dialog_copy_move.view.*
 import java.io.File
 import java.util.*