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
f3334fed
Commit
f3334fed
authored
2 years ago
by
Aline Gondim Santos
Committed by
Sébastien Blin
2 years ago
Browse files
Options
Downloads
Patches
Plain Diff
fix: properly delete one to one swarm
Change-Id: If154f7c1ef6f735a93afe96e96a91ddb0db369b3
parent
a35e21f9
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/app/mainview/components/ConversationListView.qml
+2
-0
2 additions, 0 deletions
src/app/mainview/components/ConversationListView.qml
src/app/mainview/components/ConversationSmartListContextMenu.qml
+7
-8
7 additions, 8 deletions
.../mainview/components/ConversationSmartListContextMenu.qml
with
9 additions
and
8 deletions
src/app/mainview/components/ConversationListView.qml
+
2
−
0
View file @
f3334fed
...
...
@@ -132,6 +132,7 @@ JamiListView {
"
uri
"
:
model
.
dataForRow
(
row
,
ConversationList
.
URI
),
"
isBanned
"
:
model
.
dataForRow
(
row
,
ConversationList
.
IsBanned
),
"
mode
"
:
model
.
dataForRow
(
row
,
ConversationList
.
Mode
),
"
isCoreDialog
"
:
model
.
dataForRow
(
row
,
ConversationList
.
IsCoreDialog
),
"
isTemporary
"
:
model
.
dataForRow
(
row
,
ConversationList
.
ContactType
)
===
Profile
.
Type
.
TEMPORARY
,
}
...
...
@@ -139,6 +140,7 @@ JamiListView {
responsibleConvUid
=
item
.
convId
isBanned
=
item
.
isBanned
mode
=
item
.
mode
isCoreDialog
=
item
.
isCoreDialog
contactType
=
LRCInstance
.
currentAccountType
readOnly
=
mode
===
Conversation
.
Mode
.
NON_SWARM
&&
!
item
.
isTemporary
&&
CurrentAccount
.
type
!==
Profile
.
Type
.
SIP
...
...
This diff is collapsed.
Click to expand it.
src/app/mainview/components/ConversationSmartListContextMenu.qml
+
7
−
8
View file @
f3334fed
...
...
@@ -37,7 +37,7 @@ ContextMenuAutoLoader {
textLabel
:
JamiStrings
.
confirmRmConversation
confirmLabel
:
JamiStrings
.
optionRemove
onAccepted
:
{
if
(
is
Swarm
)
if
(
!
is
CoreDialog
)
MessagesAdapter
.
removeConversation
(
responsibleConvUid
)
else
MessagesAdapter
.
removeContact
(
responsibleConvUid
)
...
...
@@ -56,7 +56,7 @@ ContextMenuAutoLoader {
property
string
responsibleAccountId
:
""
property
string
responsibleConvUid
:
""
property
bool
isBanned
:
false
property
bool
isSwarm
:
false
property
var
isCoreDialog
:
undefined
property
var
mode
:
undefined
property
int
contactType
:
Profile
.
Type
.
INVALID
property
bool
hasCall
:
{
...
...
@@ -96,7 +96,7 @@ ContextMenuAutoLoader {
GeneralMenuItem
{
id
:
clearConversation
canTrigger
:
!
is
Swarm
&&
!
hasCall
&&
!
root
.
isBanned
canTrigger
:
is
CoreDialog
&&
!
hasCall
&&
!
root
.
isBanned
itemName
:
JamiStrings
.
clearConversation
iconSource
:
JamiResources
.
ic_clear_24dp_svg
onClicked
:
MessagesAdapter
.
clearConversationHistory
(
...
...
@@ -108,7 +108,7 @@ ContextMenuAutoLoader {
canTrigger
:
!
hasCall
&&
!
root
.
isBanned
itemName
:
{
if
(
mode
!==
Conversation
.
Mode
.
ONE_TO_ONE
&&
mode
!==
Conversation
.
Mode
.
NON_SWARM
)
if
(
mode
!==
Conversation
.
Mode
.
NON_SWARM
)
return
JamiStrings
.
removeConversation
else
return
JamiStrings
.
removeContact
...
...
@@ -148,7 +148,7 @@ ContextMenuAutoLoader {
id
:
blockContact
canTrigger
:
!
hasCall
&&
contactType
!==
Profile
.
Type
.
SIP
&&
!
root
.
isBanned
itemName
:
!
(
mode
&&
mode
!==
Conversation
.
Mode
.
ONE_TO_ONE
&&
mode
!==
Conversation
.
Mode
.
NON_SWARM
)
?
JamiStrings
.
blockContact
:
JamiStrings
.
blockSwarm
itemName
:
!
(
mode
&&
isCoreDialog
)
?
JamiStrings
.
blockContact
:
JamiStrings
.
blockSwarm
iconSource
:
JamiResources
.
block_black_24dp_svg
addMenuSeparatorAfter
:
contactType
!==
Profile
.
Type
.
SIP
onClicked
:
blockDialog
.
open
()
...
...
@@ -165,12 +165,11 @@ ContextMenuAutoLoader {
GeneralMenuItem
{
id
:
contactDetails
property
bool
oneToOne
:
!
(
mode
&&
mode
!==
Conversation
.
Mode
.
ONE_TO_ONE
&&
mode
!==
Conversation
.
Mode
.
NON_SWARM
)
canTrigger
:
contactType
!==
Profile
.
Type
.
SIP
itemName
:
oneToOne
?
JamiStrings
.
contactDetails
:
JamiStrings
.
convDetails
itemName
:
isCoreDialog
?
JamiStrings
.
contactDetails
:
JamiStrings
.
convDetails
iconSource
:
JamiResources
.
person_24dp_svg
onClicked
:
{
if
(
oneToOne
)
if
(
isCoreDialog
)
userProfile
.
open
()
else
root
.
showSwarmDetails
()
...
...
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