From c63b98607a5b1e6d89b3ed38cc78d86eac13ecae Mon Sep 17 00:00:00 2001
From: Yana Stamcheva <yana@jitsi.org>
Date: Sat, 20 Apr 2013 08:24:54 +0000
Subject: [PATCH] Improves the logic around a global provisioned display name.

---
 .../GlobalDisplayDetailsImpl.java                     | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

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);
             }