From 625e583b139bb0132e0747607971b8e74410fe97 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Wed, 1 Nov 2017 17:22:30 -0700 Subject: [PATCH] Implement Disposable in Interactor, make internal disposables private --- .../com/moez/QKSMS/domain/interactor/Interactor.kt | 13 +++++++++++-- .../conversations/ConversationsViewModel.kt | 2 +- .../presentation/messages/MessagesViewModel.kt | 4 ++-- .../presentation/settings/SettingsViewModel.kt | 2 +- 4 files changed, 15 insertions(+), 6 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 c7b28add..927e54d3 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 @@ -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 { +abstract class Interactor: Disposable { - val disposables: CompositeDisposable = CompositeDisposable() + private val disposables: CompositeDisposable = CompositeDisposable() abstract fun buildObservable(params: Params): Flowable @@ -18,4 +19,12 @@ abstract class Interactor { .subscribe(observer)) } + override fun dispose() { + return disposables.dispose() + } + + override fun isDisposed(): Boolean { + return disposables.isDisposed + } + } 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 ebfa4190..8d107a7b 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 @@ -21,7 +21,7 @@ class ConversationsViewModel : QkViewModel() .filter { it.isLoaded } diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/settings/SettingsViewModel.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/settings/SettingsViewModel.kt index c5917150..e0fe586c 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/settings/SettingsViewModel.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/settings/SettingsViewModel.kt @@ -18,7 +18,7 @@ class SettingsViewModel : QkViewModel(SettingsState init { AppComponentManager.appComponent.inject(this) - disposables += fullSync.disposables + disposables += fullSync } override fun bindIntents(view: SettingsView) {