From c949a68cf5eb3f6db4a5425896be72231dda38c8 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Sun, 1 Oct 2017 22:03:35 -0400 Subject: [PATCH] Refactor Interactor Observable creator method --- .../main/java/com/moez/QKSMS/domain/interactor/Interactor.kt | 4 ++-- .../main/java/com/moez/QKSMS/domain/interactor/MarkAllSeen.kt | 2 +- .../main/java/com/moez/QKSMS/domain/interactor/MarkFailed.kt | 2 +- .../main/java/com/moez/QKSMS/domain/interactor/MarkRead.kt | 2 +- .../main/java/com/moez/QKSMS/domain/interactor/MarkSeen.kt | 2 +- .../main/java/com/moez/QKSMS/domain/interactor/MarkSent.kt | 2 +- .../java/com/moez/QKSMS/domain/interactor/ReceiveMessage.kt | 2 +- .../main/java/com/moez/QKSMS/domain/interactor/SendMessage.kt | 2 +- 8 files changed, 9 insertions(+), 9 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 0bebd4c8..634e6ca1 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 @@ -9,10 +9,10 @@ abstract class Interactor { private val disposables: CompositeDisposable = CompositeDisposable() - abstract fun buildUseCaseObservable(params: Params): Flowable + abstract fun buildObservable(params: Params): Flowable fun execute(observer: ((T) -> Unit), params: Params) { - disposables.add(buildUseCaseObservable(params) + disposables.add(buildObservable(params) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(observer)) diff --git a/qksms/src/main/java/com/moez/QKSMS/domain/interactor/MarkAllSeen.kt b/qksms/src/main/java/com/moez/QKSMS/domain/interactor/MarkAllSeen.kt index 61628226..712a057c 100644 --- a/qksms/src/main/java/com/moez/QKSMS/domain/interactor/MarkAllSeen.kt +++ b/qksms/src/main/java/com/moez/QKSMS/domain/interactor/MarkAllSeen.kt @@ -6,7 +6,7 @@ import javax.inject.Inject class MarkAllSeen @Inject constructor(val messageRepo: MessageRepository) : Interactor() { - override fun buildUseCaseObservable(params: Unit): Flowable { + override fun buildObservable(params: Unit): Flowable { return Flowable.just(Unit) .doOnNext { messageRepo.markAllSeen() } } diff --git a/qksms/src/main/java/com/moez/QKSMS/domain/interactor/MarkFailed.kt b/qksms/src/main/java/com/moez/QKSMS/domain/interactor/MarkFailed.kt index 54f9f346..4b98caf0 100644 --- a/qksms/src/main/java/com/moez/QKSMS/domain/interactor/MarkFailed.kt +++ b/qksms/src/main/java/com/moez/QKSMS/domain/interactor/MarkFailed.kt @@ -11,7 +11,7 @@ class MarkFailed @Inject constructor(val messageRepo: MessageRepository) : Inter data class Params(val uri: Uri, val resultCode: Int) - override fun buildUseCaseObservable(params: Params): Flowable { + override fun buildObservable(params: Params): Flowable { return Flowable.just(Unit) .doOnNext { val values = ContentValues() diff --git a/qksms/src/main/java/com/moez/QKSMS/domain/interactor/MarkRead.kt b/qksms/src/main/java/com/moez/QKSMS/domain/interactor/MarkRead.kt index a5a8b5c2..9bac7258 100644 --- a/qksms/src/main/java/com/moez/QKSMS/domain/interactor/MarkRead.kt +++ b/qksms/src/main/java/com/moez/QKSMS/domain/interactor/MarkRead.kt @@ -6,7 +6,7 @@ import javax.inject.Inject class MarkRead @Inject constructor(val messageRepo: MessageRepository): Interactor() { - override fun buildUseCaseObservable(params: Long): Flowable { + override fun buildObservable(params: Long): Flowable { return Flowable.just(Unit) .doOnNext { messageRepo.markRead(params) } } diff --git a/qksms/src/main/java/com/moez/QKSMS/domain/interactor/MarkSeen.kt b/qksms/src/main/java/com/moez/QKSMS/domain/interactor/MarkSeen.kt index f16d7b2e..8ee54aeb 100644 --- a/qksms/src/main/java/com/moez/QKSMS/domain/interactor/MarkSeen.kt +++ b/qksms/src/main/java/com/moez/QKSMS/domain/interactor/MarkSeen.kt @@ -6,7 +6,7 @@ import javax.inject.Inject class MarkSeen @Inject constructor(val messageRepo: MessageRepository) : Interactor() { - override fun buildUseCaseObservable(params: Long): Flowable { + override fun buildObservable(params: Long): Flowable { return Flowable.just(Unit) .doOnNext { messageRepo.markSeen(params) } } diff --git a/qksms/src/main/java/com/moez/QKSMS/domain/interactor/MarkSent.kt b/qksms/src/main/java/com/moez/QKSMS/domain/interactor/MarkSent.kt index 997d4df8..3128cd30 100644 --- a/qksms/src/main/java/com/moez/QKSMS/domain/interactor/MarkSent.kt +++ b/qksms/src/main/java/com/moez/QKSMS/domain/interactor/MarkSent.kt @@ -9,7 +9,7 @@ import javax.inject.Inject class MarkSent @Inject constructor(val messageRepo: MessageRepository) : Interactor() { - override fun buildUseCaseObservable(params: Uri): Flowable { + override fun buildObservable(params: Uri): Flowable { return Flowable.just(params) .doOnNext { val values = ContentValues() diff --git a/qksms/src/main/java/com/moez/QKSMS/domain/interactor/ReceiveMessage.kt b/qksms/src/main/java/com/moez/QKSMS/domain/interactor/ReceiveMessage.kt index d625e05e..c32586ee 100644 --- a/qksms/src/main/java/com/moez/QKSMS/domain/interactor/ReceiveMessage.kt +++ b/qksms/src/main/java/com/moez/QKSMS/domain/interactor/ReceiveMessage.kt @@ -15,7 +15,7 @@ class ReceiveMessage @Inject constructor( data class Params(val address: String, val body: String, val sentTime: Long) - override fun buildUseCaseObservable(params: Params): Flowable { + override fun buildObservable(params: Params): Flowable { val values = ContentValues() values.put(Telephony.Sms.ADDRESS, params.address) values.put(Telephony.Sms.BODY, params.body) diff --git a/qksms/src/main/java/com/moez/QKSMS/domain/interactor/SendMessage.kt b/qksms/src/main/java/com/moez/QKSMS/domain/interactor/SendMessage.kt index 0da51e9f..0fbd3339 100644 --- a/qksms/src/main/java/com/moez/QKSMS/domain/interactor/SendMessage.kt +++ b/qksms/src/main/java/com/moez/QKSMS/domain/interactor/SendMessage.kt @@ -19,7 +19,7 @@ class SendMessage @Inject constructor( data class Params(val threadId: Long, val address: String, val body: String) - override fun buildUseCaseObservable(params: Params): Flowable { + override fun buildObservable(params: Params): Flowable { val values = ContentValues() values.put(Telephony.Sms.ADDRESS, params.address) values.put(Telephony.Sms.BODY, params.body)