From 85e79e5618a35e54f4c543b84c05b734c4cfac9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois-Simon=20Fauteux-Chapleau?=
<francois-simon.fauteux-chapleau@savoirfairelinux.com>
Date: Wed, 27 Nov 2024 17:03:11 -0500
Subject: [PATCH] jamiaccount: don't needlessly force new connection
GitLab: #1083
Change-Id: If43a74758bbceff69e57baa2fc70c4526ec1f9f0
---
src/jamidht/jamiaccount.cpp | 8 +++-----
src/jamidht/jamiaccount.h | 5 ++---
2 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/src/jamidht/jamiaccount.cpp b/src/jamidht/jamiaccount.cpp
index 0b8124e48..4934ba8ef 100644
--- a/src/jamidht/jamiaccount.cpp
+++ b/src/jamidht/jamiaccount.cpp
@@ -3685,8 +3685,7 @@ JamiAccount::callConnectionClosed(const DeviceId& deviceId, bool eraseDummy)
void
JamiAccount::requestMessageConnection(const std::string& peerId,
const DeviceId& deviceId,
- const std::string& connectionType,
- bool forceNewConnection)
+ const std::string& connectionType)
{
auto* handler = static_cast<MessageChannelHandler*>(
channelHandlers_[Uri::Scheme::MESSAGE].get());
@@ -3711,8 +3710,7 @@ JamiAccount::requestMessageConnection(const std::string& peerId,
acc->messageEngine_.onPeerOnline(peerId, deviceId.toString(), true);
}
},
- connectionType,
- forceNewConnection);
+ connectionType);
}
void
@@ -3722,7 +3720,7 @@ JamiAccount::requestSIPConnection(const std::string& peerId,
bool forceNewConnection,
const std::shared_ptr<SIPCall>& pc)
{
- requestMessageConnection(peerId, deviceId, connectionType, forceNewConnection);
+ requestMessageConnection(peerId, deviceId, connectionType);
if (peerId == getUsername()) {
if (!syncModule()->isConnected(deviceId))
channelHandlers_[Uri::Scheme::SYNC]
diff --git a/src/jamidht/jamiaccount.h b/src/jamidht/jamiaccount.h
index a9e6e6a26..2e2078435 100644
--- a/src/jamidht/jamiaccount.h
+++ b/src/jamidht/jamiaccount.h
@@ -843,9 +843,8 @@ private:
const DeviceId& deviceId);
void requestMessageConnection(const std::string& peerId,
- const DeviceId& deviceId,
- const std::string& connectionType,
- bool forceNewConnection);
+ const DeviceId& deviceId,
+ const std::string& connectionType);
// File transfers
std::mutex transfersMtx_ {};
--
GitLab