Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-daemon
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-daemon
Commits
85e79e56
Commit
85e79e56
authored
4 months ago
by
François-Simon Fauteux-Chapleau
Committed by
Adrien Béraud
4 months ago
Browse files
Options
Downloads
Patches
Plain Diff
jamiaccount: don't needlessly force new connection
GitLab:
#1083
Change-Id: If43a74758bbceff69e57baa2fc70c4526ec1f9f0
parent
cd0eca6b
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/jamidht/jamiaccount.cpp
+3
-5
3 additions, 5 deletions
src/jamidht/jamiaccount.cpp
src/jamidht/jamiaccount.h
+2
-3
2 additions, 3 deletions
src/jamidht/jamiaccount.h
with
5 additions
and
8 deletions
src/jamidht/jamiaccount.cpp
+
3
−
5
View file @
85e79e56
...
...
@@ -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
]
...
...
This diff is collapsed.
Click to expand it.
src/jamidht/jamiaccount.h
+
2
−
3
View file @
85e79e56
...
...
@@ -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_
{};
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment