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

Fix display name: Check localpart (return) for null

Browse source
This commit is contained in:
fiaxh 2018-12-29 13:01:18 +01:00
parent e455a22993
commit 420942873a
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
main/src/ui/util/helper.vala
View file

@ -79,7 +79,6 @@ public static string get_display_name(StreamInteractor stream_interactor, Jid ji
return builder.str; return builder.str;
} }
} }
return jid.bare_jid.to_string();
} else if (stream_interactor.get_module(MucManager.IDENTITY).is_groupchat_occupant(jid, account)) { } else if (stream_interactor.get_module(MucManager.IDENTITY).is_groupchat_occupant(jid, account)) {
return jid.resourcepart; return jid.resourcepart;
} else { } else {
@ -94,7 +93,13 @@ public static string get_display_name(StreamInteractor stream_interactor, Jid ji
if (roster_item != null && roster_item.name != null && roster_item.name != "") { if (roster_item != null && roster_item.name != null && roster_item.name != "") {
return roster_item.name; return roster_item.name;
} }
return fallback_to_localpart ? jid.localpart : jid.bare_jid.to_string(); }
// Fallback to bare_jid / localpart
if (fallback_to_localpart && jid.localpart != null) {
return jid.localpart;
} else {
return jid.bare_jid.to_string();
} }
} }