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 634e6ca1..23e14daf 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 @@ -11,7 +11,7 @@ abstract class Interactor { abstract fun buildObservable(params: Params): Flowable - fun execute(observer: ((T) -> Unit), params: Params) { + fun execute(params: Params, observer: (T) -> Unit = {}) { disposables.add(buildObservable(params) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/conversations/ConversationListViewModel.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/conversations/ConversationListViewModel.kt index 98238513..d2a66f97 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/conversations/ConversationListViewModel.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/conversations/ConversationListViewModel.kt @@ -32,12 +32,12 @@ class ConversationListViewModel : ViewModel() { conversations = messageRepo.getConversationMessagesAsync() partialStates.onNext(PartialState.ConversationsLoaded(conversations)) - markAllSeen.execute({}, Unit) + markAllSeen.execute(Unit) } fun onRefresh() { partialStates.onNext(PartialState.Refreshing(true)) - syncConversations.execute({ partialStates.onNext(PartialState.Refreshing(false)) }, Unit) + syncConversations.execute(Unit, { partialStates.onNext(PartialState.Refreshing(false)) }) } override fun onCleared() { diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/messages/MessageListViewModel.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/messages/MessageListViewModel.kt index 372e6fcf..7877d67f 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/messages/MessageListViewModel.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/messages/MessageListViewModel.kt @@ -52,13 +52,13 @@ class MessageListViewModel : ViewModel() { fun sendMessage(body: String) { conversation?.takeIf { conversation -> conversation.isValid }?.let { conversation -> - sendMessage.execute({}, SendMessage.Params(threadId, conversation.contacts[0].address, body)) + sendMessage.execute(SendMessage.Params(threadId, conversation.contacts[0].address, body)) partialStates.onNext(PartialState.TextChanged("")) } } fun dataChanged() { - markRead.execute({}, threadId) + markRead.execute(threadId) } fun textChanged(text: String) { diff --git a/qksms/src/main/java/com/moez/QKSMS/receiver/MarkReadReceiver.kt b/qksms/src/main/java/com/moez/QKSMS/receiver/MarkReadReceiver.kt index 5f7ad4e8..0a99b2b1 100644 --- a/qksms/src/main/java/com/moez/QKSMS/receiver/MarkReadReceiver.kt +++ b/qksms/src/main/java/com/moez/QKSMS/receiver/MarkReadReceiver.kt @@ -15,7 +15,7 @@ class MarkReadReceiver : BroadcastReceiver() { AppComponentManager.appComponent.inject(this) val threadId = intent.getLongExtra("threadId", 0) - markRead.execute({}, threadId) + markRead.execute(threadId) } } \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/receiver/MarkSeenReceiver.kt b/qksms/src/main/java/com/moez/QKSMS/receiver/MarkSeenReceiver.kt index 5a39b68b..f074ca6d 100644 --- a/qksms/src/main/java/com/moez/QKSMS/receiver/MarkSeenReceiver.kt +++ b/qksms/src/main/java/com/moez/QKSMS/receiver/MarkSeenReceiver.kt @@ -15,7 +15,7 @@ class MarkSeenReceiver : BroadcastReceiver() { AppComponentManager.appComponent.inject(this) val threadId = intent.getLongExtra("threadId", 0) - markSeen.execute({}, threadId) + markSeen.execute(threadId) } } \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/receiver/MessageSentReceiver.kt b/qksms/src/main/java/com/moez/QKSMS/receiver/MessageSentReceiver.kt index 3b0971ab..7e004921 100644 --- a/qksms/src/main/java/com/moez/QKSMS/receiver/MessageSentReceiver.kt +++ b/qksms/src/main/java/com/moez/QKSMS/receiver/MessageSentReceiver.kt @@ -22,12 +22,12 @@ class MessageSentReceiver : BroadcastReceiver() { val uri = Uri.parse(intent.getStringExtra("uri")) when (resultCode) { - Activity.RESULT_OK -> markSent.execute({}, uri) + Activity.RESULT_OK -> markSent.execute(uri) SmsManager.RESULT_ERROR_GENERIC_FAILURE, SmsManager.RESULT_ERROR_NO_SERVICE, SmsManager.RESULT_ERROR_NULL_PDU, - SmsManager.RESULT_ERROR_RADIO_OFF -> markFailed.execute({}, MarkFailed.Params(uri, resultCode)) + SmsManager.RESULT_ERROR_RADIO_OFF -> markFailed.execute(MarkFailed.Params(uri, resultCode)) } } } \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/receiver/RemoteMessagingReceiver.kt b/qksms/src/main/java/com/moez/QKSMS/receiver/RemoteMessagingReceiver.kt index dd762c09..6b4cac25 100644 --- a/qksms/src/main/java/com/moez/QKSMS/receiver/RemoteMessagingReceiver.kt +++ b/qksms/src/main/java/com/moez/QKSMS/receiver/RemoteMessagingReceiver.kt @@ -23,8 +23,8 @@ class RemoteMessagingReceiver : BroadcastReceiver() { val address = bundle.getString("address") val threadId = bundle.getLong("threadId") val body = remoteInput.getCharSequence("body").toString() - markRead.execute({}, threadId) - sendMessage.execute({}, SendMessage.Params(threadId, address, body)) + markRead.execute(threadId) + sendMessage.execute(SendMessage.Params(threadId, address, body)) } } } diff --git a/qksms/src/main/java/com/moez/QKSMS/receiver/SmsReceiver.kt b/qksms/src/main/java/com/moez/QKSMS/receiver/SmsReceiver.kt index c0870912..9534ee2d 100644 --- a/qksms/src/main/java/com/moez/QKSMS/receiver/SmsReceiver.kt +++ b/qksms/src/main/java/com/moez/QKSMS/receiver/SmsReceiver.kt @@ -26,7 +26,7 @@ class SmsReceiver : BroadcastReceiver() { .reduce { body, new -> body + new } val pendingResult = goAsync() - receiveMessage.execute({ pendingResult.finish() }, ReceiveMessage.Params(address, body, time)) + receiveMessage.execute(ReceiveMessage.Params(address, body, time), { pendingResult.finish() }) } }