extract zip to correct path

This commit is contained in:
tufteddeer 2019-05-04 17:10:05 +02:00
parent 253db88d0d
commit e161042e69
No known key found for this signature in database
GPG Key ID: 3A364770769E47B5
1 changed files with 3 additions and 1 deletions

View File

@ -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()