Skip to content
Snippets Groups Projects
Commit b3994fc5 authored by Pierre Nicolas's avatar Pierre Nicolas :joy:
Browse files

sip: fix conversation and account getter

GitLab: #1726
Change-Id: I50fe7eac661ae32b626e5ca1aa9437d6cd65b919
parent 03c5e783
No related branches found
No related tags found
No related merge requests found
...@@ -708,7 +708,7 @@ class Account( ...@@ -708,7 +708,7 @@ class Account(
fun getByUri(uri: Uri?): Conversation? = fun getByUri(uri: Uri?): Conversation? =
if (uri == null || uri.isEmpty) null if (uri == null || uri.isEmpty) null
else if (uri.isSwarm) getSwarm(uri.rawRingId) ?: pending[uri.uri] else if (uri.isSwarm) getSwarm(uri.rawRingId) ?: pending[uri.uri]
else if (uri.isJami) getByKey(uri) else if (uri.isJami || isSip) getByKey(uri)
else null else null
fun getByUri(uri: String?): Conversation? = fun getByUri(uri: String?): Conversation? =
......
...@@ -944,7 +944,7 @@ class AccountService( ...@@ -944,7 +944,7 @@ class AccountService(
} }
fun getConversationByUri(account: Account, conversationUri: Uri): Single<Conversation> = fun getConversationByUri(account: Account, conversationUri: Uri): Single<Conversation> =
if (conversationUri.isHexId) { if (conversationUri.isHexId || account.isSip) {
val conversation = account.getByUri(conversationUri) val conversation = account.getByUri(conversationUri)
if (conversation != null) { if (conversation != null) {
Single.just(conversation) Single.just(conversation)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment