Add a few improvements for reg-less SIP accounts

- Fix contact addresses not allowing a domain/port
- No failure while subscribing to MWI without an address
- On timeout, don't disconnect (there's no connection anyway...)

3 files changed, 14 insertions, 1 deletions

diff --git a/src/net/java/sip/communicator/impl/protocol/sip/ContactSipImpl.java b/src/net/java/sip/communicator/impl/protocol/sip/ContactSipImpl.java
index 7f30e4f..d4662dd 100644
--- a/src/net/java/sip/communicator/impl/protocol/sip/ContactSipImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/sip/ContactSipImpl.java
@@ -172,7 +172,7 @@ public class ContactSipImpl
     public String getAddress()
     {
         SipURI sipURI = (SipURI) sipAddress.getURI();
-        return sipURI.getUser() + "@" + sipURI.getHost();
+        return sipURI.toString().substring(sipURI.getScheme().length() + 1);
     }
 
     /**
diff --git a/src/net/java/sip/communicator/impl/protocol/sip/OperationSetMessageWaitingSipImpl.java b/src/net/java/sip/communicator/impl/protocol/sip/OperationSetMessageWaitingSipImpl.java
index 28fce28..7972ee8 100644
--- a/src/net/java/sip/communicator/impl/protocol/sip/OperationSetMessageWaitingSipImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/sip/OperationSetMessageWaitingSipImpl.java
@@ -209,6 +209,10 @@ public class OperationSetMessageWaitingSipImpl
             try
             {
                 subscribeAddress = getSubscribeAddress();
+                if (subscribeAddress == null)
+                {
+                    return;
+                }
             }
             catch (ParseException e)
             {
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 a978de8..009af86 100644
--- a/src/net/java/sip/communicator/impl/protocol/sip/ProtocolProviderServiceSipImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/sip/ProtocolProviderServiceSipImpl.java
@@ -279,6 +279,10 @@ public class ProtocolProviderServiceSipImpl
             {
                 return true;
             }
+            else if (address.toString().equals(address.getURI().getScheme() + ":" + contactId))
+            {
+                return true;
+            }
             else
             {
                 result.add(SipActivator.getResources().getI18NString(
@@ -2765,6 +2769,11 @@ public class ProtocolProviderServiceSipImpl
      */
     protected void notifyConnectionFailed()
     {
+        if (sipRegistrarConnection.isRegistrarless())
+        {
+            return;
+        }
+
         if(getRegistrationState().equals(RegistrationState.REGISTERED)
             && sipRegistrarConnection != null)
             sipRegistrarConnection.setRegistrationState(