Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
savoirfairelinux
jami-lrc
Commits
ec26847a
Unverified
Commit
ec26847a
authored
Apr 24, 2020
by
Sébastien Blin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
contactmodel: don't reset presence on confirmed
Change-Id: I78cfa458d16aabe1e73223848e06ee90ccae9fc4
parent
ea8140fc
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
1 deletion
+4
-1
src/contactmodel.cpp
src/contactmodel.cpp
+4
-1
No files found.
src/contactmodel.cpp
View file @
ec26847a
...
...
@@ -615,12 +615,15 @@ ContactModelPimpl::slotNewBuddySubscription(const QString& contactUri, bool stat
void
ContactModelPimpl
::
slotContactAdded
(
const
QString
&
accountId
,
const
QString
&
contactUri
,
bool
confirmed
)
{
Q_UNUSED
(
confirmed
)
if
(
accountId
!=
linked
.
owner
.
id
)
return
;
auto
contact
=
contacts
.
find
(
contactUri
);
if
(
contact
->
profileInfo
.
type
==
profile
::
Type
::
PENDING
)
{
emit
behaviorController
.
trustRequestTreated
(
linked
.
owner
.
id
,
contactUri
);
}
else
if
(
contact
->
profileInfo
.
type
==
profile
::
Type
::
RING
&&
!
contact
->
isBanned
&&
confirmed
)
{
// This means that the peer accepted the trust request. We don't need to re-add the contact
// a second time (and this reset the presence to false).
return
;
}
bool
isBanned
=
false
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment