Fixes issue #582 : SIP account name displayed in the GUI should be the AOR

2 files changed, 19 insertions, 12 deletions

diff --git a/src/net/java/sip/communicator/impl/protocol/sip/ProtocolProviderServiceSipImpl.java b/src/net/java/sip/communicator/impl/protocol/sip/ProtocolProviderServiceSipImpl.java
index bddee2e..91f6e7e 100644
--- a/src/net/java/sip/communicator/impl/protocol/sip/ProtocolProviderServiceSipImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/sip/ProtocolProviderServiceSipImpl.java
@@ -401,7 +401,8 @@ public class ProtocolProviderServiceSipImpl
                 if (preferredSipPort > NetworkUtils.MAX_PORT_NUMBER)
                 {
                     logger.error(preferredSipPort + " is larger than "
-                                 + NetworkUtils.MAX_PORT_NUMBER + " and does not "
+                                 + NetworkUtils.MAX_PORT_NUMBER
+                                 + " and does not "
                                  + "therefore represent a valid port nubmer.");
                 }
             }
@@ -414,7 +415,8 @@ public class ProtocolProviderServiceSipImpl
                 accountID.getAccountPropertyBoolean(
                     ProtocolProviderFactory.IS_PRESENCE_ENABLED, true);
 
-            boolean forceP2P = accountID.getAccountPropertyBoolean(ProtocolProviderFactory.FORCE_P2P_MODE, true);
+            boolean forceP2P = accountID.getAccountPropertyBoolean(
+                            ProtocolProviderFactory.FORCE_P2P_MODE, true);
 
             int pollingValue =
                 accountID.getAccountPropertyInt(
@@ -490,9 +492,8 @@ public class ProtocolProviderServiceSipImpl
             new ClientCapabilities(this);
 
             //initialize our display name
-            ourDisplayName =
-                accountID
-                    .getAccountPropertyString(ProtocolProviderFactory.DISPLAY_NAME);
+            ourDisplayName = accountID.getAccountPropertyString(
+                                    ProtocolProviderFactory.DISPLAY_NAME);
 
             if(ourDisplayName == null
                || ourDisplayName.trim().length() == 0)
diff --git a/src/net/java/sip/communicator/impl/protocol/sip/SipAccountID.java b/src/net/java/sip/communicator/impl/protocol/sip/SipAccountID.java
index 4202d48..c17953b 100644
--- a/src/net/java/sip/communicator/impl/protocol/sip/SipAccountID.java
+++ b/src/net/java/sip/communicator/impl/protocol/sip/SipAccountID.java
@@ -17,7 +17,16 @@ import net.java.sip.communicator.service.protocol.*;
 public class SipAccountID
     extends AccountID
 {
-    private static String getUserIDWithoutServerName(String userID)
+    /**
+     * Removes the server part from a sip user id if there is one. Used when
+     * calling the super constructor to ensure that we will be consistent about
+     * the value of the user id.
+     *
+     * @param userID the sip user id that we'd like to remove a server from.
+     *
+     * @return the user part of the <tt>userID</tt>
+     */
+    private static String stripServerNameFromUserID(String userID)
     {
         int index = userID.indexOf("@");
         return (index > -1) ? userID.substring(0, index) : userID;
@@ -33,7 +42,7 @@ public class SipAccountID
     protected SipAccountID(String userID, Map accountProperties,
         String serverName)
     {
-        super(getUserIDWithoutServerName(userID), accountProperties,
+        super(stripServerNameFromUserID(userID), accountProperties,
             (String) accountProperties.get(ProtocolProviderFactory.PROTOCOL),
             serverName);
     }
@@ -77,7 +86,8 @@ public class SipAccountID
      */
     public String getDisplayName()
     {
-        String returnValue = getUserID();
+        String returnValue = super.getAccountPropertyString(
+                            ProtocolProviderFactory.USER_ID);
 
         String protocolName =
             getAccountPropertyString(ProtocolProviderFactory.PROTOCOL);
@@ -88,10 +98,6 @@ public class SipAccountID
             // this is apparently a no registrar account
             protocolName = "RegistrarLess " + protocolName;
         }
-        else
-        {
-            returnValue += "@" + service;
-        }
 
         if (protocolName != null && protocolName.trim().length() > 0)
             returnValue += " (" + protocolName + ")";