From e161042e69880c138975bc42c80d31f96cae86f5 Mon Sep 17 00:00:00 2001
From: tufteddeer <tufteddeer@protonmail.com>
Date: Sat, 4 May 2019 17:10:05 +0200
Subject: [PATCH] extract zip to correct path

---
 .../filemanager/pro/adapters/ItemsAdapter.kt                  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/adapters/ItemsAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/adapters/ItemsAdapter.kt
index f71ed6b9..671befc7 100644
--- a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/adapters/ItemsAdapter.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/adapters/ItemsAdapter.kt
@@ -426,10 +426,12 @@ class ItemsAdapter(activity: SimpleActivity, var listItems: MutableList<ListItem
             try {
                 val zipFile = ZipFile(it)
                 val entries = zipFile.entries()
+                val zipFileName = it.getFilenameFromPath()
+                val newFolderName = zipFileName.subSequence(0, zipFileName.length-4)
                 while (entries.hasMoreElements()) {
                     val entry = entries.nextElement()
                     val parentPath = it.getParentPath()
-                    val newPath = "$parentPath${entry.name.trimEnd('/')}"
+                    val newPath = "$parentPath/$newFolderName/${entry.name.trimEnd('/')}"
 
                     val resolution = getConflictResolution(conflictResolutions, newPath)
                     val doesPathExist = File(newPath).exists()