From dbb4746ee24815d123289e4a5ac382f165c61e6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
Date: Wed, 3 Jul 2024 16:58:33 -0400
Subject: [PATCH] swarm calls: use proper conversation Uri
GitLab: #1704
Change-Id: I98f8ca103076e0fb23b7ea83073216f1ca9b836f
---
.../src/main/kotlin/net/jami/services/AccountService.kt | 4 ++--
.../src/main/kotlin/net/jami/services/ConversationFacade.kt | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
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 55e925d0d..7c2e603b8 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
@@ -92,7 +92,7 @@ class AccountService(
data class ConversationActiveCalls(
val accountId: String,
- val conversationId: String,
+ val conversationUri: Uri,
val activeCalls: List<Conversation.ActiveCall>
)
@@ -1059,7 +1059,7 @@ class AccountService(
activeCallsSubject.onNext(
ConversationActiveCalls(
accountId,
- conversationId,
+ Uri(Uri.SWARM_SCHEME, conversationId),
activeCallList
)
)
diff --git a/jami-android/libjamiclient/src/main/kotlin/net/jami/services/ConversationFacade.kt b/jami-android/libjamiclient/src/main/kotlin/net/jami/services/ConversationFacade.kt
index 8c1c4918f..ed7ec87ff 100644
--- a/jami-android/libjamiclient/src/main/kotlin/net/jami/services/ConversationFacade.kt
+++ b/jami-android/libjamiclient/src/main/kotlin/net/jami/services/ConversationFacade.kt
@@ -775,7 +775,7 @@ class ConversationFacade(
mAccountService.activeCallsObservable.subscribe(
{ conversationActiveCall ->
mAccountService.getAccount(accountId = conversationActiveCall.accountId)
- ?.getByUri(uri = conversationActiveCall.conversationId)
+ ?.getByUri(conversationActiveCall.conversationUri)
?.let {
mNotificationService.showGroupCallNotification(
conversation = it,
--
GitLab