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

fix #329, avoid some search glitches related to threading

Browse Source
This commit is contained in:
tibbi 2019-06-21 22:10:04 +02:00
parent 5c2c057c83
commit f99cb03c57
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -40,6 +40,7 @@ class ItemsFragment : Fragment(), ItemOperationsListener, Breadcrumbs.Breadcrumb
private var showHidden = false private var showHidden = false
private var skipItemUpdating = false private var skipItemUpdating = false
private var isSearchOpen = false private var isSearchOpen = false
private var lastSearchedText = ""
private var scrollStates = HashMap<String, Parcelable>() private var scrollStates = HashMap<String, Parcelable>()
private var storedItems = ArrayList<ListItem>() private var storedItems = ArrayList<ListItem>()
@ -266,6 +267,7 @@ class ItemsFragment : Fragment(), ItemOperationsListener, Breadcrumbs.Breadcrumb
fun searchQueryChanged(text: String) { fun searchQueryChanged(text: String) {
val searchText = text.trim() val searchText = text.trim()
lastSearchedText = searchText
Thread { Thread {
if (context == null) { if (context == null) {
return@Thread return@Thread
@ -289,6 +291,10 @@ class ItemsFragment : Fragment(), ItemOperationsListener, Breadcrumbs.Breadcrumb
} }
else -> { else -> {
val files = searchFiles(searchText, currentPath) val files = searchFiles(searchText, currentPath)
if (lastSearchedText != searchText) {
return@Thread
}
val listItems = ArrayList<ListItem>() val listItems = ArrayList<ListItem>()
var previousParent = "" var previousParent = ""
@ -341,6 +347,7 @@ class ItemsFragment : Fragment(), ItemOperationsListener, Breadcrumbs.Breadcrumb
fun searchOpened() { fun searchOpened() {
isSearchOpen = true isSearchOpen = true
lastSearchedText = ""
} }
fun searchClosed() { fun searchClosed() {
@ -349,6 +356,7 @@ class ItemsFragment : Fragment(), ItemOperationsListener, Breadcrumbs.Breadcrumb
getRecyclerAdapter()?.updateItems(storedItems) getRecyclerAdapter()?.updateItems(storedItems)
} }
skipItemUpdating = false skipItemUpdating = false
lastSearchedText = ""
} }
private fun createNewItem() { private fun createNewItem() {