wbrawner/Simple-File-Manager
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

make sure the activity is alive at getting the items

Browse source
This commit is contained in:
tibbi 2018-01-07 21:14:04 +01:00
parent bf843e46dc
commit 5214659295
1 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
app/src/main/kotlin/com/simplemobiletools/filemanager/fragments/ItemsFragment.kt
View file

@ -169,14 +169,12 @@ class ItemsFragment : Fragment(), ItemsAdapter.ItemOperationsListener, Breadcrum
private fun getItems(path: String, callback: (items: ArrayList<FileDirItem>) -> Unit) { private fun getItems(path: String, callback: (items: ArrayList<FileDirItem>) -> Unit) {
Thread { Thread {
if (activity?.isActivityDestroyed() == true) { if (activity?.isActivityDestroyed() == false) {
return@Thread if (!context!!.config.enableRootAccess || !context!!.isPathOnRoot(path)) {
} getRegularItemsOf(path, callback)
} else {
if (!context!!.config.enableRootAccess || !context!!.isPathOnRoot(path)) { RootHelpers().getFiles(activity as SimpleActivity, path, callback)
getRegularItemsOf(path, callback) }
} else {
RootHelpers().getFiles(activity as SimpleActivity, path, callback)
} }
}.start() }.start()
} }
@ -192,7 +190,7 @@ class ItemsFragment : Fragment(), ItemsAdapter.ItemOperationsListener, Breadcrum
continue continue
val children = getChildrenCount(file) val children = getChildrenCount(file)
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) getDirectorySize(file) 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)
} }