fenix/Simple-File-Manager
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-File-Manager.git synced 2025-06-05 22:09:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

update commons to 3.11.42

Browse Source
This commit is contained in:
tibbi 2018-02-15 22:04:01 +01:00
parent 345af31cd0
commit ce9da1b173
6 changed files with 12 additions and 16 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.38' implementation 'com.simplemobiletools:commons:3.11.42'
implementation files('../libs/RootTools.jar') implementation files('../libs/RootTools.jar')

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

@ -180,11 +180,12 @@ class ItemsAdapter(activity: SimpleActivity, var fileDirItems: MutableList<FileD
private fun copyMoveTo(isCopyOperation: Boolean) { private fun copyMoveTo(isCopyOperation: Boolean) {
val files = ArrayList<FileDirItem>() val files = ArrayList<FileDirItem>()
selectedPositions.forEach { fileDirItems[it] } selectedPositions.forEach { files.add(fileDirItems[it]) }
val source = if (!files[0].isDirectory) File(files[0].path).parent else files[0].path val firstFile = files[0]
val source = if (!firstFile.isDirectory) firstFile.path.substring(0, firstFile.path.length - firstFile.name.length) else firstFile.path
FilePickerDialog(activity, source, false, activity.config.shouldShowHidden, true) { FilePickerDialog(activity, source, false, activity.config.shouldShowHidden, true) {
if (activity.isPathOnRoot(source)) { if (activity.isPathOnRoot(it)) {
copyRootItems(files, it) copyRootItems(files, it)
} else { } else {
activity.copyMoveFilesTo(files, source, it, isCopyOperation, false, activity.config.shouldShowHidden) { activity.copyMoveFilesTo(files, source, it, isCopyOperation, false, activity.config.shouldShowHidden) {
@ -268,7 +269,7 @@ class ItemsAdapter(activity: SimpleActivity, var fileDirItems: MutableList<FileD
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) {
if (!activity.createDirectorySync(file)) { if (!activity.createDirectorySync(file.absolutePath)) {
val error = String.format(activity.getString(R.string.could_not_create_file), file.absolutePath) val error = String.format(activity.getString(R.string.could_not_create_file), file.absolutePath)
activity.showErrorToast(error) activity.showErrorToast(error)
return false return false

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

@ -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.getFileDocument(path) val documentFile = activity.getDocumentFile(path)
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,7 +72,7 @@ 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.getFileDocument(path) val documentFile = activity.getDocumentFile(path)
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)

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

@ -176,7 +176,8 @@ class ItemsFragment : Fragment(), ItemOperationsListener, Breadcrumbs.Breadcrumb
Thread { Thread {
if (activity?.isActivityDestroyed() == false) { if (activity?.isActivityDestroyed() == false) {
if (context!!.isPathOnOTG(path)) { if (context!!.isPathOnOTG(path)) {
context!!.getOTGItems(path) { val getProperFileSize = context!!.config.sorting and SORT_BY_SIZE != 0
context!!.getOTGItems(path, context!!.config.shouldShowHidden, getProperFileSize) {
callback(path, it) callback(path, it)
} }
} else if (!context!!.config.enableRootAccess || !context!!.isPathOnRoot(path)) { } else if (!context!!.config.enableRootAccess || !context!!.isPathOnRoot(path)) {

9
app/src/main/kotlin/com/simplemobiletools/filemanager/helpers/Config.kt
View File

@ -1,11 +1,10 @@
package com.simplemobiletools.filemanager.helpers package com.simplemobiletools.filemanager.helpers
import android.content.Context import android.content.Context
import com.simplemobiletools.commons.extensions.getFileDocument import com.simplemobiletools.commons.extensions.getDocumentFile
import com.simplemobiletools.commons.extensions.getInternalStoragePath import com.simplemobiletools.commons.extensions.getInternalStoragePath
import com.simplemobiletools.commons.extensions.isPathOnOTG import com.simplemobiletools.commons.extensions.isPathOnOTG
import com.simplemobiletools.commons.helpers.BaseConfig import com.simplemobiletools.commons.helpers.BaseConfig
import com.simplemobiletools.commons.helpers.SORT_BY_NAME
import java.io.File import java.io.File
class Config(context: Context) : BaseConfig(context) { class Config(context: Context) : BaseConfig(context) {
@ -27,7 +26,7 @@ class Config(context: Context) : BaseConfig(context) {
get(): String { get(): String {
var path = prefs.getString(HOME_FOLDER, "") var path = prefs.getString(HOME_FOLDER, "")
if (path.isEmpty() || if (path.isEmpty() ||
(context.isPathOnOTG(path) && context.getFileDocument(path)?.isDirectory != true) || (context.isPathOnOTG(path) && context.getDocumentFile(path)?.isDirectory != true) ||
(!context.isPathOnOTG(path) && !File(path).isDirectory)) { (!context.isPathOnOTG(path) && !File(path).isDirectory)) {
path = context.getInternalStoragePath() path = context.getInternalStoragePath()
homeFolder = path homeFolder = path
@ -67,10 +66,6 @@ class Config(context: Context) : BaseConfig(context) {
get() = prefs.getStringSet(FAVORITES, HashSet<String>()) get() = prefs.getStringSet(FAVORITES, HashSet<String>())
set(favorites) = prefs.edit().remove(FAVORITES).putStringSet(FAVORITES, favorites).apply() set(favorites) = prefs.edit().remove(FAVORITES).putStringSet(FAVORITES, favorites).apply()
var sorting: Int
get() = prefs.getInt(SORT_ORDER, SORT_BY_NAME)
set(sorting) = prefs.edit().putInt(SORT_ORDER, sorting).apply()
fun saveFolderSorting(path: String, value: Int) { fun saveFolderSorting(path: String, value: Int) {
if (path.isEmpty()) { if (path.isEmpty()) {
sorting = value sorting = value

1
app/src/main/kotlin/com/simplemobiletools/filemanager/helpers/Constants.kt
View File

@ -6,7 +6,6 @@ const val PATH = "path"
const val SHOW_HIDDEN = "show_hidden" const val SHOW_HIDDEN = "show_hidden"
const val HOME_FOLDER = "home_folder" const val HOME_FOLDER = "home_folder"
const val FAVORITES = "favorites" const val FAVORITES = "favorites"
const val SORT_ORDER = "sort_order"
const val SORT_FOLDER_PREFIX = "sort_folder_" const val SORT_FOLDER_PREFIX = "sort_folder_"
const val TEMPORARILY_SHOW_HIDDEN = "temporarily_show_hidden" const val TEMPORARILY_SHOW_HIDDEN = "temporarily_show_hidden"
const val IS_ROOT_AVAILABLE = "is_root_available" const val IS_ROOT_AVAILABLE = "is_root_available"