mirror/Spark
3
0
Fork 0
mirror of https://github.com/igniterealtime/Spark.git synced 2026-02-04 14:05:26 +00:00
Code Issues Projects Releases Wiki Activity

ContactItem: make alias and nickname an empty string if null

Browse Source
This commit is contained in:
Sergey Ponomarev
2026-01-07 22:05:41 +02:00
committed by Guus der Kinderen
parent 6cb33f9415
commit 52bb6f9b76
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
core/src/main/java/org/jivesoftware/spark/ui/ContactItem.java
View File

@ -53,6 +53,8 @@ import org.jivesoftware.sparkimpl.settings.local.SettingsManager;
import org.jxmpp.jid.BareJid; import org.jxmpp.jid.BareJid;
import org.jxmpp.util.XmppStringUtils; import org.jxmpp.util.XmppStringUtils;
import static org.apache.commons.lang3.StringUtils.trimToEmpty;
/** /**
* Represent a single contact within the <code>ContactList</code>. * Represent a single contact within the <code>ContactList</code>.
*/ */
@ -109,8 +111,8 @@ public class ContactItem extends JPanel {
contactsDir = new File(SparkManager.getUserDirectory(), "contacts"); contactsDir = new File(SparkManager.getUserDirectory(), "contacts");
this.alias = alias; this.alias = trimToEmpty(alias);
this.nickname = nickname; this.nickname = trimToEmpty(nickname);
this.jid = jid; this.jid = jid;
if (initUi) { if (initUi) {
@ -163,11 +165,11 @@ public class ContactItem extends JPanel {
*/ */
public String getDisplayName() { public String getDisplayName() {
String displayName = null; String displayName = null;
if (alias != null && !alias.trim().isEmpty()) { if (!alias.isEmpty()) {
return alias.trim(); return alias;
} }
if (nickname != null && !nickname.trim().isEmpty()) { if (!nickname.isEmpty()) {
return nickname.trim(); return nickname;
} }
BareJid bareJid = getJid(); BareJid bareJid = getJid();
if (bareJid != null) { if (bareJid != null) {
@ -195,8 +197,8 @@ public class ContactItem extends JPanel {
* @param nickname the contact nickname. * @param nickname the contact nickname.
*/ */
public void setNickname(String nickname) { public void setNickname(String nickname) {
this.nickname = nickname; this.nickname = trimToEmpty(nickname);
if (alias == null) { if (alias.isEmpty()) {
setDisplayName(); setDisplayName();
} }
} }
@ -217,7 +219,7 @@ public class ContactItem extends JPanel {
* @param alias the contact alias. * @param alias the contact alias.
*/ */
public void setAlias(String alias) { public void setAlias(String alias) {
this.alias = alias; this.alias = trimToEmpty(alias);
setDisplayName(); setDisplayName();
} }