From b3994fc5ca06aaabeff1b720fd35b553bb6b87c5 Mon Sep 17 00:00:00 2001
From: Pierre Nicolas <pierre.nicolas@savoirfairelinux.com>
Date: Tue, 23 Jul 2024 11:46:07 -0400
Subject: [PATCH] sip: fix conversation and account getter
GitLab: #1726
Change-Id: I50fe7eac661ae32b626e5ca1aa9437d6cd65b919
---
.../libjamiclient/src/main/kotlin/net/jami/model/Account.kt | 2 +-
.../src/main/kotlin/net/jami/services/AccountService.kt | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/jami-android/libjamiclient/src/main/kotlin/net/jami/model/Account.kt b/jami-android/libjamiclient/src/main/kotlin/net/jami/model/Account.kt
index df23871be..95df7662a 100644
--- a/jami-android/libjamiclient/src/main/kotlin/net/jami/model/Account.kt
+++ b/jami-android/libjamiclient/src/main/kotlin/net/jami/model/Account.kt
@@ -708,7 +708,7 @@ class Account(
fun getByUri(uri: Uri?): Conversation? =
if (uri == null || uri.isEmpty) null
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
fun getByUri(uri: String?): Conversation? =
diff --git a/jami-android/libjamiclient/src/main/kotlin/net/jami/services/AccountService.kt b/jami-android/libjamiclient/src/main/kotlin/net/jami/services/AccountService.kt
index cfbf1247e..21131a343 100644
--- a/jami-android/libjamiclient/src/main/kotlin/net/jami/services/AccountService.kt
+++ b/jami-android/libjamiclient/src/main/kotlin/net/jami/services/AccountService.kt
@@ -944,7 +944,7 @@ class AccountService(
}
fun getConversationByUri(account: Account, conversationUri: Uri): Single<Conversation> =
- if (conversationUri.isHexId) {
+ if (conversationUri.isHexId || account.isSip) {
val conversation = account.getByUri(conversationUri)
if (conversation != null) {
Single.just(conversation)
--
GitLab