Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-client-android
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-client-android
Commits
6ac10b4c
Commit
6ac10b4c
authored
2 years ago
by
Adrien Béraud
Browse files
Options
Downloads
Patches
Plain Diff
conversation: don't redirect if request
Change-Id: I54c3c59aa7359521dabc9c360ebdd6559a860d6f
parent
1ad8ecc7
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
ring-android/libjamiclient/src/main/kotlin/net/jami/conversation/ConversationPresenter.kt
+4
-9
4 additions, 9 deletions
...ain/kotlin/net/jami/conversation/ConversationPresenter.kt
with
4 additions
and
9 deletions
ring-android/libjamiclient/src/main/kotlin/net/jami/conversation/ConversationPresenter.kt
+
4
−
9
View file @
6ac10b4c
...
...
@@ -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
()
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment