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 with some OTG improvements

Browse Source
This commit is contained in:
tibbi
2018-02-14 23:30:38 +01:00
parent 8ef70a8fe5
commit c340b9860e
6 changed files with 23 additions and 17 deletions
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.15' implementation 'com.simplemobiletools:commons:3.11.35'
implementation files('../libs/RootTools.jar') implementation files('../libs/RootTools.jar')

2
app/src/main/kotlin/com/simplemobiletools/filemanager/activities/MainActivity.kt
View File

@ -202,7 +202,7 @@ class MainActivity : SimpleActivity() {
val file = File(path) val file = File(path)
if (file.exists() && !file.isDirectory) { if (file.exists() && !file.isDirectory) {
newPath = file.parent newPath = file.parent
} else if (!file.exists()) { } else if (!file.exists() && !isPathOnOTG(newPath)) {
newPath = internalStoragePath newPath = internalStoragePath
} }

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

@ -175,10 +175,10 @@ class ItemsAdapter(activity: SimpleActivity, var fileDirItems: MutableList<FileD
} }
private fun copyMoveTo(isCopyOperation: Boolean) { private fun copyMoveTo(isCopyOperation: Boolean) {
val files = ArrayList<File>() val files = ArrayList<FileDirItem>()
selectedPositions.forEach { files.add(File(fileDirItems[it].path)) } selectedPositions.forEach { files.add(FileDirItem(fileDirItems[it].path, fileDirItems[it].name)) }
val source = if (files[0].isFile) files[0].parent else files[0].absolutePath val source = if (!files[0].isDirectory) File(files[0].path).parent else files[0].path
FilePickerDialog(activity, source, false, activity.config.shouldShowHidden, true) { FilePickerDialog(activity, source, false, activity.config.shouldShowHidden, true) {
if (activity.isPathOnRoot(source)) { if (activity.isPathOnRoot(source)) {
copyRootItems(files, it) copyRootItems(files, it)
@ -191,12 +191,12 @@ class ItemsAdapter(activity: SimpleActivity, var fileDirItems: MutableList<FileD
} }
} }
private fun copyRootItems(files: ArrayList<File>, destinationPath: String) { private fun copyRootItems(files: ArrayList<FileDirItem>, destinationPath: String) {
activity.toast(R.string.copying) activity.toast(R.string.copying)
Thread { Thread {
var fileCnt = files.count() var fileCnt = files.count()
files.forEach { files.forEach {
if (RootTools.copyFile(it.absolutePath, destinationPath, false, true)) { if (RootTools.copyFile(it.path, destinationPath, false, true)) {
fileCnt-- fileCnt--
} }
} }
@ -354,14 +354,14 @@ class ItemsAdapter(activity: SimpleActivity, var fileDirItems: MutableList<FileD
return return
} }
val files = ArrayList<File>(selectedPositions.size) val files = ArrayList<FileDirItem>(selectedPositions.size)
val removeFiles = ArrayList<FileDirItem>(selectedPositions.size) val removeFiles = ArrayList<FileDirItem>(selectedPositions.size)
val SAFFile = File(fileDirItems[selectedPositions.first()].path) val SAFFile = File(fileDirItems[selectedPositions.first()].path)
activity.handleSAFDialog(SAFFile) { activity.handleSAFDialog(SAFFile) {
selectedPositions.sortedDescending().forEach { selectedPositions.sortedDescending().forEach {
val file = fileDirItems[it] val file = fileDirItems[it]
files.add(File(file.path)) files.add(FileDirItem(file.path, file.name))
removeFiles.add(file) removeFiles.add(file)
activity.config.removeFavorite(file.path) activity.config.removeFavorite(file.path)
} }

3
app/src/main/kotlin/com/simplemobiletools/filemanager/extensions/Context.kt
View File

@ -2,8 +2,9 @@ package com.simplemobiletools.filemanager.extensions
import android.content.Context import android.content.Context
import com.simplemobiletools.commons.extensions.hasExternalSDCard import com.simplemobiletools.commons.extensions.hasExternalSDCard
import com.simplemobiletools.commons.extensions.isPathOnOTG
import com.simplemobiletools.filemanager.helpers.Config import com.simplemobiletools.filemanager.helpers.Config
val Context.config: Config get() = Config.newInstance(applicationContext) val Context.config: Config get() = Config.newInstance(applicationContext)
fun Context.isPathOnRoot(path: String) = !(path.startsWith(config.internalStoragePath) || (hasExternalSDCard() && path.startsWith(config.sdCardPath))) fun Context.isPathOnRoot(path: String) = !(path.startsWith(config.internalStoragePath) || isPathOnOTG(path) || (hasExternalSDCard() && path.startsWith(config.sdCardPath)))

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

@ -10,6 +10,7 @@ import android.view.ViewGroup
import com.simplemobiletools.commons.activities.BaseSimpleActivity import com.simplemobiletools.commons.activities.BaseSimpleActivity
import com.simplemobiletools.commons.dialogs.StoragePickerDialog import com.simplemobiletools.commons.dialogs.StoragePickerDialog
import com.simplemobiletools.commons.extensions.* import com.simplemobiletools.commons.extensions.*
import com.simplemobiletools.commons.helpers.OTG_PATH
import com.simplemobiletools.commons.helpers.SORT_BY_SIZE import com.simplemobiletools.commons.helpers.SORT_BY_SIZE
import com.simplemobiletools.commons.models.FileDirItem import com.simplemobiletools.commons.models.FileDirItem
import com.simplemobiletools.commons.views.Breadcrumbs import com.simplemobiletools.commons.views.Breadcrumbs
@ -114,7 +115,7 @@ class ItemsFragment : Fragment(), ItemOperationsListener, Breadcrumbs.Breadcrumb
return return
} }
var realPath = path.trimEnd('/') var realPath = if (path == OTG_PATH) OTG_PATH else path.trimEnd('/')
if (realPath.isEmpty()) { if (realPath.isEmpty()) {
realPath = "/" realPath = "/"
} }
@ -174,7 +175,11 @@ class ItemsFragment : Fragment(), ItemOperationsListener, Breadcrumbs.Breadcrumb
skipItemUpdating = false skipItemUpdating = false
Thread { Thread {
if (activity?.isActivityDestroyed() == false) { if (activity?.isActivityDestroyed() == false) {
if (!context!!.config.enableRootAccess || !context!!.isPathOnRoot(path)) { if (context!!.isPathOnOTG(path)) {
context!!.getOTGItems(path) {
callback(path, it)
}
} else if (!context!!.config.enableRootAccess || !context!!.isPathOnRoot(path)) {
getRegularItemsOf(path, callback) getRegularItemsOf(path, callback)
} else { } else {
RootHelpers().getFiles(activity as SimpleActivity, path, callback) RootHelpers().getFiles(activity as SimpleActivity, path, callback)
@ -281,7 +286,7 @@ class ItemsFragment : Fragment(), ItemOperationsListener, Breadcrumbs.Breadcrumb
override fun breadcrumbClicked(id: Int) { override fun breadcrumbClicked(id: Int) {
if (id == 0) { if (id == 0) {
StoragePickerDialog(activity!!, currentPath) { StoragePickerDialog(activity as SimpleActivity, currentPath) {
openPath(it) openPath(it)
} }
} else { } else {
@ -294,9 +299,9 @@ class ItemsFragment : Fragment(), ItemOperationsListener, Breadcrumbs.Breadcrumb
openPath(currentPath) openPath(currentPath)
} }
override fun deleteFiles(files: ArrayList<File>) { override fun deleteFiles(files: ArrayList<FileDirItem>) {
val hasFolder = files.any { it.isDirectory } val hasFolder = files.any { it.isDirectory }
if (context!!.isPathOnRoot(files.firstOrNull()?.absolutePath ?: context!!.config.internalStoragePath)) { if (context!!.isPathOnRoot(files.firstOrNull()?.path ?: context!!.config.internalStoragePath)) {
files.forEach { files.forEach {
RootTools.deleteFileOrDirectory(it.path, false) RootTools.deleteFileOrDirectory(it.path, false)
} }

4
app/src/main/kotlin/com/simplemobiletools/filemanager/interfaces/ItemOperationsListener.kt
View File

@ -1,12 +1,12 @@
package com.simplemobiletools.filemanager.interfaces package com.simplemobiletools.filemanager.interfaces
import java.io.File import com.simplemobiletools.commons.models.FileDirItem
import java.util.* import java.util.*
interface ItemOperationsListener { interface ItemOperationsListener {
fun refreshItems() fun refreshItems()
fun deleteFiles(files: ArrayList<File>) fun deleteFiles(files: ArrayList<FileDirItem>)
fun selectedPaths(paths: ArrayList<String>) fun selectedPaths(paths: ArrayList<String>)
} }