fenix
/
Simple-File-Manager
mirror of https://github.com/SimpleMobileTools/Simple-File-Manager.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

improve file unzipping on SD cards

This commit is contained in:
tibbi 2017-09-02 23:32:26 +02:00
parent 02acd5cc84
commit 21b8202fbc
1 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
app/src/main/kotlin/com/simplemobiletools/filemanager/adapters/ItemsAdapter.kt
View File

@ -263,12 +263,20 @@ class ItemsAdapter(val activity: SimpleActivity, var mItems: MutableList<FileDir
val entry = entries.nextElement() val entry = entries.nextElement()
val file = File(it.parent, entry.name) val file = File(it.parent, entry.name)
if (entry.isDirectory) { if (entry.isDirectory) {
file.mkdirs() createDirectory(file) {
val error = String.format(activity.getString(R.string.could_not_create_file), file.absolutePath)
activity.showErrorToast(error)
}
} else { } else {
file.parentFile.mkdirs() createDirectory(file.parentFile) {
if (!it) {
val error = String.format(activity.getString(R.string.could_not_create_file), file.parentFile.absolutePath)
activity.showErrorToast(error)
}
}
val ins = zipFile.getInputStream(entry) val ins = zipFile.getInputStream(entry)
ins.use { ins.use {
ins.copyTo(FileOutputStream(file)) ins.copyTo(getFileOutputStream(file.absolutePath, file.getMimeType()))
} }
} }
} }
@ -280,9 +288,25 @@ class ItemsAdapter(val activity: SimpleActivity, var mItems: MutableList<FileDir
return true return true
} }
private fun createDirectory(file: File, callback: (Boolean) -> Unit) {
if (activity.needsStupidWritePermissions(file.absolutePath)) {
activity.handleSAFDialog(file) {
val documentFile = activity.getFileDocument(file.absolutePath)
if (documentFile == null) {
callback(false)
return@handleSAFDialog
}
val newDir = documentFile.createDirectory(file.name)
callback(newDir != null)
}
} else {
callback(file.mkdirs())
}
}
fun zipPaths(sourcePaths: List<String>, targetPath: String): Boolean { fun zipPaths(sourcePaths: List<String>, targetPath: String): Boolean {
val queue = LinkedList<File>() val queue = LinkedList<File>()
val out = getFileOutputStream(targetPath) val out = getFileOutputStream(targetPath, "application/zip")
val zout = ZipOutputStream(out) val zout = ZipOutputStream(out)
var res: Closeable = out var res: Closeable = out
@ -330,7 +354,7 @@ class ItemsAdapter(val activity: SimpleActivity, var mItems: MutableList<FileDir
return true return true
} }
private fun getFileOutputStream(targetPath: String): OutputStream { private fun getFileOutputStream(targetPath: String, mimeType: String): OutputStream {
val targetFile = File(targetPath) val targetFile = File(targetPath)
return if (activity.needsStupidWritePermissions(targetPath)) { return if (activity.needsStupidWritePermissions(targetPath)) {
@ -340,7 +364,7 @@ class ItemsAdapter(val activity: SimpleActivity, var mItems: MutableList<FileDir
throw IOException(error) throw IOException(error)
} }
val newDocument = documentFile.createFile("application/zip", File(targetPath).name) val newDocument = documentFile.createFile(mimeType, File(targetPath).name)
activity.contentResolver.openOutputStream(newDocument!!.uri) activity.contentResolver.openOutputStream(newDocument!!.uri)
} else { } else {
FileOutputStream(targetFile) FileOutputStream(targetFile)