aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlink2xt <link2xt@testrun.org>2021-06-06 17:29:27 +0300
committerlink2xt <link2xt@testrun.org>2021-06-06 17:29:27 +0300
commit673447241e20dff4bfe7ddb13805a5bd6e47a5ce (patch)
treea6f74c501738938f78ec0fab470c205baf80a187
parent3d2729ea467bf59bfed1522f17bf53841d140640 (diff)
downloadkdeltachat-673447241e20dff4bfe7ddb13805a5bd6e47a5ce.tar.gz
kdeltachat-673447241e20dff4bfe7ddb13805a5bd6e47a5ce.zip
Allow to open deaddrop chat, but do not mark it as seen or noticed
-rw-r--r--qml/ChatlistPage.qml8
-rw-r--r--qml/Message.qml6
2 files changed, 10 insertions, 4 deletions
diff --git a/qml/ChatlistPage.qml b/qml/ChatlistPage.qml
index 5390baa..5da4d25 100644
--- a/qml/ChatlistPage.qml
+++ b/qml/ChatlistPage.qml
@@ -113,10 +113,12 @@ Kirigami.ScrollablePage {
var chatId = chatlistModel.get(chatlist.currentIndex).chatId
- if (chatId > 9) {
- // > DC_CHAT_ID_LAST_SPECIAL
+ if (chatId == 1 || chatId > 9) {
+ // chatId == DC_CHAT_ID_DEADDROP || chatId > DC_CHAT_ID_LAST_SPECIAL
- chatlistPage.context.marknoticedChat(chatId)
+ if (chatId != 1) {
+ chatlistPage.context.marknoticedChat(chatId)
+ }
console.log("Selected chat " + chatId)
diff --git a/qml/Message.qml b/qml/Message.qml
index c3f5b62..21b3959 100644
--- a/qml/Message.qml
+++ b/qml/Message.qml
@@ -30,7 +30,11 @@ RowLayout {
// Only try to mark fresh and noticed messages as seen to
// avoid unnecessary database calls when viewing an already read chat.
if ([10, 13].includes(messageObject.message.state)) {
- messageObject.context.markseenMsgs([messageObject.message.id])
+ // Do not mark DC_CHAT_ID_DEADDROP messages as seen to
+ // avoid contact request chat disappearing from chatlist.
+ if (messageObject.chatId != 1) {
+ messageObject.context.markseenMsgs([messageObject.message.id])
+ }
}
}