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...)
update-ice4j-and-libjitsi 5523
Ingo Bauersachs 10 years ago
parent 3ccebdc455
commit 87db51656a

@ -172,7 +172,7 @@ void setParentGroup(ContactGroupSipImpl newParentGroup)
public String getAddress()
{
SipURI sipURI = (SipURI) sipAddress.getURI();
return sipURI.getUser() + "@" + sipURI.getHost();
return sipURI.toString().substring(sipURI.getScheme().length() + 1);
}
/**

@ -209,6 +209,10 @@ public void registrationStateChanged(RegistrationStateChangeEvent evt)
try
{
subscribeAddress = getSubscribeAddress();
if (subscribeAddress == null)
{
return;
}
}
catch (ParseException e)
{

@ -279,6 +279,10 @@ else if (((SipUri) address.getURI()).getUser().equals(contactId))
{
return true;
}
else if (address.toString().equals(address.getURI().getScheme() + ":" + contactId))
{
return true;
}
else
{
result.add(SipActivator.getResources().getI18NString(
@ -2765,6 +2769,11 @@ else if(connection.getNextAddress())
*/
protected void notifyConnectionFailed()
{
if (sipRegistrarConnection.isRegistrarless())
{
return;
}
if(getRegistrationState().equals(RegistrationState.REGISTERED)
&& sipRegistrarConnection != null)
sipRegistrarConnection.setRegistrationState(

Loading…
Cancel
Save