aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfiaxh <git@lightrise.org>2025-05-05 14:32:17 +0200
committerfiaxh <git@lightrise.org>2025-05-05 14:32:17 +0200
commitc40577ed76943f50de3189c91b5433b805b4ef2f (patch)
tree5bec83a29c424ae3e50c56573dac0ca1a05db6b2
parent953b384ef782c9d6adf65277c49f9e8a5a68457e (diff)
Conversation details: Show used account if multiple are active
-rw-r--r--main/src/ui/conversation_details.vala1
-rw-r--r--main/src/view_model/conversation_details.vala2
-rw-r--r--main/src/windows/conversation_details.vala6
3 files changed, 9 insertions, 0 deletions
diff --git a/main/src/ui/conversation_details.vala b/main/src/ui/conversation_details.vala
index 4b8a53b3..aeb9aff0 100644
--- a/main/src/ui/conversation_details.vala
+++ b/main/src/ui/conversation_details.vala
@@ -36,6 +36,7 @@ namespace Dino.Ui.ConversationDetails {
affiliation = conference_member.affiliation
};
});
+ view_model.account_jid = stream_interactor.get_accounts().size > 1 ? model.conversation.account.bare_jid.to_string() : null;
if (model.domain_blocked) {
view_model.blocked = DOMAIN;
diff --git a/main/src/view_model/conversation_details.vala b/main/src/view_model/conversation_details.vala
index 3641d584..26379dab 100644
--- a/main/src/view_model/conversation_details.vala
+++ b/main/src/view_model/conversation_details.vala
@@ -40,6 +40,8 @@ public class Dino.Ui.ViewModel.ConversationDetails : Object {
public BlockState blocked { get; set; }
public GLib.ListStore about_rows = new GLib.ListStore(typeof(PreferencesRow.Any));
+ public string? account_jid { get; set; }
+
public GLib.ListStore settings_rows = new GLib.ListStore(typeof(PreferencesRow.Any));
public GLib.ListStore room_configuration_rows { get; set; }
public MapListModel members = new MapListModel(null, null);
diff --git a/main/src/windows/conversation_details.vala b/main/src/windows/conversation_details.vala
index ba8c80b6..f6f420d2 100644
--- a/main/src/windows/conversation_details.vala
+++ b/main/src/windows/conversation_details.vala
@@ -198,6 +198,12 @@ namespace Dino.Ui.ConversationDetails {
if (model.room_configuration_rows != null && model.room_configuration_rows.get_n_items() > 0) {
about_box.append(Util.rows_to_preference_group(model.room_configuration_rows, _("Room Configuration")));
}
+
+ if (model.account_jid != null) {
+ var account_label = new Label(@"via $(model.account_jid)") { halign=Align.START, margin_start=14, margin_top=4 };
+ account_label.add_css_class("dim-label");
+ about_box.append(account_label);
+ }
}
public void add_encryption_tab_element(Adw.PreferencesGroup preferences_group) {