diff --git a/qksms/src/main/java/com/moez/QKSMS/domain/interactor/DeleteConversation.kt b/qksms/src/main/java/com/moez/QKSMS/domain/interactor/DeleteConversation.kt index 435fad23..65204be2 100644 --- a/qksms/src/main/java/com/moez/QKSMS/domain/interactor/DeleteConversation.kt +++ b/qksms/src/main/java/com/moez/QKSMS/domain/interactor/DeleteConversation.kt @@ -4,7 +4,7 @@ import com.moez.QKSMS.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/com/moez/QKSMS/domain/interactor/Interactor.kt b/qksms/src/main/java/com/moez/QKSMS/domain/interactor/Interactor.kt index 927e54d3..aad46c10 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 @@ -6,13 +6,13 @@ import io.reactivex.disposables.CompositeDisposable import io.reactivex.disposables.Disposable 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: (T) -> Unit = {}) { + fun execute(params: Params, observer: (Result) -> Unit = {}) { disposables.add(buildObservable(params) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) 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 712a057c..d66e5fe4 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 @@ -4,7 +4,7 @@ import com.moez.QKSMS.data.repository.MessageRepository import io.reactivex.Flowable import javax.inject.Inject -class MarkAllSeen @Inject constructor(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/com/moez/QKSMS/domain/interactor/MarkArchived.kt b/qksms/src/main/java/com/moez/QKSMS/domain/interactor/MarkArchived.kt index 84bdb684..977be931 100644 --- a/qksms/src/main/java/com/moez/QKSMS/domain/interactor/MarkArchived.kt +++ b/qksms/src/main/java/com/moez/QKSMS/domain/interactor/MarkArchived.kt @@ -4,7 +4,7 @@ import com.moez.QKSMS.data.repository.MessageRepository import io.reactivex.Flowable import javax.inject.Inject -class MarkArchived @Inject constructor(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/com/moez/QKSMS/domain/interactor/MarkFailed.kt b/qksms/src/main/java/com/moez/QKSMS/domain/interactor/MarkFailed.kt index 0868ab97..a32b4cea 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 @@ -5,7 +5,9 @@ import com.moez.QKSMS.data.repository.MessageRepository import io.reactivex.Flowable import javax.inject.Inject -class MarkFailed @Inject constructor(val messageRepo: MessageRepository) : Interactor() { +class MarkFailed @Inject constructor( + private val messageRepo: MessageRepository) + : Interactor() { data class Params(val uri: Uri, val resultCode: Int) 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 e94c8710..9c59bfa9 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 @@ -4,7 +4,7 @@ import com.moez.QKSMS.data.repository.MessageRepository import io.reactivex.Flowable import javax.inject.Inject -class MarkRead @Inject constructor(val messageRepo: MessageRepository) : Interactor() { +class MarkRead @Inject constructor(private val messageRepo: MessageRepository) : Interactor() { override fun buildObservable(params: Long): Flowable { return Flowable.just(Unit) 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 8ee54aeb..1c37f709 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 @@ -4,7 +4,7 @@ import com.moez.QKSMS.data.repository.MessageRepository import io.reactivex.Flowable import javax.inject.Inject -class MarkSeen @Inject constructor(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/com/moez/QKSMS/domain/interactor/MarkSent.kt b/qksms/src/main/java/com/moez/QKSMS/domain/interactor/MarkSent.kt index 54e26880..8beb6861 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 @@ -5,7 +5,7 @@ import com.moez.QKSMS.data.repository.MessageRepository import io.reactivex.Flowable import javax.inject.Inject -class MarkSent @Inject constructor(val messageRepo: MessageRepository) : Interactor() { +class MarkSent @Inject constructor(private val messageRepo: MessageRepository) : Interactor() { override fun buildObservable(params: Uri): Flowable { return Flowable.just(Unit) diff --git a/qksms/src/main/java/com/moez/QKSMS/domain/interactor/MarkUnarchived.kt b/qksms/src/main/java/com/moez/QKSMS/domain/interactor/MarkUnarchived.kt index ffd18ad4..614b854d 100644 --- a/qksms/src/main/java/com/moez/QKSMS/domain/interactor/MarkUnarchived.kt +++ b/qksms/src/main/java/com/moez/QKSMS/domain/interactor/MarkUnarchived.kt @@ -4,7 +4,7 @@ import com.moez.QKSMS.data.repository.MessageRepository import io.reactivex.Flowable import javax.inject.Inject -class MarkUnarchived @Inject constructor(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/com/moez/QKSMS/domain/interactor/PartialSync.kt b/qksms/src/main/java/com/moez/QKSMS/domain/interactor/PartialSync.kt index 64ddf125..880a544e 100644 --- a/qksms/src/main/java/com/moez/QKSMS/domain/interactor/PartialSync.kt +++ b/qksms/src/main/java/com/moez/QKSMS/domain/interactor/PartialSync.kt @@ -18,7 +18,7 @@ open class PartialSync @Inject constructor( private val cursorToConversation: CursorToConversation, private val cursorToMessage: CursorToMessage, private val cursorToRecipient: CursorToRecipient) - : Interactor() { + : Interactor() { override fun buildObservable(params: Unit): Flowable { val contentResolver = context.contentResolver 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 c9b65f4a..c6c542ad 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 @@ -9,10 +9,10 @@ import io.reactivex.Flowable import javax.inject.Inject class ReceiveMessage @Inject constructor( - val context: Context, - val messageRepo: MessageRepository, - val notificationManager: NotificationManager) - : Interactor() { + private val context: Context, + private val messageRepo: MessageRepository, + private val notificationManager: NotificationManager) + : Interactor() { data class Params(val address: String, val body: String, val sentTime: Long) 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 9b0b0889..d8988374 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 @@ -15,9 +15,10 @@ import io.reactivex.schedulers.Schedulers import javax.inject.Inject class SendMessage @Inject constructor( - val context: Context, - val prefs: Preferences, - val messageRepo: MessageRepository) : Interactor() { + private val context: Context, + private val prefs: Preferences, + private val messageRepo: MessageRepository) + : Interactor() { data class Params(val threadId: Long, val address: String, val body: String)