TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-04-23 05:01:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed list query not being disposed so it could occasionally crash due to several changes rewriting each other

Browse Source
This commit is contained in:
Viktor De Pasquale 2019-04-22 18:28:40 +02:00
parent 2de984ae24
commit d4058175b4
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/java/com/topjohnwu/magisk/ui/module/ModuleViewModel.kt
View File

@ -26,6 +26,7 @@ import com.topjohnwu.magisk.utils.Utils
import com.topjohnwu.magisk.utils.toSingle import com.topjohnwu.magisk.utils.toSingle
import com.topjohnwu.magisk.utils.update import com.topjohnwu.magisk.utils.update
import io.reactivex.Single import io.reactivex.Single
import io.reactivex.disposables.Disposable
import me.tatarka.bindingcollectionadapter2.OnItemBind import me.tatarka.bindingcollectionadapter2.OnItemBind
class ModuleViewModel( class ModuleViewModel(
@ -44,8 +45,13 @@ class ModuleViewModel(
itemBinding.bindExtra(BR.viewModel, this@ModuleViewModel) itemBinding.bindExtra(BR.viewModel, this@ModuleViewModel)
} }
private var queryDisposable: Disposable? = null
init { init {
query.addOnPropertyChangedCallback { query() } query.addOnPropertyChangedCallback {
queryDisposable?.dispose()
queryDisposable = query()
}
Event.register(this) Event.register(this)
refresh() refresh()
} }
@ -88,7 +94,6 @@ class ModuleViewModel(
private fun query() = queryRaw() private fun query() = queryRaw()
.subscribeK { itemsRemote.update(it.first, it.second) } .subscribeK { itemsRemote.update(it.first, it.second) }
.add()
private fun queryRaw(query: String = this.query.value) = allItems.toSingle() private fun queryRaw(query: String = this.query.value) = allItems.toSingle()
.map { it.filterIsInstance<RepoRvItem>() } .map { it.filterIsInstance<RepoRvItem>() }