Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-client-qt
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review 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-client-qt
Commits
cba84f2c
Commit
cba84f2c
authored
4 months ago
by
Adrien Béraud
Committed by
Adrien Béraud
4 months ago
Browse files
Options
Downloads
Patches
Plain Diff
conversation: simplify indexOfActiveCall
Change-Id: Ic31b708fc7bea67ea00171665aca955dd2633c37
parent
7289a92b
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/app/lrcinstance.cpp
+1
-1
1 addition, 1 deletion
src/app/lrcinstance.cpp
src/libclient/api/conversation.h
+2
-3
2 additions, 3 deletions
src/libclient/api/conversation.h
with
3 additions
and
4 deletions
src/app/lrcinstance.cpp
+
1
−
1
View file @
cba84f2c
...
@@ -412,7 +412,7 @@ LRCInstance::indexOfActiveCall(const QString& confId, const QString& uri, const
...
@@ -412,7 +412,7 @@ LRCInstance::indexOfActiveCall(const QString& confId, const QString& uri, const
{
{
if
(
auto
optConv
=
getCurrentConversationModel
()
->
getConversationForUid
(
selectedConvUid_
))
{
if
(
auto
optConv
=
getCurrentConversationModel
()
->
getConversationForUid
(
selectedConvUid_
))
{
auto
&
convInfo
=
optConv
->
get
();
auto
&
convInfo
=
optConv
->
get
();
return
convInfo
.
indexOfActiveCall
(
{{
"
confId
"
,
confId
},
{
"uri"
,
uri
},
{
"device"
,
deviceId
}}
);
return
convInfo
.
indexOfActiveCall
(
confId
,
uri
,
deviceId
);
}
}
return
-
1
;
return
-
1
;
}
}
...
...
This diff is collapsed.
Click to expand it.
src/libclient/api/conversation.h
+
2
−
3
View file @
cba84f2c
...
@@ -95,12 +95,11 @@ struct Info
...
@@ -95,12 +95,11 @@ struct Info
MapStringString
infos
{};
MapStringString
infos
{};
MapStringString
preferences
{};
MapStringString
preferences
{};
int
indexOfActiveCall
(
const
Map
String
String
&
commit
)
int
indexOfActiveCall
(
const
Q
String
&
confId
,
const
QString
&
uri
,
const
QString
&
deviceId
)
{
{
for
(
auto
idx
=
0
;
idx
!=
activeCalls
.
size
();
++
idx
)
{
for
(
auto
idx
=
0
;
idx
!=
activeCalls
.
size
();
++
idx
)
{
const
auto
&
call
=
activeCalls
[
idx
];
const
auto
&
call
=
activeCalls
[
idx
];
if
(
call
[
"id"
]
==
commit
[
"confId"
]
&&
call
[
"uri"
]
==
commit
[
"uri"
]
if
(
call
[
"id"
]
==
confId
&&
call
[
"uri"
]
==
uri
&&
call
[
"device"
]
==
deviceId
)
{
&&
call
[
"device"
]
==
commit
[
"device"
])
{
return
idx
;
return
idx
;
}
}
}
}
...
...
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