aboutsummaryrefslogtreecommitdiffstats
path: root/src/net/java/sip/communicator/impl
diff options
context:
space:
mode:
authorBoris Grozev <boris@jitsi.org>2015-07-03 12:37:55 +0300
committerBoris Grozev <boris@jitsi.org>2015-07-03 12:37:55 +0300
commita9854c43c2781c8711188d923f1f96cfb6f3a3b9 (patch)
treeb72db7a2b14250e354ad96c1307afb1129a3ffa9 /src/net/java/sip/communicator/impl
parent12a81328d3fc52af7d96591056c10bd3f7df1c29 (diff)
downloadjitsi-a9854c43c2781c8711188d923f1f96cfb6f3a3b9.zip
jitsi-a9854c43c2781c8711188d923f1f96cfb6f3a3b9.tar.gz
jitsi-a9854c43c2781c8711188d923f1f96cfb6f3a3b9.tar.bz2
Fixes handling callto: URIs and cleans up documentation.
Diffstat (limited to 'src/net/java/sip/communicator/impl')
-rw-r--r--src/net/java/sip/communicator/impl/protocol/jabber/UriHandlerJabberImpl.java6
-rw-r--r--src/net/java/sip/communicator/impl/protocol/sip/ProtocolProviderServiceSipImpl.java6
-rw-r--r--src/net/java/sip/communicator/impl/protocol/sip/UriHandlerSipImpl.java6
3 files changed, 6 insertions, 12 deletions
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/UriHandlerJabberImpl.java b/src/net/java/sip/communicator/impl/protocol/jabber/UriHandlerJabberImpl.java
index 5db4fc7..3ca7ced 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/UriHandlerJabberImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/UriHandlerJabberImpl.java
@@ -250,11 +250,7 @@ public class UriHandlerJabberImpl
}
/**
- * Returns the protocol that this handler is responsible for or
- * &quot;xmpp&quot; in other words.
- *
- * @return the &quot;xmpp&quot; string to indicate that this handler is
- * responsible for handling &quot;xmpp&quot; uris.
+ * {@inheritDoc}
*/
@Override
public String[] getProtocol()
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 9272bb0..1b4f274 100644
--- a/src/net/java/sip/communicator/impl/protocol/sip/ProtocolProviderServiceSipImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/sip/ProtocolProviderServiceSipImpl.java
@@ -2363,10 +2363,12 @@ public class ProtocolProviderServiceSipImpl
{
uriStr = uriStr.trim();
- //we don't know how to handle the "tel:" scheme ... or rather we handle
- //it same as sip so replace:
+ //we don't know how to handle the "tel:" and "callto:" schemes ... or
+ // rather we handle them same as sip so replace:
if(uriStr.toLowerCase().startsWith("tel:"))
uriStr = "sip:" + uriStr.substring("tel:".length());
+ else if(uriStr.toLowerCase().startsWith("callto:"))
+ uriStr = "sip:" + uriStr.substring("callto:".length());
//Handle default domain name (i.e. transform 1234 -> 1234@sip.com)
//assuming that if no domain name is specified then it should be the
diff --git a/src/net/java/sip/communicator/impl/protocol/sip/UriHandlerSipImpl.java b/src/net/java/sip/communicator/impl/protocol/sip/UriHandlerSipImpl.java
index 3294e8a..286004f 100644
--- a/src/net/java/sip/communicator/impl/protocol/sip/UriHandlerSipImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/sip/UriHandlerSipImpl.java
@@ -259,11 +259,7 @@ public class UriHandlerSipImpl
}
/**
- * Returns the protocol that this handler is responsible for or "sip" in
- * other words.
- *
- * @return the "sip" string to indicate that this handler is responsible for
- * handling "sip" uris.
+ * {@inheritDoc}
*/
@Override
public String[] getProtocol()