When installing account check for SERVER_ADDRESS and SERVER_PORT if missing extract from userID and set default value.

1 files changed, 17 insertions, 2 deletions

diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/ProtocolProviderFactoryJabberImpl.java b/src/net/java/sip/communicator/impl/protocol/jabber/ProtocolProviderFactoryJabberImpl.java
index d37072d..b3cf263 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/ProtocolProviderFactoryJabberImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/ProtocolProviderFactoryJabberImpl.java
@@ -8,6 +8,7 @@ package net.java.sip.communicator.impl.protocol.jabber;
 
 import java.util.*;
 
+import org.jivesoftware.smack.util.*;
 import org.osgi.framework.*;
 import net.java.sip.communicator.service.protocol.*;
 
@@ -83,11 +84,25 @@ public class ProtocolProviderFactoryJabberImpl
         if (userIDStr == null)
             throw new NullPointerException("The specified AccountID was null");
 
-        accountProperties.put(USER_ID, userIDStr);
-
         if (accountProperties == null)
             throw new NullPointerException("The specified property map was null");
 
+        accountProperties.put(USER_ID, userIDStr);
+
+        // if server address is null, we must extract it from userID
+        if(accountProperties.get(SERVER_ADDRESS) == null)
+        {
+            accountProperties.put(SERVER_ADDRESS,
+                                  StringUtils.parseServer(userIDStr));
+        }
+
+        // if server port is null, we will set default value
+        if(accountProperties.get(SERVER_PORT) == null)
+        {
+            accountProperties.put(SERVER_PORT,
+                                  "5222");
+        }
+
         AccountID accountID = new JabberAccountID(userIDStr, accountProperties);
 
         //make sure we haven't seen this account id before.