forked from upstream-mirrors/quik
Make callback optional for Interactors
This commit is contained in:
@@ -11,7 +11,7 @@ abstract class Interactor<T, in Params> {
|
||||
|
||||
abstract fun buildObservable(params: Params): Flowable<T>
|
||||
|
||||
fun execute(observer: ((T) -> Unit), params: Params) {
|
||||
fun execute(params: Params, observer: (T) -> Unit = {}) {
|
||||
disposables.add(buildObservable(params)
|
||||
.subscribeOn(Schedulers.io())
|
||||
.observeOn(AndroidSchedulers.mainThread())
|
||||
|
||||
+2
-2
@@ -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() {
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -15,7 +15,7 @@ class MarkReadReceiver : BroadcastReceiver() {
|
||||
AppComponentManager.appComponent.inject(this)
|
||||
|
||||
val threadId = intent.getLongExtra("threadId", 0)
|
||||
markRead.execute({}, threadId)
|
||||
markRead.execute(threadId)
|
||||
}
|
||||
|
||||
}
|
||||
@@ -15,7 +15,7 @@ class MarkSeenReceiver : BroadcastReceiver() {
|
||||
AppComponentManager.appComponent.inject(this)
|
||||
|
||||
val threadId = intent.getLongExtra("threadId", 0)
|
||||
markSeen.execute({}, threadId)
|
||||
markSeen.execute(threadId)
|
||||
}
|
||||
|
||||
}
|
||||
@@ -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))
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -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))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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() })
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user