forked from upstream-mirrors/quik
Implement Disposable in Interactor, make internal disposables private
This commit is contained in:
@@ -3,11 +3,12 @@ package com.moez.QKSMS.domain.interactor
|
||||
import io.reactivex.Flowable
|
||||
import io.reactivex.android.schedulers.AndroidSchedulers
|
||||
import io.reactivex.disposables.CompositeDisposable
|
||||
import io.reactivex.disposables.Disposable
|
||||
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>
|
||||
|
||||
@@ -18,4 +19,12 @@ abstract class Interactor<T, in Params> {
|
||||
.subscribe(observer))
|
||||
}
|
||||
|
||||
override fun dispose() {
|
||||
return disposables.dispose()
|
||||
}
|
||||
|
||||
override fun isDisposed(): Boolean {
|
||||
return disposables.isDisposed
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
+1
-1
@@ -21,7 +21,7 @@ class ConversationsViewModel : QkViewModel<ConversationsView, ConversationsState
|
||||
init {
|
||||
AppComponentManager.appComponent.inject(this)
|
||||
|
||||
disposables += markAllSeen.disposables
|
||||
disposables += markAllSeen
|
||||
|
||||
conversations = messageRepo.getConversationMessagesAsync()
|
||||
newState { it.copy(conversations = conversations) }
|
||||
|
||||
@@ -20,8 +20,8 @@ class MessagesViewModel(val threadId: Long) : QkViewModel<MessagesView, Messages
|
||||
init {
|
||||
AppComponentManager.appComponent.inject(this)
|
||||
|
||||
disposables += sendMessage.disposables
|
||||
disposables += markRead.disposables
|
||||
disposables += sendMessage
|
||||
disposables += markRead
|
||||
disposables += messageRepo.getConversationAsync(threadId)
|
||||
.asFlowable<Conversation>()
|
||||
.filter { it.isLoaded }
|
||||
|
||||
@@ -18,7 +18,7 @@ class SettingsViewModel : QkViewModel<SettingsView, SettingsState>(SettingsState
|
||||
init {
|
||||
AppComponentManager.appComponent.inject(this)
|
||||
|
||||
disposables += fullSync.disposables
|
||||
disposables += fullSync
|
||||
}
|
||||
|
||||
override fun bindIntents(view: SettingsView) {
|
||||
|
||||
Reference in New Issue
Block a user