From 915887dc6b85e36e44d7207716243b3c96472527 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Wed, 1 Nov 2017 15:20:56 -0700 Subject: [PATCH] Dispose of all Rx Streams and Intents in ViewModel --- .../moez/QKSMS/domain/interactor/Interactor.kt | 4 +--- .../QKSMS/presentation/base/QkViewModel.kt | 16 +++++++++++++++- .../conversations/ConversationsViewModel.kt | 18 ++++++++---------- .../presentation/messages/MessagesViewModel.kt | 10 ++++++---- .../presentation/settings/SettingsViewModel.kt | 10 ++++------ 5 files changed, 34 insertions(+), 24 deletions(-) diff --git a/qksms/src/main/java/com/moez/QKSMS/domain/interactor/Interactor.kt b/qksms/src/main/java/com/moez/QKSMS/domain/interactor/Interactor.kt index 23e14daf..c7b28add 100644 --- a/qksms/src/main/java/com/moez/QKSMS/domain/interactor/Interactor.kt +++ b/qksms/src/main/java/com/moez/QKSMS/domain/interactor/Interactor.kt @@ -7,7 +7,7 @@ import io.reactivex.schedulers.Schedulers abstract class Interactor { - private val disposables: CompositeDisposable = CompositeDisposable() + val disposables: CompositeDisposable = CompositeDisposable() abstract fun buildObservable(params: Params): Flowable @@ -18,6 +18,4 @@ abstract class Interactor { .subscribe(observer)) } - fun dispose() = disposables.dispose() - } diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/base/QkViewModel.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/base/QkViewModel.kt index 7381519a..22bcd54c 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/base/QkViewModel.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/base/QkViewModel.kt @@ -2,6 +2,8 @@ package com.moez.QKSMS.presentation.base import android.arch.lifecycle.MutableLiveData import android.arch.lifecycle.ViewModel +import android.support.annotation.CallSuper +import io.reactivex.disposables.CompositeDisposable import io.reactivex.subjects.PublishSubject abstract class QkViewModel, State>(initialState: State) : ViewModel() { @@ -10,6 +12,9 @@ abstract class QkViewModel, State>(initialState: State) private val stateReducer: PublishSubject<(State) -> State> = PublishSubject.create() + protected val disposables = CompositeDisposable() + protected val intents = CompositeDisposable() + init { stateReducer .scan(initialState, { previousState, reducer -> reducer(previousState) }) @@ -20,10 +25,19 @@ abstract class QkViewModel, State>(initialState: State) bindIntents(view) } - open fun bindIntents(view: View) {} + @CallSuper + open fun bindIntents(view: View) { + intents.clear() + } protected fun newState(reducer: (State) -> State) { stateReducer.onNext(reducer) } + override fun onCleared() { + super.onCleared() + disposables.dispose() + intents.dispose() + } + } \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/conversations/ConversationsViewModel.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/conversations/ConversationsViewModel.kt index 635033da..d0722a3c 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/conversations/ConversationsViewModel.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/conversations/ConversationsViewModel.kt @@ -6,6 +6,7 @@ import com.moez.QKSMS.data.repository.MessageRepository import com.moez.QKSMS.domain.interactor.MarkAllSeen import com.moez.QKSMS.presentation.Navigator import com.moez.QKSMS.presentation.base.QkViewModel +import io.reactivex.rxkotlin.plusAssign import io.realm.RealmResults import javax.inject.Inject @@ -20,6 +21,8 @@ class ConversationsViewModel : QkViewModel(MessagesState()) { @@ -19,6 +20,9 @@ class MessagesViewModel(val threadId: Long) : QkViewModel @@ -36,11 +40,11 @@ class MessagesViewModel(val threadId: Long) : QkViewModel + intents += view.textChangedIntent.subscribe { text -> newState { it.copy(draft = text.toString(), canSend = text.isNotEmpty()) } } - view.sendIntent.subscribe { + intents += view.sendIntent.subscribe { val previousState = state.value!! sendMessage.execute(SendMessage.Params(threadId, conversation.contacts[0].address, previousState.draft)) newState { it.copy(draft = "", canSend = false) } @@ -53,8 +57,6 @@ class MessagesViewModel(val threadId: Long) : QkViewModel(SettingsState init { AppComponentManager.appComponent.inject(this) + + disposables += syncConversations.disposables } override fun bindIntents(view: SettingsView) { super.bindIntents(view) - view.preferenceClickIntent.subscribe { + intents += view.preferenceClickIntent.subscribe { Timber.v("Preference click: ${it.key}") when (it.key) { @@ -42,9 +45,4 @@ class SettingsViewModel : QkViewModel(SettingsState } } } - - override fun onCleared() { - super.onCleared() - syncConversations.dispose() - } } \ No newline at end of file