Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed decompressed directory filename not using ZIP name (#120) #125

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixed decompressed directory filename not using ZIP name (#120) #125

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions app/src/main/kotlin/org/fossify/filemanager/activities/DecompressActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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()
}

Expand Down Expand Up @@ -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('/')}"

Expand Down
Loading