Implement Disposable in Interactor, make internal disposables private

This commit is contained in:
Moez Bhatti
2017-11-01 17:22:30 -07:00
parent 36ec292f74
commit 625e583b13
4 changed files with 15 additions and 6 deletions
@@ -3,11 +3,12 @@ package com.moez.QKSMS.domain.interactor
import io.reactivex.Flowable import io.reactivex.Flowable
import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.android.schedulers.AndroidSchedulers
import io.reactivex.disposables.CompositeDisposable import io.reactivex.disposables.CompositeDisposable
import io.reactivex.disposables.Disposable
import io.reactivex.schedulers.Schedulers import io.reactivex.schedulers.Schedulers
abstract class Interactor<T, in Params> { abstract class Interactor<T, in Params>: Disposable {
val disposables: CompositeDisposable = CompositeDisposable() private val disposables: CompositeDisposable = CompositeDisposable()
abstract fun buildObservable(params: Params): Flowable<T> abstract fun buildObservable(params: Params): Flowable<T>
@@ -18,4 +19,12 @@ abstract class Interactor<T, in Params> {
.subscribe(observer)) .subscribe(observer))
} }
override fun dispose() {
return disposables.dispose()
}
override fun isDisposed(): Boolean {
return disposables.isDisposed
}
} }
@@ -21,7 +21,7 @@ class ConversationsViewModel : QkViewModel<ConversationsView, ConversationsState
init { init {
AppComponentManager.appComponent.inject(this) AppComponentManager.appComponent.inject(this)
disposables += markAllSeen.disposables disposables += markAllSeen
conversations = messageRepo.getConversationMessagesAsync() conversations = messageRepo.getConversationMessagesAsync()
newState { it.copy(conversations = conversations) } newState { it.copy(conversations = conversations) }
@@ -20,8 +20,8 @@ class MessagesViewModel(val threadId: Long) : QkViewModel<MessagesView, Messages
init { init {
AppComponentManager.appComponent.inject(this) AppComponentManager.appComponent.inject(this)
disposables += sendMessage.disposables disposables += sendMessage
disposables += markRead.disposables disposables += markRead
disposables += messageRepo.getConversationAsync(threadId) disposables += messageRepo.getConversationAsync(threadId)
.asFlowable<Conversation>() .asFlowable<Conversation>()
.filter { it.isLoaded } .filter { it.isLoaded }
@@ -18,7 +18,7 @@ class SettingsViewModel : QkViewModel<SettingsView, SettingsState>(SettingsState
init { init {
AppComponentManager.appComponent.inject(this) AppComponentManager.appComponent.inject(this)
disposables += fullSync.disposables disposables += fullSync
} }
override fun bindIntents(view: SettingsView) { override fun bindIntents(view: SettingsView) {