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

do not cache config at ItemsAdapter to ensure fresh data

This commit is contained in:
tibbi 2017-11-25 20:23:56 +01:00
parent c3ebc1eb3b
commit 97c5d9b530
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -38,7 +38,6 @@ import java.util.zip.ZipOutputStream
class ItemsAdapter(activity: SimpleActivity, var fileDirItems: MutableList<FileDirItem>, val listener: ItemOperationsListener?, recyclerView: MyRecyclerView, class ItemsAdapter(activity: SimpleActivity, var fileDirItems: MutableList<FileDirItem>, val listener: ItemOperationsListener?, recyclerView: MyRecyclerView,
val isPickMultipleIntent: Boolean, itemClick: (Any) -> Unit) : MyRecyclerViewAdapter(activity, recyclerView, itemClick) { val isPickMultipleIntent: Boolean, itemClick: (Any) -> Unit) : MyRecyclerViewAdapter(activity, recyclerView, itemClick) {
private val config = activity.config
lateinit private var folderDrawable: Drawable lateinit private var folderDrawable: Drawable
lateinit private var fileDrawable: Drawable lateinit private var fileDrawable: Drawable
@ -123,11 +122,11 @@ class ItemsAdapter(activity: SimpleActivity, var fileDirItems: MutableList<FileD
private fun showProperties() { private fun showProperties() {
if (selectedPositions.size <= 1) { if (selectedPositions.size <= 1) {
PropertiesDialog(activity, fileDirItems[selectedPositions.first()].path, config.shouldShowHidden) PropertiesDialog(activity, fileDirItems[selectedPositions.first()].path, activity.config.shouldShowHidden)
} else { } else {
val paths = ArrayList<String>() val paths = ArrayList<String>()
selectedPositions.forEach { paths.add(fileDirItems[it].path) } selectedPositions.forEach { paths.add(fileDirItems[it].path) }
PropertiesDialog(activity, paths, config.shouldShowHidden) PropertiesDialog(activity, paths, activity.config.shouldShowHidden)
} }
} }
@ -142,7 +141,8 @@ class ItemsAdapter(activity: SimpleActivity, var fileDirItems: MutableList<FileD
private fun addFileUris(file: File, uris: ArrayList<Uri>) { private fun addFileUris(file: File, uris: ArrayList<Uri>) {
if (file.isDirectory) { if (file.isDirectory) {
file.listFiles()?.filter { if (config.shouldShowHidden) true else !it.isHidden }?.forEach { val shouldShowHidden = activity.config.shouldShowHidden
file.listFiles()?.filter { if (shouldShowHidden) true else !it.isHidden }?.forEach {
addFileUris(it, uris) addFileUris(it, uris)
} }
} else { } else {
@ -173,7 +173,7 @@ class ItemsAdapter(activity: SimpleActivity, var fileDirItems: MutableList<FileD
selectedPositions.forEach { files.add(File(fileDirItems[it].path)) } selectedPositions.forEach { files.add(File(fileDirItems[it].path)) }
val source = if (files[0].isFile) files[0].parent else files[0].absolutePath val source = if (files[0].isFile) files[0].parent else files[0].absolutePath
FilePickerDialog(activity, source, false, 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)
} else { } else {

2
build.gradle
View File

@ -9,7 +9,7 @@ buildscript {
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:3.0.0' classpath 'com.android.tools.build:gradle:3.0.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
// NOTE: Do not place your application dependencies here; they belong // NOTE: Do not place your application dependencies here; they belong