Fixed #248: Incoming call doesn't hangup properly. Fixed #247: Incoming P2P calls don't fire in the SDK. Fixed #250: When changing to registrarless no unregister is sent to RestComm

Author: atsakiridis

restcomm.android.client.sdk/restcomm.android.client.sdk.iml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":restcomm.android.client.sdk" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../Examples/restcomm-helloworld" external.system.id="GRADLE" external.system.module.group="restcomm-helloworld" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+<module external.linked.project.id=":restcomm.android.client.sdk" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../Examples/restcomm-olympus" external.system.id="GRADLE" external.system.module.group="restcomm-olympus" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="android-gradle" name="Android-Gradle">
       <configuration>

restcomm.android.client.sdk/src/main/java/org/mobicents/restcomm/android/client/sdk/RCDevice.java

@@ -508,14 +508,28 @@ public boolean isDisconnectSoundEnabled() {
      */
     public boolean updateParams(HashMap<String, Object> params) {
         RCLogger.i(TAG, "updateParams(): " + params.toString());
-        updateSipProfile(params);
-        if (reachabilityState != RCDeviceListener.RCConnectivityStatus.RCConnectivityStatusNone) {
-            DeviceImpl.GetInstance().Register();
-            return true;
+        boolean status = false;
+
+        if (params.containsKey("pref_proxy_domain") && !params.get("pref_proxy_domain").equals("")) {
+            // we have a new (non empty) domain, need to register
+            updateSipProfile(params);
+            if (reachabilityState != RCDeviceListener.RCConnectivityStatus.RCConnectivityStatusNone) {
+                DeviceImpl.GetInstance().Register();
+                status = true;
+            }
         }
         else {
-            return false;
+            // we have an empty domain
+            if (!sipProfile.getRemoteEndpoint().equals("")) {
+                // previously we had a registrar setup, need to unregister (important: we call updateSipProfile afterwards cause if we do no
+                // unregister will check the SipProfile, find that domain is empty and skip unregistration
+                DeviceImpl.GetInstance().Unregister();
+            }
+            // previously we didn't have a registrar setup, no need to do anything
+            updateSipProfile(params);
+            status = true;
         }
+        return status;
     }
 
     public void updateSipProfile(HashMap<String, Object> params) {

restcomm.android.client.sdk/src/main/java/org/mobicents/restcomm/android/sipua/impl/DeviceImpl.java

@@ -332,12 +332,21 @@ public void run() {
 
 	}
 
-	public void RefreshNetworking()
-	{
-		RCLogger.v(TAG, "RefreshNetworking");
+	public void Unregister() {
+		RCLogger.v(TAG, "Unregister");
+
+		if (sipProfile.getRemoteEndpoint().isEmpty()) {
+			// registrarless mode, skip unregistration
+			return;
+		}
+
+		if (registerRefreshHandler != null) {
+			// we are unregistering, stop future registrations
+			registerRefreshHandler.removeCallbacksAndMessages(null);
+		}
 
 		try {
-			this.sipManager.refreshNetworking(registrationExpiry);
+			this.sipManager.Unregister(null);
 		} catch (TransactionUnavailableException e) {
 			if (this.sipuaDeviceListener != null) {
 				// notify our listener that we are connecting
@@ -351,21 +360,12 @@ public void RefreshNetworking()
 		}
 	}
 
-	public void Unregister() {
-		RCLogger.v(TAG, "Unregister");
-
-		if (sipProfile.getRemoteEndpoint().isEmpty()) {
-			// registrarless mode, skip unregistration
-			return;
-		}
-
-		if (registerRefreshHandler != null) {
-			// we are unregistering, stop future registrations
-			registerRefreshHandler.removeCallbacksAndMessages(null);
-		}
+	public void RefreshNetworking()
+	{
+		RCLogger.v(TAG, "RefreshNetworking");
 
 		try {
-			this.sipManager.Unregister(null);
+			this.sipManager.refreshNetworking(registrationExpiry);
 		} catch (TransactionUnavailableException e) {
 			if (this.sipuaDeviceListener != null) {
 				// notify our listener that we are connecting

restcomm.android.client.sdk/src/main/java/org/mobicents/restcomm/android/sipua/impl/SipManager.java

@@ -66,6 +66,7 @@
 import android.javax.sip.header.ContactHeader;
 import android.javax.sip.header.ContentTypeHeader;
 import android.javax.sip.header.HeaderFactory;
+import android.javax.sip.header.RouteHeader;
 import android.javax.sip.header.ToHeader;
 import android.javax.sip.header.UserAgentHeader;
 import android.javax.sip.header.ViaHeader;
@@ -1020,6 +1021,7 @@ private void incomingInvite(RequestEvent requestEvent,
 				&& sipManagerState != SipManagerState.READY
 				&& sipManagerState != SipManagerState.INCOMING
 				) {
+			RCLogger.i(TAG, "incomingInvite(): invalid state: " + sipManagerState + " -bailing");
 			// sendDecline(requestEvent.getRequest());// Already in a call
 			return;
 		}
@@ -1035,6 +1037,7 @@ private void incomingInvite(RequestEvent requestEvent,
 
 			}
 			if (st == null) {
+				RCLogger.i(TAG, "incomingInvite(): server transaction still null");
 				return;
 			}
 			dialog = st.getDialog();
@@ -1162,9 +1165,22 @@ private void sendByeClient(Transaction transaction) {
 			Request byeRequest = null;
 			try {
 				byeRequest = dialog.createRequest(Request.BYE);
+				if (!getSipProfile().getRemoteEndpoint().isEmpty()) {
+					// we only need this for non-registrarless calls since the problem is only for incoming calls,
+					// and when working in registrarless mode there are no incoming calls
+					SipURI routeUri = (SipURI) addressFactory.createURI(getSipProfile().getRemoteEndpoint());
+					routeUri.setLrParam();
+					Address routeAddress = addressFactory.createAddress(routeUri);
+					RouteHeader routeHeader = headerFactory.createRouteHeader(routeAddress);
+					byeRequest.addFirst(routeHeader);
+				}
+
 			} catch (SipException e) {
 				// TODO Auto-generated catch block
 				e.printStackTrace();
+			} catch (ParseException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
 			}
 
 			final Request r = byeRequest;