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

updating commons to 3.11.52

Browse Source
This commit is contained in:
tibbi 2018-02-16 18:30:21 +01:00
parent 1c02c8b16e
commit ad2c644f29
6 changed files with 25 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@ -45,7 +45,7 @@ ext {
} }
dependencies { dependencies {
implementation 'com.simplemobiletools:commons:3.11.45' implementation 'com.simplemobiletools:commons:3.11.52'
implementation files('../libs/RootTools.jar') implementation files('../libs/RootTools.jar')

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

@ -183,7 +183,7 @@ class ItemsAdapter(activity: SimpleActivity, var fileDirItems: MutableList<FileD
selectedPositions.forEach { files.add(fileDirItems[it]) } selectedPositions.forEach { files.add(fileDirItems[it]) }
val firstFile = files[0] val firstFile = files[0]
val source = if (!firstFile.isDirectory) firstFile.path.substring(0, firstFile.path.length - firstFile.name.length) else firstFile.path val source = if (firstFile.isDirectory) firstFile.path else firstFile.getParentPath()
FilePickerDialog(activity, source, false, activity.config.shouldShowHidden, true) { FilePickerDialog(activity, source, false, activity.config.shouldShowHidden, true) {
if (activity.isPathOnRoot(it)) { if (activity.isPathOnRoot(it)) {
copyRootItems(files, it) copyRootItems(files, it)

12
app/src/main/kotlin/com/simplemobiletools/filemanager/dialogs/CompressAsDialog.kt
View File

@ -9,17 +9,15 @@ import com.simplemobiletools.commons.extensions.*
import com.simplemobiletools.filemanager.R import com.simplemobiletools.filemanager.R
import com.simplemobiletools.filemanager.extensions.config import com.simplemobiletools.filemanager.extensions.config
import kotlinx.android.synthetic.main.dialog_compress_as.view.* import kotlinx.android.synthetic.main.dialog_compress_as.view.*
import java.io.File
class CompressAsDialog(val activity: BaseSimpleActivity, val path: String, val callback: (destination: String) -> Unit) { class CompressAsDialog(val activity: BaseSimpleActivity, val path: String, val callback: (destination: String) -> Unit) {
private val view = activity.layoutInflater.inflate(R.layout.dialog_compress_as, null) private val view = activity.layoutInflater.inflate(R.layout.dialog_compress_as, null)
init { init {
val file = File(path)
val filename = path.getFilenameFromPath() val filename = path.getFilenameFromPath()
val indexOfDot = if (filename.contains('.') && file.isFile) filename.lastIndexOf(".") else filename.length val indexOfDot = if (filename.contains('.') && !activity.getIsPathDirectory(path)) filename.lastIndexOf(".") else filename.length
val baseFilename = filename.substring(0, indexOfDot) val baseFilename = filename.substring(0, indexOfDot)
var realPath = file.parent.trimEnd('/') var realPath = path.getParentPath()
view.apply { view.apply {
file_name.setText(baseFilename) file_name.setText(baseFilename)
@ -44,14 +42,14 @@ class CompressAsDialog(val activity: BaseSimpleActivity, val path: String, val c
when { when {
name.isEmpty() -> activity.toast(R.string.empty_name) name.isEmpty() -> activity.toast(R.string.empty_name)
name.isAValidFilename() -> { name.isAValidFilename() -> {
val newFile = File(realPath, "$name.zip") val newPath = "$realPath/$name.zip"
if (newFile.exists()) { if (activity.doesFilePathExist(newPath)) {
activity.toast(R.string.name_taken) activity.toast(R.string.name_taken)
return@OnClickListener return@OnClickListener
} }
dismiss() dismiss()
callback(newFile.absolutePath) callback(newPath)
} }
else -> activity.toast(R.string.invalid_name) else -> activity.toast(R.string.invalid_name)
} }

14
app/src/main/kotlin/com/simplemobiletools/filemanager/dialogs/CreateNewItemDialog.kt
View File

@ -25,18 +25,18 @@ class CreateNewItemDialog(val activity: BaseSimpleActivity, val path: String, va
if (name.isEmpty()) { if (name.isEmpty()) {
activity.toast(R.string.empty_name) activity.toast(R.string.empty_name)
} else if (name.isAValidFilename()) { } else if (name.isAValidFilename()) {
val file = File(path, name) val newPath = "$path/$name"
if (file.exists()) { if (activity.doesFilePathExist(newPath)) {
activity.toast(R.string.name_taken) activity.toast(R.string.name_taken)
return@OnClickListener return@OnClickListener
} }
if (view.dialog_radio_group.checkedRadioButtonId == R.id.dialog_radio_directory) { if (view.dialog_radio_group.checkedRadioButtonId == R.id.dialog_radio_directory) {
createDirectory("$path/$name", this) { createDirectory(newPath, this) {
callback(it) callback(it)
} }
} else { } else {
createFile("$path/$name", this) { createFile(newPath, this) {
callback(it) callback(it)
} }
} }
@ -51,7 +51,7 @@ class CreateNewItemDialog(val activity: BaseSimpleActivity, val path: String, va
private fun createDirectory(path: String, alertDialog: AlertDialog, callback: (Boolean) -> Unit) { private fun createDirectory(path: String, alertDialog: AlertDialog, callback: (Boolean) -> Unit) {
when { when {
activity.needsStupidWritePermissions(this.path) -> activity.handleSAFDialog(path) { activity.needsStupidWritePermissions(this.path) -> activity.handleSAFDialog(path) {
val documentFile = activity.getDocumentFile(path) val documentFile = activity.getDocumentFile(path.getParentPath())
if (documentFile == null) { if (documentFile == null) {
val error = String.format(activity.getString(R.string.could_not_create_folder), path) val error = String.format(activity.getString(R.string.could_not_create_folder), path)
activity.showErrorToast(error) activity.showErrorToast(error)
@ -72,14 +72,14 @@ class CreateNewItemDialog(val activity: BaseSimpleActivity, val path: String, va
try { try {
if (activity.needsStupidWritePermissions(path)) { if (activity.needsStupidWritePermissions(path)) {
activity.handleSAFDialog(path) { activity.handleSAFDialog(path) {
val documentFile = activity.getDocumentFile(path) val documentFile = activity.getDocumentFile(path.getParentPath())
if (documentFile == null) { if (documentFile == null) {
val error = String.format(activity.getString(R.string.could_not_create_file), path) val error = String.format(activity.getString(R.string.could_not_create_file), path)
activity.showErrorToast(error) activity.showErrorToast(error)
callback(false) callback(false)
return@handleSAFDialog return@handleSAFDialog
} }
documentFile.createFile("", path.getFilenameFromPath()) documentFile.createFile(path.getMimeType(), path.getFilenameFromPath())
success(alertDialog) success(alertDialog)
} }
} else if (File(path).createNewFile()) { } else if (File(path).createNewFile()) {

18
app/src/main/kotlin/com/simplemobiletools/filemanager/dialogs/SaveAsDialog.kt
View File

@ -8,16 +8,15 @@ import com.simplemobiletools.commons.dialogs.FilePickerDialog
import com.simplemobiletools.commons.extensions.* import com.simplemobiletools.commons.extensions.*
import com.simplemobiletools.filemanager.R import com.simplemobiletools.filemanager.R
import kotlinx.android.synthetic.main.dialog_save_as.view.* import kotlinx.android.synthetic.main.dialog_save_as.view.*
import java.io.File
class SaveAsDialog(val activity: BaseSimpleActivity, var path: String, val callback: (savePath: String) -> Unit) { class SaveAsDialog(val activity: BaseSimpleActivity, var path: String, val callback: (savePath: String) -> Unit) {
init { init {
if (path.isEmpty()) { if (path.isEmpty()) {
path = "${activity.internalStoragePath}/${System.currentTimeMillis()}.txt" path = "${activity.internalStoragePath}/${activity.getCurrentFormattedDateTime()}.txt"
} }
var realPath = File(path).parent.trimEnd('/') var realPath = path.getParentPath()
val view = activity.layoutInflater.inflate(R.layout.dialog_save_as, null).apply { val view = activity.layoutInflater.inflate(R.layout.dialog_save_as, null).apply {
save_as_path.text = activity.humanizePath(realPath) save_as_path.text = activity.humanizePath(realPath)
@ -60,20 +59,21 @@ class SaveAsDialog(val activity: BaseSimpleActivity, var path: String, val callb
return@setOnClickListener return@setOnClickListener
} }
val newFile = File(realPath, "$filename.$extension") val newFilename = "$filename.$extension"
if (!newFile.name.isAValidFilename()) { val newPath = "$realPath/$newFilename"
if (!newFilename.isAValidFilename()) {
activity.toast(R.string.filename_invalid_characters) activity.toast(R.string.filename_invalid_characters)
return@setOnClickListener return@setOnClickListener
} }
if (newFile.exists()) { if (activity.doesFilePathExist(newPath)) {
val title = String.format(activity.getString(R.string.file_already_exists_overwrite), newFile.name) val title = String.format(activity.getString(R.string.file_already_exists_overwrite), newFilename)
ConfirmationDialog(activity, title) { ConfirmationDialog(activity, title) {
callback(newFile.absolutePath) callback(newPath)
dismiss() dismiss()
} }
} else { } else {
callback(newFile.absolutePath) callback(newPath)
dismiss() dismiss()
} }
} }

31
app/src/main/kotlin/com/simplemobiletools/filemanager/fragments/ItemsFragment.kt
View File

@ -200,8 +200,8 @@ class ItemsFragment : Fragment(), ItemOperationsListener, Breadcrumbs.Breadcrumb
continue continue
} }
val children = getChildrenCount(file) val children = file.getDirectChildrenCount(showHidden)
val size = if (file.isDirectory && context?.config?.sorting == SORT_BY_SIZE) getDirectorySize(file) else file.length() val size = if (file.isDirectory && context?.config?.sorting == SORT_BY_SIZE) file.getProperSize(showHidden) else file.length()
val fileDirItem = FileDirItem(curPath, curName, file.isDirectory, children, size) val fileDirItem = FileDirItem(curPath, curName, file.isDirectory, children, size)
items.add(fileDirItem) items.add(fileDirItem)
} }
@ -209,33 +209,6 @@ class ItemsFragment : Fragment(), ItemOperationsListener, Breadcrumbs.Breadcrumb
callback(path, items) callback(path, items)
} }
private fun getChildrenCount(file: File): Int {
val fileList: Array<out String>? = file.list() ?: return 0
if (file.isDirectory) {
return if (showHidden) {
fileList!!.size
} else {
fileList!!.count { fileName -> fileName[0] != '.' }
}
}
return 0
}
private fun getDirectorySize(directory: File): Long {
if (directory.exists()) {
val fileList = directory.listFiles() ?: return 0
return fileList.indices.map {
if (fileList[it].isDirectory) {
getDirectorySize(fileList[it])
} else {
fileList[it].length()
}
}.sum()
}
return 0
}
private fun itemClicked(item: FileDirItem) { private fun itemClicked(item: FileDirItem) {
if (item.isDirectory) { if (item.isDirectory) {
(activity as? MainActivity)?.apply { (activity as? MainActivity)?.apply {