Fixes #72: Expose SIP custom headers for calls in RCDevice.connect() of the SDK

Author: atsakiridis

Examples/restcomm-messenger/app/src/main/java/com/telestax/restcomm_messenger/MainActivity.java

@@ -33,6 +33,8 @@
 
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.Map;
+import java.util.Vector;
 
 
 public class MainActivity extends Activity implements RCDeviceListener, RCConnectionListener,
@@ -156,8 +158,14 @@ public void onClick(View view) {
                 Log.e(TAG, "Error: already connected");
                 return;
             }
-            HashMap<String, String> connectParams = new HashMap<String, String>();
+            HashMap<String, Object> connectParams = new HashMap<String, Object>();
             connectParams.put("username", txtUri.getText().toString());
+
+            // if you want to add custom SIP headers, please uncomment this
+            //HashMap<String, String> sipHeaders = new HashMap<>();
+            //sipHeaders.put("X-SIP-Header1", "Value1");
+            //connectParams.put("sip-headers", sipHeaders);
+
             connection = device.connect(connectParams, this);
             if (connection == null) {
                 Log.e(TAG, "Error: error connecting");

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

@@ -23,6 +23,7 @@
 package org.mobicents.restcomm.android.client.sdk;
 
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.Map;
 
 import android.app.Activity;
@@ -191,7 +192,7 @@ public void updateCapabilityToken(String token)
      *  @param listener   The listener object that will receive events when the connection state changes
      *
      *  @return An RCConnection object representing the new connection
-     */    public RCConnection connect(Map<String, String> parameters, RCConnectionListener listener)
+     */    public RCConnection connect(Map<String, Object> parameters, RCConnectionListener listener)
     {
         if (haveConnectivity()) {
             RCConnection connection = new RCConnection(listener);
@@ -200,8 +201,19 @@ public void updateCapabilityToken(String token)
             //DeviceImpl.GetInstance().listener = this;
             DeviceImpl.GetInstance().sipuaConnectionListener = connection;
 
-            DeviceImpl.GetInstance().Call(parameters.get("username"));
-
+            // create a new hash map
+            HashMap<String, String> sipHeaders = null;
+            if (parameters.containsKey("sip-headers")) {
+                sipHeaders = (HashMap<String, String>)parameters.get("sip-headers");
+            }
+            DeviceImpl.GetInstance().Call((String)parameters.get("username"), sipHeaders);
+            /*
+            for (Map.Entry<String, String> entry : parameters.entrySet()) {
+                if (entry.getKey().startsWith("X")) {
+                    sipHeaders.put(entry.getKey(), entry.getValue());
+                }
+            }
+            */
             return connection;
         }
         else {

sipua/src/main/java/org/mobicents/restcomm/android/sipua/IDevice.java

@@ -27,11 +27,13 @@
 
 import android.media.AudioManager;
 
+import java.util.HashMap;
+
 public interface IDevice  extends ISipEventListener{
 
 	void Register();
 
-	void Call(String to);
+	void Call(String to, HashMap<String, String> sipHeaders);
 
 	void Accept();
 

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

@@ -102,8 +102,11 @@ public void onSipMessage(final SipEvent sipEventObject) {
 	}
 
 	@Override
-	public void Call(String to) {
+	public void Call(String to, HashMap<String, String> sipHeaders) {
 		try {
+			if (sipHeaders != null) {
+				sipManager.setCustomHeaders(sipHeaders);
+			}
 			this.sipManager.Call(to, this.soundManager.setupAudioStream());
 		} catch (NotInitializedException e) {
 			e.printStackTrace();

sipua/src/main/java/org/mobicents/restcomm/android/sipua/impl/sipmessages/Invite.java

@@ -89,9 +89,8 @@ public Request MakeRequest(SipManager sipManager,String to, int port){
 			// You can add extension headers of your own making
 			// to the outgoing SIP request.
 			// Add the extension header.
-			Header extensionHeader = sipManager.headerFactory.createHeader("My-Header",
-					"my header value");
-			callRequest.addHeader(extensionHeader);
+			//Header extensionHeader = sipManager.headerFactory.createHeader("My-Header", "my header value");
+			//callRequest.addHeader(extensionHeader);
 
 			String sdpData= "v=0\r\n" +
 					"o=- 13760799956958020 13760799956958020" + " IN IP4 " + sipManager.getSipProfile().getLocalIp() +"\r\n" +
@@ -112,9 +111,8 @@ public Request MakeRequest(SipManager sipManager,String to, int port){
 			// You can add as many extension headers as you
 			// want.
 
-			extensionHeader = sipManager.headerFactory.createHeader("My-Other-Header",
-					"my new header value ");
-			callRequest.addHeader(extensionHeader);
+			//extensionHeader = sipManager.headerFactory.createHeader("My-Other-Header", "my new header value ");
+			//callRequest.addHeader(extensionHeader);
 
 			Header callInfoHeader = sipManager.headerFactory.createHeader("Call-Info",
 					"<http://www.antd.nist.gov>");