fenix/Simple-File-Manager
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-File-Manager.git synced 2025-04-15 18:57:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

show the proper files at Decompress Activity

Browse Source
This commit is contained in:
tibbi 2020-05-28 10:50:26 +02:00
parent edecbc6e37
commit a89aa0aa0c
1 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/DecompressActivity.kt
View File

@ -19,6 +19,7 @@ import java.util.zip.ZipEntry
import java.util.zip.ZipInputStream import java.util.zip.ZipInputStream
class DecompressActivity : SimpleActivity() { class DecompressActivity : SimpleActivity() {
private val allFiles = ArrayList<ListItem>()
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
@ -33,9 +34,13 @@ class DecompressActivity : SimpleActivity() {
title = realPath?.getFilenameFromPath() ?: uri.toString().getFilenameFromPath() title = realPath?.getFilenameFromPath() ?: uri.toString().getFilenameFromPath()
try { try {
val listItems = getListItems(uri) fillAllListItems(uri)
val adapter = DecompressItemsAdapter(this, listItems, decompress_list) { } val listItems = getFolderItems("")
decompress_list.adapter = adapter DecompressItemsAdapter(this, listItems, decompress_list) {
}.apply {
decompress_list.adapter = this
}
} catch (e: Exception) { } catch (e: Exception) {
showErrorToast(e) showErrorToast(e)
} }
@ -100,9 +105,20 @@ class DecompressActivity : SimpleActivity() {
} }
} }
private fun getFolderItems(parent: String): ArrayList<ListItem> {
return allFiles.filter {
val fileParent = if (it.path.contains("/")) {
it.path.getParentPath()
} else {
""
}
fileParent == parent
}.toMutableList() as ArrayList<ListItem>
}
@SuppressLint("NewApi") @SuppressLint("NewApi")
private fun getListItems(uri: Uri): ArrayList<ListItem> { private fun fillAllListItems(uri: Uri) {
val listItems = ArrayList<ListItem>()
val inputStream = contentResolver.openInputStream(uri) val inputStream = contentResolver.openInputStream(uri)
val zipInputStream = ZipInputStream(BufferedInputStream(inputStream)) val zipInputStream = ZipInputStream(BufferedInputStream(inputStream))
var zipEntry: ZipEntry? var zipEntry: ZipEntry?
@ -113,14 +129,9 @@ class DecompressActivity : SimpleActivity() {
break break
} }
if (!zipEntry.isDirectory && zipEntry.name.contains("/")) {
continue
}
val lastModified = if (isOreoPlus()) zipEntry.lastModifiedTime.toMillis() else 0 val lastModified = if (isOreoPlus()) zipEntry.lastModifiedTime.toMillis() else 0
val listItem = ListItem(zipEntry.name.removeSuffix("/"), zipEntry.name.removeSuffix("/"), zipEntry.isDirectory, 0, 0L, lastModified, false) val listItem = ListItem(zipEntry.name.removeSuffix("/"), zipEntry.name.removeSuffix("/").getFilenameFromPath(), zipEntry.isDirectory, 0, 0L, lastModified, false)
listItems.add(listItem) allFiles.add(listItem)
} }
return listItems
} }
} }