diff --git a/src/net/java/sip/communicator/impl/globaldisplaydetails/GlobalDisplayDetailsImpl.java b/src/net/java/sip/communicator/impl/globaldisplaydetails/GlobalDisplayDetailsImpl.java index f995e63ce..8db1f313b 100644 --- a/src/net/java/sip/communicator/impl/globaldisplaydetails/GlobalDisplayDetailsImpl.java +++ b/src/net/java/sip/communicator/impl/globaldisplaydetails/GlobalDisplayDetailsImpl.java @@ -95,6 +95,9 @@ public GlobalDisplayDetailsImpl() */ public String getGlobalDisplayName() { + if (!StringUtils.isNullOrEmpty(provisionedDisplayName)) + return provisionedDisplayName; + return globalDisplayName; } @@ -350,8 +353,7 @@ public void run() } if(!StringUtils.isNullOrEmpty(provisionedDisplayName) - || (globalDisplayName != null - && globalDisplayName.length() > 0 && !isUpdate)) + || (!StringUtils.isNullOrEmpty(globalDisplayName) && !isUpdate)) return; if (currentFirstName == null) @@ -407,8 +409,7 @@ protected void setGlobalDisplayName() * it will make the accountName start with the * string "null". */ - if ((accountName == null) - || (accountName.length() == 0)) + if (StringUtils.isNullOrEmpty(accountName)) accountName = currentLastName; else accountName += " " + currentLastName; @@ -422,7 +423,7 @@ protected void setGlobalDisplayName() globalDisplayName = accountName; - if (accountName != null && accountName.length() > 0) + if (!StringUtils.isNullOrEmpty(globalDisplayName)) { fireGlobalDisplayNameEvent(globalDisplayName); }