diff --git a/qksms/src/main/java/interactor/ContactSync.kt b/qksms/src/main/java/interactor/ContactSync.kt index 3d695122..f9ba546d 100644 --- a/qksms/src/main/java/interactor/ContactSync.kt +++ b/qksms/src/main/java/interactor/ContactSync.kt @@ -24,7 +24,7 @@ import timber.log.Timber import java.util.concurrent.TimeUnit import javax.inject.Inject -open class ContactSync @Inject constructor(private val syncManager: SyncManager) : Interactor() { +open class ContactSync @Inject constructor(private val syncManager: SyncManager) : Interactor() { override fun buildObservable(params: Unit): Flowable { return Flowable.just(System.currentTimeMillis()) diff --git a/qksms/src/main/java/interactor/DeleteConversation.kt b/qksms/src/main/java/interactor/DeleteConversation.kt index 21738d5e..3232c5ee 100644 --- a/qksms/src/main/java/interactor/DeleteConversation.kt +++ b/qksms/src/main/java/interactor/DeleteConversation.kt @@ -22,7 +22,7 @@ import data.repository.MessageRepository import io.reactivex.Flowable import javax.inject.Inject -class DeleteConversation @Inject constructor(private val messageRepo: MessageRepository): Interactor() { +class DeleteConversation @Inject constructor(private val messageRepo: MessageRepository): Interactor() { override fun buildObservable(params: Long): Flowable { return Flowable.just(Unit) diff --git a/qksms/src/main/java/interactor/DeleteMessage.kt b/qksms/src/main/java/interactor/DeleteMessage.kt index 537a17c5..066eb991 100644 --- a/qksms/src/main/java/interactor/DeleteMessage.kt +++ b/qksms/src/main/java/interactor/DeleteMessage.kt @@ -22,7 +22,7 @@ import data.repository.MessageRepository import io.reactivex.Flowable import javax.inject.Inject -class DeleteMessage @Inject constructor(private val messageRepository: MessageRepository): Interactor() { +class DeleteMessage @Inject constructor(private val messageRepository: MessageRepository): Interactor() { override fun buildObservable(params: Long): Flowable { return Flowable.just(params) diff --git a/qksms/src/main/java/interactor/FullSync.kt b/qksms/src/main/java/interactor/FullSync.kt index 78fc04ad..25e65778 100644 --- a/qksms/src/main/java/interactor/FullSync.kt +++ b/qksms/src/main/java/interactor/FullSync.kt @@ -28,7 +28,7 @@ import javax.inject.Inject class FullSync @Inject constructor( private val syncManager: SyncManager, private val keys: Keys -) : Interactor() { +) : Interactor() { override fun buildObservable(params: Unit): Flowable { return Flowable.just(System.currentTimeMillis()) diff --git a/qksms/src/main/java/interactor/Interactor.kt b/qksms/src/main/java/interactor/Interactor.kt index d8eef8e4..a76ef5e1 100644 --- a/qksms/src/main/java/interactor/Interactor.kt +++ b/qksms/src/main/java/interactor/Interactor.kt @@ -22,19 +22,21 @@ import io.reactivex.Flowable import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.disposables.CompositeDisposable import io.reactivex.disposables.Disposable +import io.reactivex.rxkotlin.plusAssign import io.reactivex.schedulers.Schedulers -abstract class Interactor: Disposable { +abstract class Interactor: Disposable { private val disposables: CompositeDisposable = CompositeDisposable() - abstract fun buildObservable(params: Params): Flowable + abstract fun buildObservable(params: Params): Flowable<*> - fun execute(params: Params, observer: (Result) -> Unit = {}) { - disposables.add(buildObservable(params) + fun execute(params: Params, onComplete: () -> Unit = {}) { + disposables += buildObservable(params) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) - .subscribe(observer)) + .doOnComplete(onComplete) + .subscribe() } override fun dispose() { diff --git a/qksms/src/main/java/interactor/MarkAllSeen.kt b/qksms/src/main/java/interactor/MarkAllSeen.kt index c2ba5097..19cd541d 100644 --- a/qksms/src/main/java/interactor/MarkAllSeen.kt +++ b/qksms/src/main/java/interactor/MarkAllSeen.kt @@ -22,7 +22,7 @@ import data.repository.MessageRepository import io.reactivex.Flowable import javax.inject.Inject -class MarkAllSeen @Inject constructor(private val messageRepo: MessageRepository) : Interactor() { +class MarkAllSeen @Inject constructor(private val messageRepo: MessageRepository) : Interactor() { override fun buildObservable(params: Unit): Flowable { return Flowable.just(Unit) diff --git a/qksms/src/main/java/interactor/MarkArchived.kt b/qksms/src/main/java/interactor/MarkArchived.kt index ee9f51e6..9ed9c962 100644 --- a/qksms/src/main/java/interactor/MarkArchived.kt +++ b/qksms/src/main/java/interactor/MarkArchived.kt @@ -22,7 +22,7 @@ import data.repository.MessageRepository import io.reactivex.Flowable import javax.inject.Inject -class MarkArchived @Inject constructor(private val messageRepo: MessageRepository) : Interactor() { +class MarkArchived @Inject constructor(private val messageRepo: MessageRepository) : Interactor() { override fun buildObservable(params: Long): Flowable { return Flowable.just(Unit) diff --git a/qksms/src/main/java/interactor/MarkBlocked.kt b/qksms/src/main/java/interactor/MarkBlocked.kt index 3d731322..29b52c6a 100644 --- a/qksms/src/main/java/interactor/MarkBlocked.kt +++ b/qksms/src/main/java/interactor/MarkBlocked.kt @@ -22,7 +22,7 @@ import data.repository.MessageRepository import io.reactivex.Flowable import javax.inject.Inject -class MarkBlocked @Inject constructor(private val messageRepo: MessageRepository) : Interactor() { +class MarkBlocked @Inject constructor(private val messageRepo: MessageRepository) : Interactor() { override fun buildObservable(params: Long): Flowable { return Flowable.just(Unit) diff --git a/qksms/src/main/java/interactor/MarkDelivered.kt b/qksms/src/main/java/interactor/MarkDelivered.kt index 8e5fcfe9..32643815 100644 --- a/qksms/src/main/java/interactor/MarkDelivered.kt +++ b/qksms/src/main/java/interactor/MarkDelivered.kt @@ -22,7 +22,7 @@ import data.repository.MessageRepository import io.reactivex.Flowable import javax.inject.Inject -class MarkDelivered @Inject constructor(private val messageRepo: MessageRepository) : Interactor() { +class MarkDelivered @Inject constructor(private val messageRepo: MessageRepository) : Interactor() { override fun buildObservable(params: Long): Flowable { return Flowable.just(Unit) diff --git a/qksms/src/main/java/interactor/MarkDeliveryFailed.kt b/qksms/src/main/java/interactor/MarkDeliveryFailed.kt index 11716268..278b0f1a 100644 --- a/qksms/src/main/java/interactor/MarkDeliveryFailed.kt +++ b/qksms/src/main/java/interactor/MarkDeliveryFailed.kt @@ -24,7 +24,7 @@ import javax.inject.Inject class MarkDeliveryFailed @Inject constructor( private val messageRepo: MessageRepository) - : Interactor() { + : Interactor() { data class Params(val id: Long, val resultCode: Int) diff --git a/qksms/src/main/java/interactor/MarkFailed.kt b/qksms/src/main/java/interactor/MarkFailed.kt index 471e8c2a..9578bec1 100644 --- a/qksms/src/main/java/interactor/MarkFailed.kt +++ b/qksms/src/main/java/interactor/MarkFailed.kt @@ -26,7 +26,7 @@ import javax.inject.Inject class MarkFailed @Inject constructor( private val messageRepo: MessageRepository, private val notificationManager: NotificationManager -) : Interactor() { +) : Interactor() { data class Params(val id: Long, val resultCode: Int) diff --git a/qksms/src/main/java/interactor/MarkRead.kt b/qksms/src/main/java/interactor/MarkRead.kt index 8000d2ba..1aee8888 100644 --- a/qksms/src/main/java/interactor/MarkRead.kt +++ b/qksms/src/main/java/interactor/MarkRead.kt @@ -26,7 +26,7 @@ import javax.inject.Inject class MarkRead @Inject constructor( private val messageRepo: MessageRepository, private val notificationManager: NotificationManager -) : Interactor() { +) : Interactor() { override fun buildObservable(params: Long): Flowable { return Flowable.just(Unit) diff --git a/qksms/src/main/java/interactor/MarkSeen.kt b/qksms/src/main/java/interactor/MarkSeen.kt index 341487fb..8390485d 100644 --- a/qksms/src/main/java/interactor/MarkSeen.kt +++ b/qksms/src/main/java/interactor/MarkSeen.kt @@ -22,7 +22,7 @@ import data.repository.MessageRepository import io.reactivex.Flowable import javax.inject.Inject -class MarkSeen @Inject constructor(private val messageRepo: MessageRepository) : Interactor() { +class MarkSeen @Inject constructor(private val messageRepo: MessageRepository) : Interactor() { override fun buildObservable(params: Long): Flowable { return Flowable.just(Unit) diff --git a/qksms/src/main/java/interactor/MarkSent.kt b/qksms/src/main/java/interactor/MarkSent.kt index 30bf9c15..dcfd5f17 100644 --- a/qksms/src/main/java/interactor/MarkSent.kt +++ b/qksms/src/main/java/interactor/MarkSent.kt @@ -22,7 +22,7 @@ import data.repository.MessageRepository import io.reactivex.Flowable import javax.inject.Inject -class MarkSent @Inject constructor(private val messageRepo: MessageRepository) : Interactor() { +class MarkSent @Inject constructor(private val messageRepo: MessageRepository) : Interactor() { override fun buildObservable(params: Long): Flowable { return Flowable.just(Unit) diff --git a/qksms/src/main/java/interactor/MarkUnarchived.kt b/qksms/src/main/java/interactor/MarkUnarchived.kt index 3db71a25..77f820c5 100644 --- a/qksms/src/main/java/interactor/MarkUnarchived.kt +++ b/qksms/src/main/java/interactor/MarkUnarchived.kt @@ -22,7 +22,7 @@ import data.repository.MessageRepository import io.reactivex.Flowable import javax.inject.Inject -class MarkUnarchived @Inject constructor(private val messageRepo: MessageRepository) : Interactor() { +class MarkUnarchived @Inject constructor(private val messageRepo: MessageRepository) : Interactor() { override fun buildObservable(params: Long): Flowable { return Flowable.just(Unit) diff --git a/qksms/src/main/java/interactor/MarkUnblocked.kt b/qksms/src/main/java/interactor/MarkUnblocked.kt index 02f0ce11..4be11da5 100644 --- a/qksms/src/main/java/interactor/MarkUnblocked.kt +++ b/qksms/src/main/java/interactor/MarkUnblocked.kt @@ -22,7 +22,7 @@ import data.repository.MessageRepository import io.reactivex.Flowable import javax.inject.Inject -class MarkUnblocked @Inject constructor(private val messageRepo: MessageRepository) : Interactor() { +class MarkUnblocked @Inject constructor(private val messageRepo: MessageRepository) : Interactor() { override fun buildObservable(params: Long): Flowable { return Flowable.just(Unit) diff --git a/qksms/src/main/java/interactor/PartialSync.kt b/qksms/src/main/java/interactor/PartialSync.kt index bac0d956..363120db 100644 --- a/qksms/src/main/java/interactor/PartialSync.kt +++ b/qksms/src/main/java/interactor/PartialSync.kt @@ -28,7 +28,7 @@ import javax.inject.Inject open class PartialSync @Inject constructor( private val syncManager: SyncManager, private val permissions: Permissions -) : Interactor() { +) : Interactor() { override fun buildObservable(params: Unit): Flowable { return Flowable.just(System.currentTimeMillis()) diff --git a/qksms/src/main/java/interactor/ReceiveMms.kt b/qksms/src/main/java/interactor/ReceiveMms.kt index d71c2c40..5cab6f1c 100644 --- a/qksms/src/main/java/interactor/ReceiveMms.kt +++ b/qksms/src/main/java/interactor/ReceiveMms.kt @@ -31,7 +31,7 @@ class ReceiveMms @Inject constructor( private val syncManager: SyncManager, private val messageRepo: MessageRepository, private val notificationManager: NotificationManager -) : Interactor() { +) : Interactor() { override fun buildObservable(params: Uri): Flowable { return Flowable.just(params) diff --git a/qksms/src/main/java/interactor/ReceiveSms.kt b/qksms/src/main/java/interactor/ReceiveSms.kt index 7973c678..355067e4 100644 --- a/qksms/src/main/java/interactor/ReceiveSms.kt +++ b/qksms/src/main/java/interactor/ReceiveSms.kt @@ -29,7 +29,7 @@ import javax.inject.Inject class ReceiveSms @Inject constructor( private val messageRepo: MessageRepository, private val notificationManager: NotificationManager) - : Interactor, Conversation>() { + : Interactor>() { override fun buildObservable(params: Array): Flowable { return Flowable.just(params) diff --git a/qksms/src/main/java/interactor/RetrySending.kt b/qksms/src/main/java/interactor/RetrySending.kt index 889530b3..1bab0bb5 100644 --- a/qksms/src/main/java/interactor/RetrySending.kt +++ b/qksms/src/main/java/interactor/RetrySending.kt @@ -23,7 +23,7 @@ import data.repository.MessageRepository import io.reactivex.Flowable import javax.inject.Inject -class RetrySending @Inject constructor(private val messageRepo: MessageRepository) : Interactor() { +class RetrySending @Inject constructor(private val messageRepo: MessageRepository) : Interactor() { override fun buildObservable(params: Message): Flowable { diff --git a/qksms/src/main/java/interactor/SendMessage.kt b/qksms/src/main/java/interactor/SendMessage.kt index 8191c4b3..67b2f370 100644 --- a/qksms/src/main/java/interactor/SendMessage.kt +++ b/qksms/src/main/java/interactor/SendMessage.kt @@ -35,7 +35,7 @@ class SendMessage @Inject constructor( private val context: Context, private val prefs: Preferences, private val messageRepo: MessageRepository -) : Interactor() { +) : Interactor() { data class Params(val threadId: Long, val addresses: List, val body: String, val attachments: List = listOf()) diff --git a/qksms/src/main/java/interactor/SyncMessage.kt b/qksms/src/main/java/interactor/SyncMessage.kt index 6b05fdae..9f22d017 100644 --- a/qksms/src/main/java/interactor/SyncMessage.kt +++ b/qksms/src/main/java/interactor/SyncMessage.kt @@ -28,7 +28,7 @@ import javax.inject.Inject class SyncMessage @Inject constructor( private val syncManager: SyncManager, private val messageRepo: MessageRepository -) : Interactor() { +) : Interactor() { override fun buildObservable(params: Uri): Flowable { return Flowable.just(params)