Visually mark OMEMO messages from a trusted device as trusted

5 files changed, 25 insertions, 18 deletions

diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt
index f2c605d4..083e64c8 100644
--- a/main/CMakeLists.txt
+++ b/main/CMakeLists.txt
@@ -18,6 +18,7 @@ set(RESOURCE_LIST
     icons/dino-double-tick-symbolic.svg
     icons/dino-emoticon-symbolic.svg
     icons/dino-qr-code-symbolic.svg
+    icons/dino-security-high-symbolic.svg
     icons/dino-party-popper-symbolic.svg
     icons/dino-status-away.svg
     icons/dino-status-chat.svg
diff --git a/main/data/conversation_content_view/item_metadata_header.ui b/main/data/conversation_content_view/item_metadata_header.ui
index 4252a0a3..31aa7e44 100644
--- a/main/data/conversation_content_view/item_metadata_header.ui
+++ b/main/data/conversation_content_view/item_metadata_header.ui
@@ -42,15 +42,5 @@
                 </style>
             </object>
         </child>
-        <child>
-            <object class="GtkImage" id="encryption_image">
-                <property name="opacity">0.4</property>
-            </object>
-        </child>
-        <child>
-            <object class="GtkImage" id="received_image">
-                <property name="opacity">0.4</property>
-            </object>
-        </child>
     </template>
 </interface>
diff --git a/main/data/icons/dino-security-high-symbolic.svg b/main/data/icons/dino-security-high-symbolic.svg
new file mode 100644
index 00000000..d930b901
--- /dev/null
+++ b/main/data/icons/dino-security-high-symbolic.svg
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" viewBox="0 0 16 12" xmlns="http://www.w3.org/2000/svg">
+  <path d="m2.9174 0v5.9297c0 1.7552 1.269 3.13 2.399 4.1415a15.807 15.807 0 0 0 2.2533 1.6705l0.4371 0.25836 0.43371-0.2626s1.1182-0.67768 2.2448-1.6959c1.1266-1.0199 2.3973-2.3803 2.3973-4.1118v-5.9297zm1.6942 1.6942h6.7768v4.2355c0 0.77933-0.8471 1.9593-1.8382 2.8547-0.7734 0.69886-1.2512 0.97755-1.5553 1.1741-0.30326-0.19144-0.77764-0.45997-1.5485-1.1504-0.98772-0.88352-1.8348-2.0483-1.8348-2.8784z" color="#bebebe" fill="#474747" font-family="sans-serif" font-weight="400" overflow="visible" stroke-width=".8471" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none" white-space="normal"/>
+  <path d="m5.8658 3.0501v2.8457c0 0.25398 0.53712 1.1674 1.3118 1.8675 0.40906 0.36994 0.5236 0.41262 0.8224 0.62249 0.29879-0.20916 0.41333-0.25255 0.8224-0.62249 0.77544-0.70003 1.3118-1.6135 1.3118-1.8675v-2.8457z" color="#bebebe" fill="#474747" overflow="visible" stroke-width=".71142"/>
+</svg>
diff --git a/main/src/ui/conversation_content_view/chat_state_populator.vala b/main/src/ui/conversation_content_view/chat_state_populator.vala
index 54b41b7d..0438e014 100644
--- a/main/src/ui/conversation_content_view/chat_state_populator.vala
+++ b/main/src/ui/conversation_content_view/chat_state_populator.vala
@@ -62,7 +62,6 @@ class ChatStatePopulator : Plugins.ConversationItemPopulator, Plugins.Conversati
 }
 
 private class MetaChatStateItem : Plugins.MetaConversationItem {
-    public override bool dim { get; set; default=true; }
     public override DateTime sort_time { get; set; default=new DateTime.now_utc().add_years(10); }
 
     public override bool can_merge { get; set; default=false; }
diff --git a/main/src/ui/conversation_content_view/conversation_item_skeleton.vala b/main/src/ui/conversation_content_view/conversation_item_skeleton.vala
index 589bcddd..b4cd766f 100644
--- a/main/src/ui/conversation_content_view/conversation_item_skeleton.vala
+++ b/main/src/ui/conversation_content_view/conversation_item_skeleton.vala
@@ -88,8 +88,8 @@ public class ItemMetaDataHeader : Box {
     [GtkChild] public Label name_label;
     [GtkChild] public Label dot_label;
     [GtkChild] public Label time_label;
-    [GtkChild] public Image encryption_image;
-    [GtkChild] public Image received_image;
+    public Image received_image = new Image() { opacity=0.4 };
+    public Image? encryption_image = null;
 
     public static IconSize ICON_SIZE_HEADER = Gtk.icon_size_register("im.dino.Dino.HEADER_ICON", 17, 12);
 
@@ -106,9 +106,23 @@ public class ItemMetaDataHeader : Box {
 
         update_name_label();
         name_label.style_updated.connect(update_name_label);
-        if (item.encryption != Encryption.NONE) {
-            encryption_image.visible = true;
-            encryption_image.set_from_icon_name("dino-changes-prevent-symbolic", ICON_SIZE_HEADER);
+
+        Application app = GLib.Application.get_default() as Application;
+
+        ContentMetaItem ci = item as ContentMetaItem;
+        if (ci != null) {
+            foreach(var e in app.plugin_registry.encryption_list_entries) {
+                if (e.encryption == item.encryption) {
+                    Object? w = e.get_encryption_icon(conversation, ci.content_item);
+                    if (w != null) {
+                        this.add(w as Widget);
+                    } else {
+                        Image image = new Image.from_icon_name("dino-changes-prevent-symbolic", ICON_SIZE_HEADER) { opacity=0.4, visible = true };
+                        this.add(image);
+                    }
+                    break;
+                }
+            }
         }
         if (item.display_time != null) {
             update_time();
@@ -143,11 +157,9 @@ public class ItemMetaDataHeader : Box {
                 received_image.visible = true;
                 received_image.set_from_icon_name("dialog-warning-symbolic", ICON_SIZE_HEADER);
                 Util.force_error_color(received_image);
-                Util.force_error_color(encryption_image);
                 Util.force_error_color(time_label);
                 string error_text = _("Unable to send message");
                 received_image.tooltip_text = error_text;
-                encryption_image.tooltip_text = error_text;
                 time_label.tooltip_text = error_text;
                 return;
             } else if (item.mark != Message.Marked.READ) {