From ca847f845ed5ce83bc98b5a521a6877230c954ca Mon Sep 17 00:00:00 2001
From: Agnieszka C <85929121+Aga-C@users.noreply.github.com>
Date: Sat, 19 Oct 2024 09:50:02 +0200
Subject: [PATCH] Fixed decompressed directory filename not using ZIP name
 (#120)

---
 .../fossify/filemanager/activities/DecompressActivity.kt    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/src/main/kotlin/org/fossify/filemanager/activities/DecompressActivity.kt b/app/src/main/kotlin/org/fossify/filemanager/activities/DecompressActivity.kt
index d0a1c7c0..1e84b97f 100644
--- a/app/src/main/kotlin/org/fossify/filemanager/activities/DecompressActivity.kt
+++ b/app/src/main/kotlin/org/fossify/filemanager/activities/DecompressActivity.kt
@@ -31,6 +31,7 @@ class DecompressActivity : SimpleActivity() {
     private var uri: Uri? = null
     private var password: String? = null
     private var passwordDialog: EnterPasswordDialog? = null
+    private var filename = ""
 
     override fun onCreate(savedInstanceState: Bundle?) {
         isMaterialActivity = true
@@ -51,7 +52,8 @@ class DecompressActivity : SimpleActivity() {
         password = savedInstanceState?.getString(PASSWORD, null)
 
         val realPath = getRealPathFromURI(uri!!)
-        binding.decompressToolbar.title = realPath?.getFilenameFromPath() ?: Uri.decode(uri.toString().getFilenameFromPath())
+        filename = realPath?.getFilenameFromPath() ?: Uri.decode(uri.toString().getFilenameFromPath())
+        binding.decompressToolbar.title = filename
         setupFilesList()
     }
 
@@ -145,7 +147,7 @@ class DecompressActivity : SimpleActivity() {
             zipInputStream.use {
                 while (true) {
                     val entry = zipInputStream.nextEntry ?: break
-                    val filename = title.toString().substringBeforeLast(".")
+                    val filename = filename.substringBeforeLast(".")
                     val parent = "$destination/$filename"
                     val newPath = "$parent/${entry.fileName.trimEnd('/')}"