xavi/dino
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Improve contact description in OMEMO warnings

Browse Source 
fixes #947
This commit is contained in:
fiaxh 2020-12-04 17:10:46 +01:00
parent c0be0f5f85
commit f31e96d6bb
3 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libdino/src/util/display_name.vala
View File

@ -84,8 +84,8 @@ namespace Dino {
}
}
// If it's us (jid=our real full JID), display our nick
if (conversation.type_ == Conversation.Type.GROUPCHAT_PM && conversation.account.bare_jid.equals_bare(jid)) {
// If it's us (jid=our real full JID), display our nick
if (conversation.type_ == Conversation.Type.GROUPCHAT_PM && conversation.account.bare_jid.equals_bare(jid)) {
var muc_conv = stream_interactor.get_module(ConversationManager.IDENTITY).get_conversation(conversation.counterpart.bare_jid, conversation.account, Conversation.Type.GROUPCHAT);
if (muc_conv != null && muc_conv.nickname != null) {
return muc_conv.nickname;

1
main/src/ui/conversation_content_view/conversation_view.vala
View File

@ -412,6 +412,7 @@ public class ConversationView : Box, Plugins.ConversationItemCollection, Plugins
private bool can_merge(Plugins.MetaConversationItem upper_item /*more recent, displayed below*/, Plugins.MetaConversationItem lower_item /*less recent, displayed above*/) {
return upper_item.display_time != null && lower_item.display_time != null &&
upper_item.display_time.difference(lower_item.display_time) < TimeSpan.MINUTE &&
upper_item.jid != null && lower_item.jid != null &&
upper_item.jid.equals(lower_item.jid) &&
upper_item.encryption == lower_item.encryption &&
(upper_item.mark == Message.Marked.WONTSEND) == (lower_item.mark == Message.Marked.WONTSEND);

19
plugins/omemo/src/ui/bad_messages_populator.vala
View File

@ -137,9 +137,12 @@ public class BadMessagesWidget : Box {
this.halign = Align.CENTER;
this.visible = true;
var sb = new StringBuilder();
string who = _("Your contact");
if (conversation.type_ == Conversation.Type.GROUPCHAT) {
string who = "";
if (conversation.type_ == Conversation.Type.CHAT) {
who = Dino.get_participant_display_name(plugin.app.stream_interactor, conversation, jid);
} else if (conversation.type_ == Conversation.Type.GROUPCHAT) {
who = jid.to_string();
// `jid` is a real JID. In MUCs, try to show nicks instead (given that the JID is currently online)
var occupants = plugin.app.stream_interactor.get_module(MucManager.IDENTITY).get_occupants(conversation.counterpart, conversation.account);
if (occupants == null) return;
foreach (Jid occupant in occupants) {
@ -148,13 +151,15 @@ public class BadMessagesWidget : Box {
}
}
}
string warning_text = "";
if (badness_type == BadnessType.UNTRUSTED) {
sb.append(_("%s has been using an untrusted device. You won't see messages from devices that you do not trust.").printf(who));
sb.append(" <a href=\"\">%s</a>".printf(_("Manage devices")));
warning_text = _("%s has been using an untrusted device. You won't see messages from devices that you do not trust.").printf(who) +
" <a href=\"\">%s</a>".printf(_("Manage devices"));
} else {
sb.append(_("%s does not trust this device. That means, you might be missing messages.").printf(who));
warning_text += _("%s does not trust this device. That means, you might be missing messages.").printf(who);
}
Label label = new Label(sb.str) { margin_start=70, margin_end=70, justify=Justification.CENTER, use_markup=true, selectable=true, wrap=true, wrap_mode=Pango.WrapMode.WORD_CHAR, hexpand=true, visible=true };
Label label = new Label(warning_text) { margin_start=70, margin_end=70, justify=Justification.CENTER, use_markup=true, selectable=true, wrap=true, wrap_mode=Pango.WrapMode.WORD_CHAR, hexpand=true, visible=true };
label.get_style_context().add_class("dim-label");
this.add(label);