diff --git a/resources/icons/ui/unlock.png b/resources/icons/ui/unlock.png
new file mode 100644
index 00000000..90e4602a
--- /dev/null
+++ b/resources/icons/ui/unlock.png
Binary files differdiff --git a/resources/icons/ui/unlock@2x.png b/resources/icons/ui/unlock@2x.png
new file mode 100644
index 00000000..8df18143
--- /dev/null
+++ b/resources/icons/ui/unlock@2x.png
Binary files differdiff --git a/resources/langs/nheko_de.ts b/resources/langs/nheko_de.ts
index fcbf8b31..2b5a5393 100644
--- a/resources/langs/nheko_de.ts
+++ b/resources/langs/nheko_de.ts
@@ -189,10 +189,15 @@
<context>
<name>EncryptionIndicator</name>
<message>
- <location filename="../qml/EncryptionIndicator.qml" line="+12"/>
+ <location filename="../qml/EncryptionIndicator.qml" line="+36"/>
<source>Encrypted</source>
<translation>Verschlüsselt</translation>
</message>
+ <message>
+ <location line="+2"/>
+ <source>This message is not encrypted!</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>InviteeItem</name>
@@ -310,7 +315,7 @@ Beispiel: https://mein.server:8787</translation>
<context>
<name>MessageDelegate</name>
<message>
- <location filename="../qml/delegates/MessageDelegate.qml" line="+64"/>
+ <location filename="../qml/delegates/MessageDelegate.qml" line="+66"/>
<source>redacted</source>
<translation>gelöscht</translation>
</message>
@@ -548,7 +553,7 @@ Beispiel: https://mein.server:8787</translation>
<context>
<name>TimelineModel</name>
<message>
- <location filename="../../src/timeline/TimelineModel.cpp" line="+844"/>
+ <location filename="../../src/timeline/TimelineModel.cpp" line="+853"/>
<source>-- Decryption Error (failed to communicate with DB) --</source>
<comment>Placeholder, when the message can't be decrypted, because the DB access failed when trying to lookup the session.</comment>
<translation>-- Entschlüsselungsfehler (Fehler bei Kommunikation mit Datenbank) --</translation>
@@ -746,7 +751,7 @@ Beispiel: https://mein.server:8787</translation>
<context>
<name>TimelineRow</name>
<message>
- <location filename="../qml/TimelineRow.qml" line="+87"/>
+ <location filename="../qml/TimelineRow.qml" line="+88"/>
<source>Reply</source>
<translation>Antworten</translation>
</message>
@@ -799,7 +804,7 @@ Beispiel: https://mein.server:8787</translation>
<translation>Kein Raum geöffnet</translation>
</message>
<message>
- <location line="+254"/>
+ <location line="+256"/>
<source>Close</source>
<translation>Schließen</translation>
</message>
diff --git a/resources/langs/nheko_el.ts b/resources/langs/nheko_el.ts
index 39ed1442..a6e4ff7d 100644
--- a/resources/langs/nheko_el.ts
+++ b/resources/langs/nheko_el.ts
@@ -189,10 +189,15 @@
<context>
<name>EncryptionIndicator</name>
<message>
- <location filename="../qml/EncryptionIndicator.qml" line="+12"/>
+ <location filename="../qml/EncryptionIndicator.qml" line="+36"/>
<source>Encrypted</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location line="+2"/>
+ <source>This message is not encrypted!</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>InviteeItem</name>
@@ -306,7 +311,7 @@ Example: https://server.my:8787</source>
<context>
<name>MessageDelegate</name>
<message>
- <location filename="../qml/delegates/MessageDelegate.qml" line="+64"/>
+ <location filename="../qml/delegates/MessageDelegate.qml" line="+66"/>
<source>redacted</source>
<translation type="unfinished"></translation>
</message>
@@ -544,7 +549,7 @@ Example: https://server.my:8787</source>
<context>
<name>TimelineModel</name>
<message>
- <location filename="../../src/timeline/TimelineModel.cpp" line="+844"/>
+ <location filename="../../src/timeline/TimelineModel.cpp" line="+853"/>
<source>-- Decryption Error (failed to communicate with DB) --</source>
<comment>Placeholder, when the message can't be decrypted, because the DB access failed when trying to lookup the session.</comment>
<translation type="unfinished"></translation>
@@ -742,7 +747,7 @@ Example: https://server.my:8787</source>
<context>
<name>TimelineRow</name>
<message>
- <location filename="../qml/TimelineRow.qml" line="+87"/>
+ <location filename="../qml/TimelineRow.qml" line="+88"/>
<source>Reply</source>
<translation type="unfinished"></translation>
</message>
@@ -795,7 +800,7 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+254"/>
+ <location line="+256"/>
<source>Close</source>
<translation type="unfinished"></translation>
</message>
diff --git a/resources/langs/nheko_en.ts b/resources/langs/nheko_en.ts
index e7631462..1fd9b86c 100644
--- a/resources/langs/nheko_en.ts
+++ b/resources/langs/nheko_en.ts
@@ -189,10 +189,15 @@
<context>
<name>EncryptionIndicator</name>
<message>
- <location filename="../qml/EncryptionIndicator.qml" line="+12"/>
+ <location filename="../qml/EncryptionIndicator.qml" line="+36"/>
<source>Encrypted</source>
<translation>Encrypted</translation>
</message>
+ <message>
+ <location line="+2"/>
+ <source>This message is not encrypted!</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>InviteeItem</name>
@@ -310,7 +315,7 @@ Example: https://server.my:8787</translation>
<context>
<name>MessageDelegate</name>
<message>
- <location filename="../qml/delegates/MessageDelegate.qml" line="+64"/>
+ <location filename="../qml/delegates/MessageDelegate.qml" line="+66"/>
<source>redacted</source>
<translation>redacted</translation>
</message>
@@ -548,7 +553,7 @@ Example: https://server.my:8787</translation>
<context>
<name>TimelineModel</name>
<message>
- <location filename="../../src/timeline/TimelineModel.cpp" line="+844"/>
+ <location filename="../../src/timeline/TimelineModel.cpp" line="+853"/>
<source>-- Decryption Error (failed to communicate with DB) --</source>
<comment>Placeholder, when the message can't be decrypted, because the DB access failed when trying to lookup the session.</comment>
<translation>-- Decryption Error (failed to communicate with DB) --</translation>
@@ -746,7 +751,7 @@ Example: https://server.my:8787</translation>
<context>
<name>TimelineRow</name>
<message>
- <location filename="../qml/TimelineRow.qml" line="+87"/>
+ <location filename="../qml/TimelineRow.qml" line="+88"/>
<source>Reply</source>
<translation>Reply</translation>
</message>
@@ -799,7 +804,7 @@ Example: https://server.my:8787</translation>
<translation>No room open</translation>
</message>
<message>
- <location line="+254"/>
+ <location line="+256"/>
<source>Close</source>
<translation>Close</translation>
</message>
diff --git a/resources/langs/nheko_fi.ts b/resources/langs/nheko_fi.ts
index 01b9d75d..069fb6b2 100644
--- a/resources/langs/nheko_fi.ts
+++ b/resources/langs/nheko_fi.ts
@@ -189,10 +189,15 @@
<context>
<name>EncryptionIndicator</name>
<message>
- <location filename="../qml/EncryptionIndicator.qml" line="+12"/>
+ <location filename="../qml/EncryptionIndicator.qml" line="+36"/>
<source>Encrypted</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location line="+2"/>
+ <source>This message is not encrypted!</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>InviteeItem</name>
@@ -306,7 +311,7 @@ Example: https://server.my:8787</source>
<context>
<name>MessageDelegate</name>
<message>
- <location filename="../qml/delegates/MessageDelegate.qml" line="+64"/>
+ <location filename="../qml/delegates/MessageDelegate.qml" line="+66"/>
<source>redacted</source>
<translation type="unfinished"></translation>
</message>
@@ -544,7 +549,7 @@ Example: https://server.my:8787</source>
<context>
<name>TimelineModel</name>
<message>
- <location filename="../../src/timeline/TimelineModel.cpp" line="+844"/>
+ <location filename="../../src/timeline/TimelineModel.cpp" line="+853"/>
<source>-- Decryption Error (failed to communicate with DB) --</source>
<comment>Placeholder, when the message can't be decrypted, because the DB access failed when trying to lookup the session.</comment>
<translation type="unfinished">-- Virhe purkaessa salausta (tietokannan kanssa kommunikointi epäonnistui) --</translation>
@@ -742,7 +747,7 @@ Example: https://server.my:8787</source>
<context>
<name>TimelineRow</name>
<message>
- <location filename="../qml/TimelineRow.qml" line="+87"/>
+ <location filename="../qml/TimelineRow.qml" line="+88"/>
<source>Reply</source>
<translation type="unfinished"></translation>
</message>
@@ -795,7 +800,7 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+254"/>
+ <location line="+256"/>
<source>Close</source>
<translation type="unfinished">Sulje</translation>
</message>
diff --git a/resources/langs/nheko_fr.ts b/resources/langs/nheko_fr.ts
index 9e47702b..d50b5fb8 100644
--- a/resources/langs/nheko_fr.ts
+++ b/resources/langs/nheko_fr.ts
@@ -189,10 +189,15 @@
<context>
<name>EncryptionIndicator</name>
<message>
- <location filename="../qml/EncryptionIndicator.qml" line="+12"/>
+ <location filename="../qml/EncryptionIndicator.qml" line="+36"/>
<source>Encrypted</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location line="+2"/>
+ <source>This message is not encrypted!</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>InviteeItem</name>
@@ -306,7 +311,7 @@ Example: https://server.my:8787</source>
<context>
<name>MessageDelegate</name>
<message>
- <location filename="../qml/delegates/MessageDelegate.qml" line="+64"/>
+ <location filename="../qml/delegates/MessageDelegate.qml" line="+66"/>
<source>redacted</source>
<translation type="unfinished"></translation>
</message>
@@ -544,7 +549,7 @@ Example: https://server.my:8787</source>
<context>
<name>TimelineModel</name>
<message>
- <location filename="../../src/timeline/TimelineModel.cpp" line="+844"/>
+ <location filename="../../src/timeline/TimelineModel.cpp" line="+853"/>
<source>-- Decryption Error (failed to communicate with DB) --</source>
<comment>Placeholder, when the message can't be decrypted, because the DB access failed when trying to lookup the session.</comment>
<translation type="unfinished"></translation>
@@ -742,7 +747,7 @@ Example: https://server.my:8787</source>
<context>
<name>TimelineRow</name>
<message>
- <location filename="../qml/TimelineRow.qml" line="+87"/>
+ <location filename="../qml/TimelineRow.qml" line="+88"/>
<source>Reply</source>
<translation type="unfinished"></translation>
</message>
@@ -795,7 +800,7 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+254"/>
+ <location line="+256"/>
<source>Close</source>
<translation type="unfinished"></translation>
</message>
diff --git a/resources/langs/nheko_ja.ts b/resources/langs/nheko_ja.ts
index 049c4189..63522065 100644
--- a/resources/langs/nheko_ja.ts
+++ b/resources/langs/nheko_ja.ts
@@ -189,10 +189,15 @@
<context>
<name>EncryptionIndicator</name>
<message>
- <location filename="../qml/EncryptionIndicator.qml" line="+12"/>
+ <location filename="../qml/EncryptionIndicator.qml" line="+36"/>
<source>Encrypted</source>
<translation>暗号化されています</translation>
</message>
+ <message>
+ <location line="+2"/>
+ <source>This message is not encrypted!</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>InviteeItem</name>
@@ -306,7 +311,7 @@ Example: https://server.my:8787</source>
<context>
<name>MessageDelegate</name>
<message>
- <location filename="../qml/delegates/MessageDelegate.qml" line="+64"/>
+ <location filename="../qml/delegates/MessageDelegate.qml" line="+66"/>
<source>redacted</source>
<translation>編集済み</translation>
</message>
@@ -544,7 +549,7 @@ Example: https://server.my:8787</source>
<context>
<name>TimelineModel</name>
<message>
- <location filename="../../src/timeline/TimelineModel.cpp" line="+844"/>
+ <location filename="../../src/timeline/TimelineModel.cpp" line="+853"/>
<source>-- Decryption Error (failed to communicate with DB) --</source>
<comment>Placeholder, when the message can't be decrypted, because the DB access failed when trying to lookup the session.</comment>
<translation>-- 復号エラー (データベースと通信できませんでした) --</translation>
@@ -741,7 +746,7 @@ Example: https://server.my:8787</source>
<context>
<name>TimelineRow</name>
<message>
- <location filename="../qml/TimelineRow.qml" line="+87"/>
+ <location filename="../qml/TimelineRow.qml" line="+88"/>
<source>Reply</source>
<translation>返信</translation>
</message>
@@ -794,7 +799,7 @@ Example: https://server.my:8787</source>
<translation>部屋が開いていません</translation>
</message>
<message>
- <location line="+254"/>
+ <location line="+256"/>
<source>Close</source>
<translation>閉じる</translation>
</message>
diff --git a/resources/langs/nheko_nl.ts b/resources/langs/nheko_nl.ts
index 205de986..2c3eeee3 100644
--- a/resources/langs/nheko_nl.ts
+++ b/resources/langs/nheko_nl.ts
@@ -189,10 +189,15 @@
<context>
<name>EncryptionIndicator</name>
<message>
- <location filename="../qml/EncryptionIndicator.qml" line="+12"/>
+ <location filename="../qml/EncryptionIndicator.qml" line="+36"/>
<source>Encrypted</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location line="+2"/>
+ <source>This message is not encrypted!</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>InviteeItem</name>
@@ -306,7 +311,7 @@ Example: https://server.my:8787</source>
<context>
<name>MessageDelegate</name>
<message>
- <location filename="../qml/delegates/MessageDelegate.qml" line="+64"/>
+ <location filename="../qml/delegates/MessageDelegate.qml" line="+66"/>
<source>redacted</source>
<translation type="unfinished"></translation>
</message>
@@ -544,7 +549,7 @@ Example: https://server.my:8787</source>
<context>
<name>TimelineModel</name>
<message>
- <location filename="../../src/timeline/TimelineModel.cpp" line="+844"/>
+ <location filename="../../src/timeline/TimelineModel.cpp" line="+853"/>
<source>-- Decryption Error (failed to communicate with DB) --</source>
<comment>Placeholder, when the message can't be decrypted, because the DB access failed when trying to lookup the session.</comment>
<translation type="unfinished"></translation>
@@ -742,7 +747,7 @@ Example: https://server.my:8787</source>
<context>
<name>TimelineRow</name>
<message>
- <location filename="../qml/TimelineRow.qml" line="+87"/>
+ <location filename="../qml/TimelineRow.qml" line="+88"/>
<source>Reply</source>
<translation type="unfinished"></translation>
</message>
@@ -795,7 +800,7 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+254"/>
+ <location line="+256"/>
<source>Close</source>
<translation type="unfinished"></translation>
</message>
diff --git a/resources/langs/nheko_pl.ts b/resources/langs/nheko_pl.ts
index c089a5b4..f68ca8b3 100644
--- a/resources/langs/nheko_pl.ts
+++ b/resources/langs/nheko_pl.ts
@@ -189,10 +189,15 @@
<context>
<name>EncryptionIndicator</name>
<message>
- <location filename="../qml/EncryptionIndicator.qml" line="+12"/>
+ <location filename="../qml/EncryptionIndicator.qml" line="+36"/>
<source>Encrypted</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location line="+2"/>
+ <source>This message is not encrypted!</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>InviteeItem</name>
@@ -306,7 +311,7 @@ Example: https://server.my:8787</source>
<context>
<name>MessageDelegate</name>
<message>
- <location filename="../qml/delegates/MessageDelegate.qml" line="+64"/>
+ <location filename="../qml/delegates/MessageDelegate.qml" line="+66"/>
<source>redacted</source>
<translation type="unfinished"></translation>
</message>
@@ -544,7 +549,7 @@ Example: https://server.my:8787</source>
<context>
<name>TimelineModel</name>
<message>
- <location filename="../../src/timeline/TimelineModel.cpp" line="+844"/>
+ <location filename="../../src/timeline/TimelineModel.cpp" line="+853"/>
<source>-- Decryption Error (failed to communicate with DB) --</source>
<comment>Placeholder, when the message can't be decrypted, because the DB access failed when trying to lookup the session.</comment>
<translation type="unfinished"></translation>
@@ -743,7 +748,7 @@ Example: https://server.my:8787</source>
<context>
<name>TimelineRow</name>
<message>
- <location filename="../qml/TimelineRow.qml" line="+87"/>
+ <location filename="../qml/TimelineRow.qml" line="+88"/>
<source>Reply</source>
<translation type="unfinished"></translation>
</message>
@@ -796,7 +801,7 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+254"/>
+ <location line="+256"/>
<source>Close</source>
<translation type="unfinished"></translation>
</message>
diff --git a/resources/langs/nheko_ru.ts b/resources/langs/nheko_ru.ts
index 761110f0..95f75081 100644
--- a/resources/langs/nheko_ru.ts
+++ b/resources/langs/nheko_ru.ts
@@ -189,10 +189,15 @@
<context>
<name>EncryptionIndicator</name>
<message>
- <location filename="../qml/EncryptionIndicator.qml" line="+12"/>
+ <location filename="../qml/EncryptionIndicator.qml" line="+36"/>
<source>Encrypted</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location line="+2"/>
+ <source>This message is not encrypted!</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>InviteeItem</name>
@@ -306,7 +311,7 @@ Example: https://server.my:8787</source>
<context>
<name>MessageDelegate</name>
<message>
- <location filename="../qml/delegates/MessageDelegate.qml" line="+64"/>
+ <location filename="../qml/delegates/MessageDelegate.qml" line="+66"/>
<source>redacted</source>
<translation type="unfinished"></translation>
</message>
@@ -544,7 +549,7 @@ Example: https://server.my:8787</source>
<context>
<name>TimelineModel</name>
<message>
- <location filename="../../src/timeline/TimelineModel.cpp" line="+844"/>
+ <location filename="../../src/timeline/TimelineModel.cpp" line="+853"/>
<source>-- Decryption Error (failed to communicate with DB) --</source>
<comment>Placeholder, when the message can't be decrypted, because the DB access failed when trying to lookup the session.</comment>
<translation type="unfinished"></translation>
@@ -743,7 +748,7 @@ Example: https://server.my:8787</source>
<context>
<name>TimelineRow</name>
<message>
- <location filename="../qml/TimelineRow.qml" line="+87"/>
+ <location filename="../qml/TimelineRow.qml" line="+88"/>
<source>Reply</source>
<translation type="unfinished"></translation>
</message>
@@ -796,7 +801,7 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+254"/>
+ <location line="+256"/>
<source>Close</source>
<translation type="unfinished">Закрыть</translation>
</message>
diff --git a/resources/langs/nheko_zh_CN.ts b/resources/langs/nheko_zh_CN.ts
index 5b080b74..6b6c0646 100644
--- a/resources/langs/nheko_zh_CN.ts
+++ b/resources/langs/nheko_zh_CN.ts
@@ -189,10 +189,15 @@
<context>
<name>EncryptionIndicator</name>
<message>
- <location filename="../qml/EncryptionIndicator.qml" line="+12"/>
+ <location filename="../qml/EncryptionIndicator.qml" line="+36"/>
<source>Encrypted</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location line="+2"/>
+ <source>This message is not encrypted!</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>InviteeItem</name>
@@ -306,7 +311,7 @@ Example: https://server.my:8787</source>
<context>
<name>MessageDelegate</name>
<message>
- <location filename="../qml/delegates/MessageDelegate.qml" line="+64"/>
+ <location filename="../qml/delegates/MessageDelegate.qml" line="+66"/>
<source>redacted</source>
<translation type="unfinished"></translation>
</message>
@@ -544,7 +549,7 @@ Example: https://server.my:8787</source>
<context>
<name>TimelineModel</name>
<message>
- <location filename="../../src/timeline/TimelineModel.cpp" line="+844"/>
+ <location filename="../../src/timeline/TimelineModel.cpp" line="+853"/>
<source>-- Decryption Error (failed to communicate with DB) --</source>
<comment>Placeholder, when the message can't be decrypted, because the DB access failed when trying to lookup the session.</comment>
<translation type="unfinished"></translation>
@@ -741,7 +746,7 @@ Example: https://server.my:8787</source>
<context>
<name>TimelineRow</name>
<message>
- <location filename="../qml/TimelineRow.qml" line="+87"/>
+ <location filename="../qml/TimelineRow.qml" line="+88"/>
<source>Reply</source>
<translation type="unfinished"></translation>
</message>
@@ -794,7 +799,7 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+254"/>
+ <location line="+256"/>
<source>Close</source>
<translation type="unfinished"></translation>
</message>
diff --git a/resources/qml/EncryptionIndicator.qml b/resources/qml/EncryptionIndicator.qml
index 00fe2ee4..428c2fae 100644
--- a/resources/qml/EncryptionIndicator.qml
+++ b/resources/qml/EncryptionIndicator.qml
@@ -3,13 +3,14 @@ import QtQuick.Controls 2.1
import im.nheko 1.0
Rectangle {
+ property bool encrypted: false
id: indicator
color: "transparent"
width: 16
height: 16
ToolTip.visible: ma.containsMouse && indicator.visible
- ToolTip.text: qsTr("Encrypted")
+ ToolTip.text: getEncryptionTooltip()
MouseArea{
id: ma
@@ -20,7 +21,21 @@ Rectangle {
Image {
id: stateImg
anchors.fill: parent
- source: "image://colorimage/:/icons/icons/ui/lock.png?"+colors.buttonText
+ source: getEncryptionImage()
+ }
+
+ function getEncryptionImage() {
+ if (encrypted)
+ return "image://colorimage/:/icons/icons/ui/lock.png?"+colors.buttonText
+ else
+ return "image://colorimage/:/icons/icons/ui/unlock.png?#dd3d3d"
+ }
+
+ function getEncryptionTooltip() {
+ if (encrypted)
+ return qsTr("Encrypted")
+ else
+ return qsTr("This message is not encrypted!")
}
}
diff --git a/resources/qml/TimelineRow.qml b/resources/qml/TimelineRow.qml
index 22222ef3..8dcd0056 100644
--- a/resources/qml/TimelineRow.qml
+++ b/resources/qml/TimelineRow.qml
@@ -66,7 +66,8 @@ MouseArea {
}
EncryptionIndicator {
- visible: model.isEncrypted
+ visible: model.isRoomEncrypted
+ encrypted: model.isEncrypted
Layout.alignment: Qt.AlignRight | Qt.AlignTop
Layout.preferredHeight: 16
width: 16
diff --git a/resources/res.qrc b/resources/res.qrc
index 64a5b3cb..a57d0416 100644
--- a/resources/res.qrc
+++ b/resources/res.qrc
@@ -14,6 +14,8 @@
<file>icons/ui/double-tick-indicator@2x.png</file>
<file>icons/ui/lock.png</file>
<file>icons/ui/lock@2x.png</file>
+ <file>icons/ui/unlock.png</file>
+ <file>icons/ui/unlock@2x.png</file>
<file>icons/ui/clock.png</file>
<file>icons/ui/clock@2x.png</file>
<file>icons/ui/checkmark.png</file>
diff --git a/src/timeline/TimelineModel.cpp b/src/timeline/TimelineModel.cpp
index b7e90034..6e653f10 100644
--- a/src/timeline/TimelineModel.cpp
+++ b/src/timeline/TimelineModel.cpp
@@ -224,6 +224,7 @@ TimelineModel::roleNames() const
{Id, "id"},
{State, "state"},
{IsEncrypted, "isEncrypted"},
+ {IsRoomEncrypted, "isRoomEncrypted"},
{ReplyTo, "replyTo"},
{Reactions, "reactions"},
{RoomId, "roomId"},
@@ -350,6 +351,9 @@ TimelineModel::data(const QString &id, int role) const
return std::holds_alternative<
mtx::events::EncryptedEvent<mtx::events::msg::Encrypted>>(events[id]);
}
+ case IsRoomEncrypted: {
+ return cache::isRoomEncrypted(room_id_.toStdString());
+ }
case ReplyTo:
return QVariant(QString::fromStdString(in_reply_to_event(event)));
case Reactions:
@@ -387,6 +391,7 @@ TimelineModel::data(const QString &id, int role) const
m.insert(names[Id], data(id, static_cast<int>(Id)));
m.insert(names[State], data(id, static_cast<int>(State)));
m.insert(names[IsEncrypted], data(id, static_cast<int>(IsEncrypted)));
+ m.insert(names[IsRoomEncrypted], data(id, static_cast<int>(IsRoomEncrypted)));
m.insert(names[ReplyTo], data(id, static_cast<int>(ReplyTo)));
m.insert(names[RoomName], data(id, static_cast<int>(RoomName)));
m.insert(names[RoomTopic], data(id, static_cast<int>(RoomTopic)));
diff --git a/src/timeline/TimelineModel.h b/src/timeline/TimelineModel.h
index a737aac7..0e9ddb72 100644
--- a/src/timeline/TimelineModel.h
+++ b/src/timeline/TimelineModel.h
@@ -157,6 +157,7 @@ public:
Id,
State,
IsEncrypted,
+ IsRoomEncrypted,
ReplyTo,
Reactions,
RoomId,
|
