diff options
Diffstat (limited to 'plugins/omemo/src/contact_details_dialog.vala')
| -rw-r--r-- | plugins/omemo/src/contact_details_dialog.vala | 312 |
1 files changed, 158 insertions, 154 deletions
diff --git a/plugins/omemo/src/contact_details_dialog.vala b/plugins/omemo/src/contact_details_dialog.vala index 11bed0c1..326a1b79 100644 --- a/plugins/omemo/src/contact_details_dialog.vala +++ b/plugins/omemo/src/contact_details_dialog.vala @@ -15,20 +15,14 @@ public class ContactDetailsDialog : Gtk.Dialog { private bool own = false; private int own_id = 0; - private Gee.List<Widget> toggles; - - [GtkChild] private Grid fingerprints; - [GtkChild] private Box own_fingerprint_label; - [GtkChild] private Frame own_fingerprint_container; - [GtkChild] private Grid own_fingerprint; - [GtkChild] private Box fingerprints_prompt_label; - [GtkChild] private Frame fingerprints_prompt_container; - [GtkChild] private Grid fingerprints_prompt; - [GtkChild] private Box fingerprints_verified_label; - [GtkChild] private Frame fingerprints_verified_container; - [GtkChild] private Grid fingerprints_verified; - [GtkChild] private Switch key_mgmnt; - + [GtkChild] private Box own_fingerprint_container; + [GtkChild] private Label own_fingerprint; + [GtkChild] private Box new_keys_container; + [GtkChild] private ListBox new_keys; + [GtkChild] private Box keys_container; + [GtkChild] private ListBox keys; + [GtkChild] private Switch auto_accept; + [GtkChild] private Button copy; private void set_device_trust(Row device, bool trust) { Database.IdentityMetaTable.TrustLevel trust_level = trust ? Database.IdentityMetaTable.TrustLevel.TRUSTED : Database.IdentityMetaTable.TrustLevel.UNTRUSTED; @@ -39,186 +33,196 @@ public class ContactDetailsDialog : Gtk.Dialog { .set(plugin.db.identity_meta.trust_level, trust_level).perform(); } - private void add_fingerprint(Row device, int row, Database.IdentityMetaTable.TrustLevel trust) { + private void add_fingerprint(Row device, Database.IdentityMetaTable.TrustLevel trust) { + keys_container.visible = true; + + ListBoxRow lbr = new ListBoxRow() { visible = true, activatable = true, hexpand = true }; + Box box = new Box(Gtk.Orientation.HORIZONTAL, 40) { visible = true, margin_start = 20, margin_end = 20, margin_top = 14, margin_bottom = 14, hexpand = true }; + + Box status = new Box(Gtk.Orientation.HORIZONTAL, 5) { visible = true, hexpand = true }; + Label status_lbl = new Label(null) { visible = true, hexpand = true, xalign = 0 }; + + Image img = new Image() { visible = true, halign = Align.END, icon_size = IconSize.BUTTON }; + string res = fingerprint_markup(fingerprint_from_base64(device[plugin.db.identity_meta.identity_key_public_base64])); Label lbl = new Label(res) - { use_markup=true, justify=Justification.RIGHT, visible=true, margin = 8, halign = Align.START, valign = Align.CENTER }; - //TODO: handle display of verified devices - Switch tgl = new Switch() {visible = true, halign = Align.END, valign = Align.CENTER, margin = 8, hexpand = true, active = (trust == Database.IdentityMetaTable.TrustLevel.TRUSTED) }; - tgl.state_set.connect((active) => { - set_device_trust(device, active); + { use_markup=true, justify=Justification.RIGHT, visible=true, halign = Align.START, valign = Align.CENTER, hexpand = false }; + + switch(trust) { + case Database.IdentityMetaTable.TrustLevel.TRUSTED: + img.icon_name = "emblem-ok-symbolic"; + status_lbl.set_markup("<span size='large' color='#1A63D9'>Accepted</span>"); + break; + case Database.IdentityMetaTable.TrustLevel.UNTRUSTED: + img.icon_name = "action-unavailable-symbolic"; + status_lbl.set_markup("<span size='large' color='#D91900'>Rejected</span>"); + lbl.get_style_context().add_class("dim-label"); + break; + case Database.IdentityMetaTable.TrustLevel.VERIFIED: + img.icon_name = "security-high-symbolic"; + status_lbl.set_markup("<span size='large' color='#1A63D9'>Verified</span>"); + break; + } - return false; + if (!device[plugin.db.identity_meta.now_active]) { + img.icon_name= "appointment-missed-symbolic"; + status_lbl.set_markup("<span size='large' color='#8b8e8f'>Unused</span>"); + } + + box.add(lbl); + box.add(status); + + status.add(status_lbl); + status.add(img); + + lbr.add(box); + keys.add(lbr); + + keys.row_activated.connect((row) => { + if(row == lbr) { + Row updated_device = plugin.db.identity_meta.with_address(device[plugin.db.identity_meta.identity_id], device[plugin.db.identity_meta.address_name]).with(plugin.db.identity_meta.device_id, "=", device[plugin.db.identity_meta.device_id]).single().row().inner; + ManageKeyDialog manage_dialog = new ManageKeyDialog(updated_device, plugin.db); + manage_dialog.set_transient_for((Window) get_toplevel()); + manage_dialog.present(); + manage_dialog.response.connect((response) => update_row(response, img, lbl, status_lbl, device)); + } }); - toggles.add(tgl); + } - fingerprints.attach(lbl, 0, row); - fingerprints.attach(tgl, 1, row); + private void update_row(int response, Image img, Label lbl, Label status_lbl, Row device){ + switch (response) { + case Database.IdentityMetaTable.TrustLevel.TRUSTED: + img.icon_name = "emblem-ok-symbolic"; + status_lbl.set_markup("<span size='large' color='#1A63D9'>Accepted</span>"); + lbl.get_style_context().remove_class("dim-label"); + set_device_trust(device, true); + break; + case Database.IdentityMetaTable.TrustLevel.UNTRUSTED: + img.icon_name = "action-unavailable-symbolic"; + status_lbl.set_markup("<span size='large' color='#D91900'>Rejected</span>"); + lbl.get_style_context().add_class("dim-label"); + set_device_trust(device, false); + break; + case Database.IdentityMetaTable.TrustLevel.VERIFIED: + img.icon_name = "security-high-symbolic"; + status_lbl.set_markup("<span size='large' color='#1A63D9'>Verified</span>"); + lbl.get_style_context().remove_class("dim-label"); + plugin.db.identity_meta.update() + .with(plugin.db.identity_meta.identity_id, "=", account.id) + .with(plugin.db.identity_meta.address_name, "=", device[plugin.db.identity_meta.address_name]) + .with(plugin.db.identity_meta.device_id, "=", device[plugin.db.identity_meta.device_id]) + .set(plugin.db.identity_meta.trust_level, Database.IdentityMetaTable.TrustLevel.VERIFIED).perform(); + plugin.db.trust.update().with(plugin.db.trust.identity_id, "=", account.id).with(plugin.db.trust.address_name, "=", jid.bare_jid.to_string()).set(plugin.db.trust.blind_trust, false).perform(); + auto_accept.set_active(false); + break; + } } - public ContactDetailsDialog(Plugin plugin, Account account, Jid jid) { - Object(use_header_bar : 1); - this.plugin = plugin; - this.account = account; - this.jid = jid; + private void add_new_fingerprint(Row device){ + new_keys_container.visible = true; - toggles = new ArrayList<Widget>(); + ListBoxRow lbr = new ListBoxRow() { visible = true, activatable = false, hexpand = true }; + Box box = new Box(Gtk.Orientation.HORIZONTAL, 40) { visible = true, margin_start = 20, margin_end = 20, margin_top = 14, margin_bottom = 14, hexpand = true }; - if(jid.equals(account.bare_jid)) { - own = true; - own_id = plugin.db.identity.row_with(plugin.db.identity.account_id, account.id)[plugin.db.identity.device_id]; - own_fingerprint_label.visible = true; - own_fingerprint_container.visible = true; - string own_b64 = plugin.db.identity.row_with(plugin.db.identity.account_id, account.id)[plugin.db.identity.identity_key_public_base64]; - string fingerprint = fingerprint_from_base64(own_b64); - Label lbl = new Label(fingerprint_markup(fingerprint)) - { use_markup=true, justify=Justification.RIGHT, visible=true, margin = 8, halign = Align.START }; + Box control = new Box(Gtk.Orientation.HORIZONTAL, 0) { visible = true, hexpand = true }; - Box box = new Box(Gtk.Orientation.HORIZONTAL, 0) { visible = true, valign = Align.CENTER, hexpand = true, margin = 8 }; + Button yes = new Button() { visible = true, valign = Align.CENTER, hexpand = true }; + yes.image = new Image.from_icon_name("emblem-ok-symbolic", IconSize.BUTTON); + yes.get_style_context().add_class("suggested-action"); - Button copy = new Button() { visible = true, valign = Align.CENTER, halign = Align.END, hexpand = false }; - copy.image = new Image.from_icon_name("edit-copy-symbolic", IconSize.BUTTON); - copy.clicked.connect(() => {Clipboard.get_default(get_display()).set_text(fingerprint, fingerprint.length);}); - box.pack_start(lbl); - box.pack_end(copy); - own_fingerprint.attach(box, 0, 0); - } + Button no = new Button() { visible = true, valign = Align.CENTER, hexpand = true }; + no.image = new Image.from_icon_name("action-unavailable-symbolic", IconSize.BUTTON); + no.get_style_context().add_class("destructive-action"); - int i = 0; - foreach (Row device in plugin.db.identity_meta.with_address(account.id, jid.to_string()).with(plugin.db.identity_meta.trust_level, "!=", Database.IdentityMetaTable.TrustLevel.UNKNOWN).with(plugin.db.identity_meta.trust_level, "!=", Database.IdentityMetaTable.TrustLevel.VERIFIED)) { - if (device[plugin.db.identity_meta.identity_key_public_base64] == null) { - continue; - } - if(own && device[plugin.db.identity_meta.device_id] == own_id) { - continue; - } - add_fingerprint(device, i, (Database.IdentityMetaTable.TrustLevel) device[plugin.db.identity_meta.trust_level]); + yes.clicked.connect(() => { + set_device_trust(device, true); + add_fingerprint(device, Database.IdentityMetaTable.TrustLevel.TRUSTED); + new_keys.remove(lbr); + if (new_keys.get_children().length() < 1) new_keys_container.visible = false; + }); - i++; + no.clicked.connect(() => { + set_device_trust(device, false); + add_fingerprint(device, Database.IdentityMetaTable.TrustLevel.UNTRUSTED); + new_keys.remove(lbr); + if (new_keys.get_children().length() < 1) new_keys_container.visible = false; + }); - } + string res = fingerprint_markup(fingerprint_from_base64(device[plugin.db.identity_meta.identity_key_public_base64])); + Label lbl = new Label(res) + { use_markup=true, justify=Justification.RIGHT, visible=true, halign = Align.START, valign = Align.CENTER, hexpand = false }; - int j = 0; - foreach (Row device in plugin.db.identity_meta.with_address(account.id, jid.to_string()).with(plugin.db.identity_meta.trust_level, "=", Database.IdentityMetaTable.TrustLevel.UNKNOWN)) { - if (device[plugin.db.identity_meta.identity_key_public_base64] == null) { - continue; - } - if(own && device[plugin.db.identity_meta.device_id] == own_id) { - continue; - } - string res = fingerprint_markup(fingerprint_from_base64(device[plugin.db.identity_meta.identity_key_public_base64])); - Label lbl = new Label(res) - { use_markup=true, justify=Justification.RIGHT, visible=true, margin = 8, halign = Align.START }; + box.add(lbl); - Box box = new Box(Gtk.Orientation.HORIZONTAL, 0) { visible = true, valign = Align.CENTER, hexpand = true, margin = 8 }; + control.add(yes); + control.add(no); + control.get_style_context().add_class("linked"); - Button yes = new Button() { visible = true, valign = Align.CENTER, hexpand = true}; - yes.image = new Image.from_icon_name("list-add-symbolic", IconSize.BUTTON); + box.add(control); - yes.clicked.connect(() => { - set_device_trust(device, true); - - fingerprints_prompt.remove(box); - fingerprints_prompt.remove(lbl); - toggles.remove(box); - j--; + lbr.add(box); + new_keys.add(lbr); + } - add_fingerprint(device, i, Database.IdentityMetaTable.TrustLevel.TRUSTED); - i++; + public ContactDetailsDialog(Plugin plugin, Account account, Jid jid) { + Object(use_header_bar : 1); + this.plugin = plugin; + this.account = account; + this.jid = jid; - if (j == 0) { - fingerprints_prompt.attach(new Label("No more new devices") { visible = true, valign = Align.CENTER, halign = Align.CENTER, margin = 8, hexpand = true }, 0, 0); - } - }); + (get_header_bar() as HeaderBar).set_subtitle(jid.bare_jid.to_string()); - Button no = new Button() { visible = true, valign = Align.CENTER, hexpand = true}; - no.image = new Image.from_icon_name("list-remove-symbolic", IconSize.BUTTON); - no.clicked.connect(() => { - set_device_trust(device, false); + if(jid.equals(account.bare_jid)) { + own = true; + own_id = plugin.db.identity.row_with(plugin.db.identity.account_id, account.id)[plugin.db.identity.device_id]; - fingerprints_prompt.remove(box); - fingerprints_prompt.remove(lbl); - toggles.remove(box); - j--; + own_fingerprint_container.visible = true; - add_fingerprint(device, i, Database.IdentityMetaTable.TrustLevel.UNTRUSTED); - i++; + string own_b64 = plugin.db.identity.row_with(plugin.db.identity.account_id, account.id)[plugin.db.identity.identity_key_public_base64]; + string fingerprint = fingerprint_from_base64(own_b64); + own_fingerprint.set_markup(fingerprint_markup(fingerprint)); - if (j == 0) { - fingerprints_prompt.attach(new Label("No more new devices") { visible = true, valign = Align.CENTER, halign = Align.CENTER, margin = 8, hexpand = true }, 0, 0); - } - }); + copy.clicked.connect(() => {Clipboard.get_default(get_display()).set_text(fingerprint, fingerprint.length);}); + } - box.pack_start(yes); - box.pack_start(no); + new_keys.set_header_func((row, before_row) => { + if (row.get_header() == null && before_row != null) { + row.set_header(new Separator(Orientation.HORIZONTAL)); + } + }); - box.get_style_context().add_class("linked"); - toggles.add(box); + keys.set_header_func((row, before_row) => { + if (row.get_header() == null && before_row != null) { + row.set_header(new Separator(Orientation.HORIZONTAL)); + } + }); - fingerprints_prompt.attach(lbl, 0, j); - fingerprints_prompt.attach(box, 1, j); - j++; - } - if( j > 0 ){ - fingerprints_prompt_label.visible = true; - fingerprints_prompt_container.visible = true; + foreach (Row device in plugin.db.identity_meta.with_address(account.id, jid.to_string()).with(plugin.db.identity_meta.trust_level, "=", Database.IdentityMetaTable.TrustLevel.UNKNOWN).without_null(plugin.db.identity_meta.identity_key_public_base64)) { + add_new_fingerprint(device); } - int k = 0; - foreach (Row device in plugin.db.identity_meta.with_address(account.id, jid.to_string()).without_null(plugin.db.identity_meta.identity_key_public_base64).with(plugin.db.identity_meta.trust_level, "=", Database.IdentityMetaTable.TrustLevel.VERIFIED)) { + foreach (Row device in plugin.db.identity_meta.with_address(account.id, jid.to_string()).with(plugin.db.identity_meta.trust_level, "!=", Database.IdentityMetaTable.TrustLevel.UNKNOWN).without_null(plugin.db.identity_meta.identity_key_public_base64)) { if(own && device[plugin.db.identity_meta.device_id] == own_id) { continue; } - string res = fingerprint_markup(fingerprint_from_base64(device[plugin.db.identity_meta.identity_key_public_base64])); - Label lbl = new Label(res) - { use_markup=true, justify=Justification.RIGHT, visible=true, margin = 8, halign = Align.START }; - - Box box = new Box(Gtk.Orientation.HORIZONTAL, 0) { visible = true, valign = Align.CENTER, hexpand = true, margin = 8 }; + add_fingerprint(device, (Database.IdentityMetaTable.TrustLevel) device[plugin.db.identity_meta.trust_level]); - Button no = new Button() { visible = true, valign = Align.CENTER, halign = Align.END, hexpand = false }; - no.image = new Image.from_icon_name("list-remove-symbolic", IconSize.BUTTON); + } - no.clicked.connect(() => { - set_device_trust(device, false); + auto_accept.set_active(plugin.db.trust.get_blind_trust(account.id, jid.bare_jid.to_string())); - fingerprints_verified.remove(no); - fingerprints_verified.remove(lbl); - toggles.remove(no); - k--; + auto_accept.state_set.connect((active) => { + plugin.db.trust.update().with(plugin.db.trust.identity_id, "=", account.id).with(plugin.db.trust.address_name, "=", jid.bare_jid.to_string()).set(plugin.db.trust.blind_trust, active).perform(); - add_fingerprint(device, i, Database.IdentityMetaTable.TrustLevel.UNTRUSTED); - i++; + if (active) { + new_keys_container.visible = false; - if (k == 0) { - fingerprints_verified.attach(new Label("No more new devices") { visible = true, valign = Align.CENTER, halign = Align.CENTER, margin = 8, hexpand = true }, 0, 0); + foreach (Row device in plugin.db.identity_meta.with_address(account.id, jid.to_string()).with(plugin.db.identity_meta.trust_level, "=", Database.IdentityMetaTable.TrustLevel.UNKNOWN).without_null(plugin.db.identity_meta.identity_key_public_base64)) { + set_device_trust(device, true); + add_fingerprint(device, Database.IdentityMetaTable.TrustLevel.TRUSTED); } - }); - - box.pack_end(no); - toggles.add(no); - - fingerprints_verified.attach(lbl, 0, k); - fingerprints_verified.attach(box, 1, k); - k++; - } - - if( k > 0 ){ - fingerprints_verified_label.visible = true; - fingerprints_verified_container.visible = true; - } - - bool blind_trust = plugin.db.trust.get_blind_trust(account.id, jid.bare_jid.to_string()); - key_mgmnt.set_active(!blind_trust); - foreach(Widget tgl in toggles){ - tgl.set_sensitive(!blind_trust); - } - - key_mgmnt.state_set.connect((active) => { - plugin.db.trust.update().with(plugin.db.trust.identity_id, "=", account.id).with(plugin.db.trust.address_name, "=", jid.bare_jid.to_string()).set(plugin.db.trust.blind_trust, !active).perform(); - foreach(Widget tgl in toggles){ - tgl.set_sensitive(active); } return false; |