Skip to content

Fix: Preserve timestamps when decompressing folders #190 #422

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

Open
jalbaali wants to merge 3 commits into
base: main
Choose a base branch
from
+22 −6
Open

Fix: Preserve timestamps when decompressing folders #190 #422

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dfd7995
Fix: Decompress folder retain their original timestamps
jalbaali Apr 3, 2026
6e264e9
Merge branch 'main' into issue-190
jalbaali Apr 9, 2026
4494f15
Fix: Preserve folder timestamps when decompressing
jalbaali Apr 15, 2026
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
12 changes: 10 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 @@ -155,6 +155,7 @@ class DecompressActivity : SimpleActivity() {
zipInputStream.setPassword(password?.toCharArray())
}
val buffer = ByteArray(1024)
val foldersTimestamp = mutableListOf<Pair<File, LocalFileHeader>>()

zipInputStream.use {
while (true) {
Expand All @@ -163,16 +164,21 @@ class DecompressActivity : SimpleActivity() {
val parent = "$destination/$filename"
val newPath = "$parent/${entry.fileName.trimEnd('/')}"


if (!getDoesFilePathExist(parent)) {
if (!createDirectorySync(parent)) {
continue
}
}

if (entry.isDirectory) {
val dir = File(newPath)
if (!dir.exists()) {
dir.mkdirs()
}
foldersTimestamp.add(Pair(dir, entry))
continue
}

val outputFile = File(newPath)

val isVulnerableForZipPathTraversal = !outputFile.canonicalPath.startsWith(parent)
Expand All @@ -193,7 +199,9 @@ class DecompressActivity : SimpleActivity() {
fos!!.close()
outputFile.setLastModified(entry)
}

for ((dir, entry) in foldersTimestamp.asReversed()) {
dir.setLastModified(entry)
}
toast(R.string.decompression_successful)
finish()
}
Expand Down
16 changes: 12 additions & 4 deletions app/src/main/kotlin/org/fossify/filemanager/adapters/ItemsAdapter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -720,6 +720,8 @@ class ItemsAdapter(
paths.forEach { path ->
val zipInputStream =
ZipInputStream(BufferedInputStream(activity.getFileInputStreamSync(path)))

val foldersTimestamp = mutableListOf<Pair<File, LocalFileHeader>>()
zipInputStream.use {
try {
var entry = zipInputStream.nextEntry
Expand All @@ -740,26 +742,29 @@ class ItemsAdapter(
if (activity.getIsPathDirectory(path)) {
activity.deleteFolderBg(fileDirItem, false) {
if (it) {
extractEntry(newPath, entry, zipInputStream)
extractEntry(newPath, entry, zipInputStream, foldersTimestamp)
} else {
callback(false)
}
}
} else {
activity.deleteFileBg(fileDirItem, false, false) {
if (it) {
extractEntry(newPath, entry, zipInputStream)
extractEntry(newPath, entry, zipInputStream, foldersTimestamp)
} else {
callback(false)
}
}
}
} else if (!doesPathExist) {
extractEntry(newPath, entry, zipInputStream)
extractEntry(newPath, entry, zipInputStream, foldersTimestamp)
}

entry = zipInputStream.nextEntry
}
for ((dir, header) in foldersTimestamp.asReversed()) {
dir.setLastModified(header)
}
callback(true)
} catch (e: Exception) {
activity.showErrorToast(e)
Expand All @@ -772,13 +777,16 @@ class ItemsAdapter(
private fun extractEntry(
newPath: String,
entry: LocalFileHeader,
zipInputStream: ZipInputStream
zipInputStream: ZipInputStream,
foldersTimestamp: MutableList<Pair<File, LocalFileHeader>>
) {
if (entry.isDirectory) {
if (!activity.createDirectorySync(newPath) && !activity.getDoesFilePathExist(newPath)) {
val error =
String.format(activity.getString(R.string.could_not_create_file), newPath)
activity.showErrorToast(error)
} else {
foldersTimestamp.add(Pair(File(newPath), entry))
}
} else {
val fos = activity.getFileOutputStreamSync(newPath, newPath.getMimeType())
Expand Down
Loading