anotherim/anotherim-desktop
2
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fix runtime criticals when showing resource identites on conversation row hover

Browse source
This commit is contained in:
fiaxh 2020-04-07 13:00:41 +02:00
parent 5b2683dfa5
commit bd8063284c
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
main/src/ui/conversation_selector/conversation_selector_row.vala
View file

@ -254,8 +254,7 @@ public class ConversationSelectorRow : ListBoxRow {
Xep.ServiceDiscovery.Identity? identity = stream_interactor.get_module(EntityInfo.IDENTITY).get_identity(conversation.account, full_jid); Xep.ServiceDiscovery.Identity? identity = stream_interactor.get_module(EntityInfo.IDENTITY).get_identity(conversation.account, full_jid);
Image image = new Image() { hexpand=false, valign=Align.START, visible=true }; Image image = new Image() { hexpand=false, valign=Align.START, visible=true };
grid.attach(image, 0, i + 1, 1, 1); if (identity != null && (identity.type_ == Xep.ServiceDiscovery.Identity.TYPE_PHONE || identity.type_ == Xep.ServiceDiscovery.Identity.TYPE_TABLET)) {
if (identity != null && identity.type_ == Xep.ServiceDiscovery.Identity.TYPE_PHONE || identity.type_ == Xep.ServiceDiscovery.Identity.TYPE_TABLET) {
image.set_from_icon_name("dino-device-phone-symbolic", IconSize.SMALL_TOOLBAR); image.set_from_icon_name("dino-device-phone-symbolic", IconSize.SMALL_TOOLBAR);
} else { } else {
image.set_from_icon_name("dino-device-desktop-symbolic", IconSize.SMALL_TOOLBAR); image.set_from_icon_name("dino-device-desktop-symbolic", IconSize.SMALL_TOOLBAR);
@ -279,12 +278,14 @@ public class ConversationSelectorRow : ListBoxRow {
} }
var sb = new StringBuilder(); var sb = new StringBuilder();
if (identity.name != null) { if (identity != null && identity.name != null) {
sb.append(identity.name); sb.append(identity.name);
} else if (dino_resource_regex.match(full_jid.resourcepart)) { } else if (full_jid.resourcepart != null && dino_resource_regex.match(full_jid.resourcepart)) {
sb.append("Dino"); sb.append("Dino");
} else { } else if (full_jid.resourcepart != null) {
sb.append(full_jid.resourcepart); sb.append(full_jid.resourcepart);
} else {
continue;
} }
if (status != null) { if (status != null) {
sb.append(" <i>("); sb.append(" <i>(");
@ -293,6 +294,8 @@ public class ConversationSelectorRow : ListBoxRow {
} }
Label resource = new Label(sb.str) { use_markup=true, hexpand=true, xalign=0, visible=true }; Label resource = new Label(sb.str) { use_markup=true, hexpand=true, xalign=0, visible=true };
grid.attach(image, 0, i + 1, 1, 1);
grid.attach(resource, 1, i + 1, 1, 1); grid.attach(resource, 1, i + 1, 1, 1);
} }
return grid; return grid;