TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-03-29 18:42:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clear up RxJava from ViewModels

Browse Source
This commit is contained in:
topjohnwu 2020-07-09 05:15:53 -07:00
parent a97d278bcd
commit f7a650b9a4
1 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/java/com/topjohnwu/magisk/ui/base/BaseViewModel.kt
View File

@ -18,8 +18,6 @@ import com.topjohnwu.magisk.extensions.value
import com.topjohnwu.magisk.model.events.* import com.topjohnwu.magisk.model.events.*
import com.topjohnwu.magisk.model.navigation.NavigationWrapper import com.topjohnwu.magisk.model.navigation.NavigationWrapper
import com.topjohnwu.magisk.model.observer.Observer import com.topjohnwu.magisk.model.observer.Observer
import io.reactivex.disposables.CompositeDisposable
import io.reactivex.disposables.Disposable
import kotlinx.coroutines.Job import kotlinx.coroutines.Job
import org.koin.core.KoinComponent import org.koin.core.KoinComponent
@ -45,9 +43,7 @@ abstract class BaseViewModel(
notifyStateChanged() notifyStateChanged()
} }
private val disposables = CompositeDisposable()
private val _viewEvents = MutableLiveData<ViewEvent>() private val _viewEvents = MutableLiveData<ViewEvent>()
private var runningTask: Disposable? = null
private var runningJob: Job? = null private var runningJob: Job? = null
private val refreshCallback = object : Observable.OnPropertyChangedCallback() { private val refreshCallback = object : Observable.OnPropertyChangedCallback() {
override fun onPropertyChanged(sender: Observable?, propertyId: Int) { override fun onPropertyChanged(sender: Observable?, propertyId: Int) {
@ -68,8 +64,6 @@ abstract class BaseViewModel(
runningJob = refresh() runningJob = refresh()
} }
protected open fun rxRefresh(): Disposable? = null
protected open fun refresh(): Job? = null protected open fun refresh(): Job? = null
open fun notifyStateChanged() { open fun notifyStateChanged() {
@ -81,7 +75,6 @@ abstract class BaseViewModel(
@CallSuper @CallSuper
override fun onCleared() { override fun onCleared() {
isConnected.removeOnPropertyChangedCallback(refreshCallback) isConnected.removeOnPropertyChangedCallback(refreshCallback)
disposables.clear()
super.onCleared() super.onCleared()
} }
@ -111,10 +104,6 @@ abstract class BaseViewModel(
_viewEvents.postValue(NavigationWrapper(this)) _viewEvents.postValue(NavigationWrapper(this))
} }
fun Disposable.add() {
disposables.add(this)
}
// The following is copied from androidx.databinding.BaseObservable // The following is copied from androidx.databinding.BaseObservable
@Transient @Transient