From e3def060d8d028e36eedc7b5f0fb953283e42a7b Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Sat, 2 Sep 2017 20:16:11 +0200
Subject: [PATCH] add the root folder of zipped files in the zip file too

---
 .../filemanager/adapters/ItemsAdapter.kt         | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/adapters/ItemsAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/filemanager/adapters/ItemsAdapter.kt
index 48ceadcf..fc7b20ea 100644
--- a/app/src/main/kotlin/com/simplemobiletools/filemanager/adapters/ItemsAdapter.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/filemanager/adapters/ItemsAdapter.kt
@@ -241,18 +241,24 @@ class ItemsAdapter(val activity: SimpleActivity, var mItems: MutableList<FileDir
 
         try {
             sourcePaths.forEach {
-                val base = File(it).toURI()
+                var name: String
                 var mainFile = File(it)
-                queue.push(mainFile)
+                val base = mainFile.parentFile.toURI()
                 res = zout
+                queue.push(mainFile)
+                if (mainFile.isDirectory) {
+                    name = "${mainFile.name.trimEnd('/')}/"
+                    zout.putNextEntry(ZipEntry(name))
+                }
+
                 while (!queue.isEmpty()) {
                     mainFile = queue.pop()
                     if (mainFile.isDirectory) {
                         for (file in mainFile.listFiles()) {
-                            var name = base.relativize(file.toURI()).path
+                            name = base.relativize(file.toURI()).path
                             if (file.isDirectory) {
                                 queue.push(file)
-                                name = if (name.endsWith("/")) name else "$name/"
+                                name = "${name.trimEnd('/')}/"
                                 zout.putNextEntry(ZipEntry(name))
                             } else {
                                 zout.putNextEntry(ZipEntry(name))
@@ -261,7 +267,7 @@ class ItemsAdapter(val activity: SimpleActivity, var mItems: MutableList<FileDir
                             }
                         }
                     } else {
-                        val name = if (base.path == it) it.getFilenameFromPath() else base.relativize(mainFile.toURI()).path
+                        name = if (base.path == it) it.getFilenameFromPath() else base.relativize(mainFile.toURI()).path
                         zout.putNextEntry(ZipEntry(name))
                         FileInputStream(mainFile).copyTo(zout)
                         zout.closeEntry()