Skip to content
Snippets Groups Projects
Commit 6ac10b4c authored by Adrien Béraud's avatar Adrien Béraud
Browse files

conversation: don't redirect if request

Change-Id: I54c3c59aa7359521dabc9c360ebdd6559a860d6f
parent 1ad8ecc7
No related branches found
No related tags found
No related merge requests found
......@@ -158,8 +158,7 @@ class ConversationPresenter @Inject constructor(
.subscribe())
disposable.add(c.mode
.switchMap { mode: Conversation.Mode ->
if (mode === Conversation.Mode.Legacy || mode === Conversation.Mode.Request)
c.contact!!.conversationUri else Observable.empty() }
if (mode === Conversation.Mode.Legacy) c.contact!!.conversationUri else Observable.empty() }
.observeOn(uiScheduler)
.subscribe { uri: Uri -> init(uri, account.accountId) })
disposable.add(Observable.combineLatest(hardwareService.connectivityState, accountService.getObservableAccount(account))
......@@ -185,9 +184,7 @@ class ConversationPresenter @Inject constructor(
Log.e(TAG, "Can't update elements", e)
})
disposable.add(c.contactUpdates
.switchMap { contacts ->
Observable.merge(contactService.observeLoadedContact(c.accountId, contacts, true))
}
.switchMap { contacts -> Observable.merge(contactService.observeLoadedContact(c.accountId, contacts, true)) }
.observeOn(uiScheduler)
.subscribe { contact: ContactViewModel -> this.view?.updateContact(contact) })
disposable.add(c.updatedElements
......@@ -199,8 +196,7 @@ class ConversationPresenter @Inject constructor(
ElementStatus.UPDATE -> v.updateElement(elementTuple.first)
ElementStatus.REMOVE -> v.removeElement(elementTuple.first)
}
}, { e: Throwable -> Log.e(TAG, "Can't update element", e) })
)
}, { e: Throwable -> Log.e(TAG, "Can't update element", e) }))
if (showTypingIndicator()) {
disposable.add(c.composingStatus
.observeOn(uiScheduler)
......@@ -230,8 +226,7 @@ class ConversationPresenter @Inject constructor(
.subscribe {
Log.e(TAG, "getLocationUpdates: update")
this.view?.showMap(c.accountId, c.uri.uri, false)
}
)
})
}
fun loadMore() {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment