mirror of
https://github.com/SimpleMobileTools/Simple-File-Manager.git
synced 2025-06-05 22:09:15 +02:00
update commons to 3.12.17
This commit is contained in:
@ -45,7 +45,7 @@ ext {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
implementation 'com.simplemobiletools:commons:3.12.5'
|
implementation 'com.simplemobiletools:commons:3.12.17'
|
||||||
|
|
||||||
implementation files('../libs/RootTools.jar')
|
implementation files('../libs/RootTools.jar')
|
||||||
|
|
||||||
|
@ -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() && !isPathOnOTG(newPath)) {
|
} else if (!file.exists() && !newPath.startsWith(OTG_PATH)) {
|
||||||
newPath = internalStoragePath
|
newPath = internalStoragePath
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -20,6 +20,7 @@ import com.simplemobiletools.commons.dialogs.RenameItemDialog
|
|||||||
import com.simplemobiletools.commons.extensions.*
|
import com.simplemobiletools.commons.extensions.*
|
||||||
import com.simplemobiletools.commons.helpers.CONFLICT_OVERWRITE
|
import com.simplemobiletools.commons.helpers.CONFLICT_OVERWRITE
|
||||||
import com.simplemobiletools.commons.helpers.CONFLICT_SKIP
|
import com.simplemobiletools.commons.helpers.CONFLICT_SKIP
|
||||||
|
import com.simplemobiletools.commons.helpers.OTG_PATH
|
||||||
import com.simplemobiletools.commons.models.FileDirItem
|
import com.simplemobiletools.commons.models.FileDirItem
|
||||||
import com.simplemobiletools.commons.views.FastScroller
|
import com.simplemobiletools.commons.views.FastScroller
|
||||||
import com.simplemobiletools.commons.views.MyRecyclerView
|
import com.simplemobiletools.commons.views.MyRecyclerView
|
||||||
@ -154,7 +155,7 @@ class ItemsAdapter(activity: SimpleActivity, var fileDirItems: MutableList<FileD
|
|||||||
private fun addFileUris(path: String, paths: ArrayList<String>) {
|
private fun addFileUris(path: String, paths: ArrayList<String>) {
|
||||||
if (activity.getIsPathDirectory(path)) {
|
if (activity.getIsPathDirectory(path)) {
|
||||||
val shouldShowHidden = activity.config.shouldShowHidden
|
val shouldShowHidden = activity.config.shouldShowHidden
|
||||||
if (activity.isPathOnOTG(path)) {
|
if (path.startsWith(OTG_PATH)) {
|
||||||
activity.getDocumentFile(path)?.listFiles()?.filter { if (shouldShowHidden) true else !it.name.startsWith(".") }?.forEach {
|
activity.getDocumentFile(path)?.listFiles()?.filter { if (shouldShowHidden) true else !it.name.startsWith(".") }?.forEach {
|
||||||
addFileUris(it.uri.toString(), paths)
|
addFileUris(it.uri.toString(), paths)
|
||||||
}
|
}
|
||||||
@ -227,7 +228,7 @@ class ItemsAdapter(activity: SimpleActivity, var fileDirItems: MutableList<FileD
|
|||||||
|
|
||||||
private fun compressSelection() {
|
private fun compressSelection() {
|
||||||
val firstPath = fileDirItems[selectedPositions.first()].path
|
val firstPath = fileDirItems[selectedPositions.first()].path
|
||||||
if (activity.isPathOnOTG(firstPath)) {
|
if (firstPath.startsWith(OTG_PATH)) {
|
||||||
activity.toast(R.string.unknown_error_occurred)
|
activity.toast(R.string.unknown_error_occurred)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@ -253,7 +254,7 @@ class ItemsAdapter(activity: SimpleActivity, var fileDirItems: MutableList<FileD
|
|||||||
|
|
||||||
private fun decompressSelection() {
|
private fun decompressSelection() {
|
||||||
val firstPath = fileDirItems[selectedPositions.first()].path
|
val firstPath = fileDirItems[selectedPositions.first()].path
|
||||||
if (activity.isPathOnOTG(firstPath)) {
|
if (firstPath.startsWith(OTG_PATH)) {
|
||||||
activity.toast(R.string.unknown_error_occurred)
|
activity.toast(R.string.unknown_error_occurred)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
@ -2,9 +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.commons.helpers.OTG_PATH
|
||||||
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) || isPathOnOTG(path) || (hasExternalSDCard() && path.startsWith(config.sdCardPath)))
|
fun Context.isPathOnRoot(path: String) = !(path.startsWith(config.internalStoragePath) || path.startsWith(OTG_PATH) || (hasExternalSDCard() && path.startsWith(config.sdCardPath)))
|
||||||
|
@ -175,7 +175,7 @@ class ItemsFragment : Fragment(), ItemOperationsListener, Breadcrumbs.Breadcrumb
|
|||||||
skipItemUpdating = false
|
skipItemUpdating = false
|
||||||
Thread {
|
Thread {
|
||||||
if (activity?.isActivityDestroyed() == false) {
|
if (activity?.isActivityDestroyed() == false) {
|
||||||
if (context!!.isPathOnOTG(path)) {
|
if (path.startsWith(OTG_PATH)) {
|
||||||
val getProperFileSize = context!!.config.sorting and SORT_BY_SIZE != 0
|
val getProperFileSize = context!!.config.sorting and SORT_BY_SIZE != 0
|
||||||
context!!.getOTGItems(path, context!!.config.shouldShowHidden, getProperFileSize) {
|
context!!.getOTGItems(path, context!!.config.shouldShowHidden, getProperFileSize) {
|
||||||
callback(path, it)
|
callback(path, it)
|
||||||
|
@ -3,8 +3,8 @@ package com.simplemobiletools.filemanager.helpers
|
|||||||
import android.content.Context
|
import android.content.Context
|
||||||
import com.simplemobiletools.commons.extensions.getDocumentFile
|
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.helpers.BaseConfig
|
import com.simplemobiletools.commons.helpers.BaseConfig
|
||||||
|
import com.simplemobiletools.commons.helpers.OTG_PATH
|
||||||
import java.io.File
|
import java.io.File
|
||||||
|
|
||||||
class Config(context: Context) : BaseConfig(context) {
|
class Config(context: Context) : BaseConfig(context) {
|
||||||
@ -26,8 +26,8 @@ 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.getDocumentFile(path)?.isDirectory != true) ||
|
(path.startsWith(OTG_PATH) && context.getDocumentFile(path)?.isDirectory != true) ||
|
||||||
(!context.isPathOnOTG(path) && !File(path).isDirectory)) {
|
(!path.startsWith(OTG_PATH) && !File(path).isDirectory)) {
|
||||||
path = context.getInternalStoragePath()
|
path = context.getInternalStoragePath()
|
||||||
homeFolder = path
|
homeFolder = path
|
||||||
}
|
}
|
||||||
|
@ -105,10 +105,12 @@ class RootHelpers {
|
|||||||
files.forEachIndexed { index, fileDirItem ->
|
files.forEachIndexed { index, fileDirItem ->
|
||||||
var line = lines[index]
|
var line = lines[index]
|
||||||
if (line.isNotEmpty() && line != "0") {
|
if (line.isNotEmpty() && line != "0") {
|
||||||
line = line.substring(fileDirItem.path.length).trim()
|
if (line.length >= fileDirItem.path.length) {
|
||||||
val size = line.split(" ")[0]
|
line = line.substring(fileDirItem.path.length).trim()
|
||||||
if (size.areDigitsOnly()) {
|
val size = line.split(" ")[0]
|
||||||
fileDirItem.size = size.toLong()
|
if (size.areDigitsOnly()) {
|
||||||
|
fileDirItem.size = size.toLong()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user