aboutsummaryrefslogtreecommitdiff
path: root/qml
diff options
context:
space:
mode:
authorlink2xt <link2xt@testrun.org>2021-07-26 00:07:19 +0300
committerlink2xt <link2xt@testrun.org>2021-07-26 00:08:11 +0300
commitcd6fe80f84c1f1e44b4ee306ac2672a7287778c1 (patch)
tree150ab9e3b2f4a2228be0387fab5d7f40af363d2b /qml
parent9e5fe2dc856795d0d3d8b6a3adf3fdd3015d9158 (diff)
downloadkdeltachat-cd6fe80f84c1f1e44b4ee306ac2672a7287778c1.tar.gz
kdeltachat-cd6fe80f84c1f1e44b4ee306ac2672a7287778c1.zip
Get rid of the contact requests chat
Diffstat (limited to 'qml')
-rw-r--r--qml/ChatPage.qml16
-rw-r--r--qml/ChatlistPage.qml12
-rw-r--r--qml/Message.qml4
3 files changed, 17 insertions, 15 deletions
diff --git a/qml/ChatPage.qml b/qml/ChatPage.qml
index 3099488..9b2e7c6 100644
--- a/qml/ChatPage.qml
+++ b/qml/ChatPage.qml
@@ -15,7 +15,20 @@ Kirigami.ScrollablePage {
required property DcAccountsEventEmitter eventEmitter
required property var chatId
- readonly property DcChat chat: context.getChat(chatId)
+ property DcChat chat: context.getChat(chatId)
+
+ contextualActions: [
+ Kirigami.Action {
+ text: "Accept contact request"
+ onTriggered: chatPage.context.unblockChat(chatPage.chatId)
+ visible: chatPage.chat && chatPage.chat.isContactRequest
+ },
+ Kirigami.Action {
+ text: "Block contact request"
+ onTriggered: chatPage.context.blockChat(chatPage.chatId)
+ visible: chatPage.chat && chatPage.chat.isContactRequest
+ }
+ ]
function updateMessagelist() {
// Reverse message list, because it is laid out from bottom to top.
@@ -57,6 +70,7 @@ Kirigami.ScrollablePage {
function onChatModified() {
console.log("CHAT MODIFIED!")
+ chatPage.chat = context.getChat(chatId)
}
function onIncomingMessage(accountId, chatId, msgId) {
console.log("Incoming message for chat " + chatId)
diff --git a/qml/ChatlistPage.qml b/qml/ChatlistPage.qml
index 343b8da..7ba516a 100644
--- a/qml/ChatlistPage.qml
+++ b/qml/ChatlistPage.qml
@@ -49,14 +49,6 @@ Kirigami.ScrollablePage {
console.log("Can't open Settings page")
}
}
- },
- Kirigami.Action {
- text: "Contact requests"
- onTriggered: {
- chatlist.currentIndex = -1
- loadChat(1)
- console.log("Opening contact requests chat");
- }
}
]
@@ -145,8 +137,8 @@ Kirigami.ScrollablePage {
var chatId = chatlistModel.get(chatlist.currentIndex).chatId
- if (chatId == 1 || chatId > 9) {
- // chatId == DC_CHAT_ID_DEADDROP || chatId > DC_CHAT_ID_LAST_SPECIAL
+ if (chatId > 9) {
+ // chatId > DC_CHAT_ID_LAST_SPECIAL
loadChat(chatId)
} else if (chatId == 6) {
diff --git a/qml/Message.qml b/qml/Message.qml
index 1c7f7f3..69f5f62 100644
--- a/qml/Message.qml
+++ b/qml/Message.qml
@@ -148,10 +148,6 @@ RowLayout {
text: "Info"
onTriggered: messageDialog.open()
}
- Action {
- text: "Start chat"
- onTriggered: messageObject.context.decideOnContactRequest(messageObject.message.id, 0)
- }
}
}