From 5b7805c5ca7d41442b4afb5e55677c9f5e7e7749 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
Date: Sun, 6 Apr 2025 23:44:53 -0400
Subject: [PATCH] Account: replace existing request with conversation
Change-Id: Ief85f975d1c825fe4fcb37623cccf744d409207c
---
.../libjamiclient/src/main/kotlin/net/jami/model/Account.kt | 5 +++++
1 file changed, 5 insertions(+)
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 aa5330536..42d2e251e 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
@@ -671,6 +671,11 @@ class Account(
if (!conversation.isSwarm) {
val contact = getContactFromCache(request.from)
conversation.addRequestEvent(request, contact)
+ } else {
+ val removed = pending.remove(request.from.uri)
+ if (removed != null && removed.request == null) {
+ Log.w(TAG, "Replaced pending contact ${request.from.uri} with pending conversation request $key")
+ }
}
pendingChanged()
}
--
GitLab