nettika/geary
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Implement spoofed email address UI for ContactsPopover

Browse source
This commit is contained in:
Michael Gratton 2019-03-27 17:07:28 +11:00 • committed by Michael James Gratton
parent 44b01a8d9d
commit 10051e0354
4 changed files with 366 additions and 202 deletions
Download patch file Download diff file Expand all files Collapse all files

86
src/client/conversation-viewer/conversation-contact-popover.vala
View file

@ -41,6 +41,9 @@ public class Conversation.ContactPopover : Gtk.Popover {
private GLib.Cancellable load_cancellable = new GLib.Cancellable();
[GtkChild]
private Gtk.Grid contact_pane;
[GtkChild]
private Gtk.Image avatar;
@ -65,6 +68,15 @@ public class Conversation.ContactPopover : Gtk.Popover {
[GtkChild]
private Gtk.ModelButton load_remote_button;
[GtkChild]
private Gtk.Grid deceptive_pane;
[GtkChild]
private Gtk.Label forged_email_label;
[GtkChild]
private Gtk.Label actual_email_label;
private GLib.SimpleActionGroup actions = new GLib.SimpleActionGroup();
@ -125,40 +137,52 @@ public class Conversation.ContactPopover : Gtk.Popover {
}
private void update() {
string display_name = this.contact.display_name;
this.contact_name.set_text(display_name);
if (!this.mailbox.is_spoofed()) {
this.contact_pane.show();
this.deceptive_pane.hide();
if (!this.contact.display_name_is_email) {
this.contact_address.set_text(this.mailbox.address);
string display_name = this.contact.display_name;
this.contact_name.set_text(display_name);
if (!this.contact.display_name_is_email) {
this.contact_address.set_text(this.mailbox.address);
} else {
this.contact_name.vexpand = true;
this.contact_name.valign = FILL;
this.contact_address.hide();
}
bool is_desktop = this.contact.is_desktop_contact;
bool starred = false;
bool unstarred = false;
if (is_desktop) {
starred = this.contact.is_favourite;
unstarred = !this.contact.is_favourite;
}
this.starred_button.set_visible(starred);
this.unstarred_button.set_visible(unstarred);
this.open_button.set_visible(is_desktop);
this.save_button.set_visible(!is_desktop);
this.load_remote_button.set_visible(!is_desktop);
GLib.SimpleAction load_remote = (GLib.SimpleAction)
actions.lookup_action(ACTION_LOAD_REMOTE);
load_remote.set_state(
new GLib.Variant.boolean(
is_desktop || this.contact.load_remote_resources
)
);
} else {
this.contact_name.vexpand = true;
this.contact_name.valign = FILL;
this.contact_address.hide();
this.deceptive_pane.show();
this.contact_pane.hide();
this.forged_email_label.label = Geary.String.reduce_whitespace(
this.mailbox.name
);
this.actual_email_label.label = this.mailbox.address;
}
bool is_desktop = this.contact.is_desktop_contact;
bool starred = false;
bool unstarred = false;
if (is_desktop) {
starred = this.contact.is_favourite;
unstarred = !this.contact.is_favourite;
}
this.starred_button.set_visible(starred);
this.unstarred_button.set_visible(unstarred);
this.open_button.set_visible(is_desktop);
this.save_button.set_visible(!is_desktop);
this.load_remote_button.set_visible(!is_desktop);
GLib.SimpleAction load_remote = (GLib.SimpleAction)
actions.lookup_action(ACTION_LOAD_REMOTE);
load_remote.set_state(
new GLib.Variant.boolean(
is_desktop || this.contact.load_remote_resources
)
);
}
private async void open() {

7
src/client/conversation-viewer/conversation-message.vala
View file

@ -146,9 +146,10 @@ public class ConversationMessage : Gtk.Grid, Geary.BaseInterface {
// reduce the chance of the user of being tricked by
// malware.
primary.set_text(display_address);
this.displayed = new Geary.RFC822.MailboxAddress(
null, this.source.address
);
// Use the source as the displayed address so that the
// contact popover uses the spoofed mailbox and
// displays it as being spoofed.
this.displayed = this.source;
} else if (this.contact.is_trusted) {
// The contact's name can be trusted, so no need to
// display the email address

471
ui/conversation-contact-popover.ui
View file

@ -9,82 +9,69 @@
<object class="GtkGrid">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_left">10</property>
<property name="margin_right">10</property>
<property name="margin_top">10</property>
<property name="margin_bottom">10</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkGrid">
<object class="GtkGrid" id="contact_pane">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_bottom">6</property>
<property name="column_spacing">12</property>
<child>
<object class="GtkButton" id="unstarred_button">
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="halign">end</property>
<property name="valign">center</property>
<property name="action_name">con.star</property>
<property name="relief">none</property>
<child>
<object class="GtkImage">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="icon_name">non-starred-symbolic</property>
</object>
</child>
</object>
<packing>
<property name="left_attach">2</property>
<property name="top_attach">0</property>
</packing>
</child>
<child>
<object class="GtkButton" id="starred_button">
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="halign">end</property>
<property name="valign">center</property>
<property name="action_name">con.unstar</property>
<property name="relief">none</property>
<child>
<object class="GtkImage">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="icon_name">starred-symbolic</property>
</object>
</child>
</object>
<packing>
<property name="left_attach">3</property>
<property name="top_attach">0</property>
</packing>
</child>
<child>
<object class="GtkImage" id="avatar">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="pixel_size">48</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
</packing>
</child>
<property name="margin_left">10</property>
<property name="margin_right">10</property>
<property name="margin_top">10</property>
<property name="margin_bottom">10</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkGrid">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="margin_bottom">6</property>
<property name="column_spacing">12</property>
<child>
<object class="GtkLabel" id="contact_name">
<object class="GtkButton" id="unstarred_button">
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="halign">end</property>
<property name="valign">center</property>
<property name="action_name">con.star</property>
<property name="relief">none</property>
<child>
<object class="GtkImage">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="icon_name">non-starred-symbolic</property>
</object>
</child>
</object>
<packing>
<property name="left_attach">2</property>
<property name="top_attach">0</property>
</packing>
</child>
<child>
<object class="GtkButton" id="starred_button">
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="halign">end</property>
<property name="valign">center</property>
<property name="action_name">con.unstar</property>
<property name="relief">none</property>
<child>
<object class="GtkImage">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="icon_name">starred-symbolic</property>
</object>
</child>
</object>
<packing>
<property name="left_attach">3</property>
<property name="top_attach">0</property>
</packing>
</child>
<child>
<object class="GtkImage" id="avatar">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
<property name="valign">end</property>
<property name="vexpand">True</property>
<property name="pixel_size">48</property>
</object>
<packing>
<property name="left_attach">0</property>
@ -92,30 +79,152 @@
</packing>
</child>
<child>
<object class="GtkLabel" id="contact_address">
<object class="GtkGrid">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
<property name="valign">start</property>
<property name="margin_top">2</property>
<property name="hexpand">False</property>
<property name="vexpand">True</property>
<property name="ellipsize">middle</property>
<style>
<class name="dim-label"/>
</style>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="contact_name">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
<property name="valign">end</property>
<property name="vexpand">True</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="contact_address">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
<property name="valign">start</property>
<property name="margin_top">2</property>
<property name="hexpand">False</property>
<property name="vexpand">True</property>
<property name="ellipsize">middle</property>
<style>
<class name="dim-label"/>
</style>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">1</property>
</packing>
</child>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">1</property>
<property name="left_attach">1</property>
<property name="top_attach">0</property>
</packing>
</child>
</object>
<packing>
<property name="left_attach">1</property>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
</packing>
</child>
<child>
<object class="GtkSeparator">
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">1</property>
</packing>
</child>
<child>
<object class="GtkModelButton">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="action_name">con.new-conversation</property>
<property name="text" translatable="yes">New Conversation…</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">2</property>
</packing>
</child>
<child>
<object class="GtkModelButton">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="action_name">con.copy-email</property>
<property name="text" translatable="yes">Copy Email Address</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">3</property>
</packing>
</child>
<child>
<object class="GtkSeparator">
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">4</property>
</packing>
</child>
<child>
<object class="GtkModelButton" id="save_button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="action_name">con.save</property>
<property name="text" translatable="yes">Save in Contacts…</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">7</property>
</packing>
</child>
<child>
<object class="GtkModelButton">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="action_name">con.show-conversations</property>
<property name="text" translatable="yes">Show Conversations</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">5</property>
</packing>
</child>
<child>
<object class="GtkModelButton" id="open_button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="action_name">con.open</property>
<property name="text" translatable="yes">Open in Contacts</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">6</property>
</packing>
</child>
<child>
<object class="GtkModelButton" id="load_remote_button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="action_name">con.load-remote</property>
<property name="text" translatable="yes">Always Load Remote Images</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">8</property>
</packing>
</child>
</object>
<packing>
<property name="left_attach">0</property>
@ -123,103 +232,129 @@
</packing>
</child>
<child>
<object class="GtkSeparator">
<property name="visible">True</property>
<object class="GtkGrid" id="deceptive_pane">
<property name="can_focus">False</property>
<property name="margin_left">10</property>
<property name="margin_right">10</property>
<property name="margin_top">10</property>
<property name="margin_bottom">10</property>
<property name="orientation">vertical</property>
<property name="row_spacing">6</property>
<child>
<object class="GtkGrid">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="column_spacing">12</property>
<child>
<object class="GtkImage">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="pixel_size">36</property>
<property name="icon_name">dialog-warning-symbolic</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
</packing>
</child>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes" comments="Title label on contact popover">Deceptive email address</property>
<style>
<class name="title"/>
</style>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">0</property>
</packing>
</child>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
</packing>
</child>
<child>
<object class="GtkSeparator">
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">1</property>
</packing>
</child>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes" comments="Contact popover label">This email address is:</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">2</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="actual_email_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<style>
<class name="geary-deceptive"/>
</style>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">3</property>
</packing>
</child>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes" comments="Contact popover label">But was forged as:</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">4</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="forged_email_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<style>
<class name="geary-deceptive"/>
</style>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">5</property>
</packing>
</child>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes" comments="Contact popover label">The sender may not be trustworthy</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">6</property>
</packing>
</child>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">1</property>
</packing>
</child>
<child>
<object class="GtkModelButton">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="action_name">con.new-conversation</property>
<property name="text" translatable="yes">_New Conversation…</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">2</property>
</packing>
</child>
<child>
<object class="GtkModelButton">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="action_name">con.copy-email</property>
<property name="text" translatable="yes">Copy Email _Address</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">3</property>
</packing>
</child>
<child>
<object class="GtkSeparator">
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">4</property>
</packing>
</child>
<child>
<object class="GtkModelButton" id="save_button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="action_name">con.save</property>
<property name="text" translatable="yes">Save in Contacts…</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">7</property>
</packing>
</child>
<child>
<object class="GtkModelButton">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="action_name">con.show-conversations</property>
<property name="text" translatable="yes">Show Conversations</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">5</property>
</packing>
</child>
<child>
<object class="GtkModelButton" id="open_button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="action_name">con.open</property>
<property name="text" translatable="yes">Open in Contacts</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">6</property>
</packing>
</child>
<child>
<object class="GtkModelButton" id="load_remote_button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="action_name">con.load-remote</property>
<property name="text" translatable="yes">Always Load Remote Images</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">8</property>
</packing>
</child>
</object>
</child>
<style>

4
ui/geary.css
View file

@ -180,6 +180,10 @@ grid.geary-message-summary {
font-size: 80%;
}
.geary-contact-popover .geary-deceptive {
font-weight: bold;
}
/* Composer */
.geary-composer-embed headerbar {