Fixes #92: Improve the API so that internal call parameters aren't exposed to the Application

Author: atsakiridis

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

@@ -51,9 +51,9 @@ public class CallActivity extends Activity implements RCConnectionListener, View
     Button btnDecline;
     Button btnCancel;
 
-    // TODO: remove those when the API is structured properlu
     String incomingCallDid = "";
-    String incomingCallSdp = "";
+    // TODO: remove those when the API is structured properlu
+    // String incomingCallSdp = "";
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -124,9 +124,9 @@ protected void onCreate(Bundle savedInstanceState) {
             pendingConnection.updateListener(this);
             pendingConnection.setupWebrtcForIncomingCall(videoView, prefs);
 
-            // TODO: remove those
+            // the number from which we got the call
             incomingCallDid =  intent.getStringExtra(RCDevice.EXTRA_DID);
-            incomingCallSdp = intent.getStringExtra(RCDevice.EXTRA_SDP);
+            //incomingCallSdp = intent.getStringExtra(RCDevice.EXTRA_SDP);
         }
     }
 
@@ -147,8 +147,8 @@ public void onClick(View view) {
             }
         } else if (view.getId() == R.id.button_answer) {
             if (pendingConnection != null) {
-                //pendingConnection.accept();
-                pendingConnection.answerCall(incomingCallDid, incomingCallSdp);
+                pendingConnection.accept();
+                //pendingConnection.answerCall(incomingCallDid, incomingCallSdp);
                 connection = this.pendingConnection;
                 ringingPlayer.pause();
                 // Abandon audio focus when playback complete

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

@@ -146,6 +146,7 @@ public enum ConnectionState {
     private static final int REMOTE_WIDTH = 100;
     private static final int REMOTE_HEIGHT = 100;
 
+    public String incomingCallSdp = "";
     private PeerConnectionClient peerConnectionClient = null;
     private SignalingParameters signalingParameters;
     private AppRTCAudioManager audioManager = null;
@@ -538,7 +539,7 @@ public void onLocalDescription(final SessionDescription sdp) {
             @Override
             public void run() {
                 Log.e(TAG, "@@@@@ onLocalDescription");
-                if (signalingParameters != null && !signalingParameters.sipUrl.isEmpty()) {
+                if (signalingParameters != null) {  // && !signalingParameters.sipUrl.isEmpty()) {
                     logAndToast("Sending " + sdp.type + ", delay=" + delta + "ms");
                     if (signalingParameters.initiator) {
                         // keep it around so that we combine it with candidates before sending it over
@@ -597,6 +598,7 @@ public void run() {
                 else {
                     DeviceImpl.GetInstance().AcceptWebrtc(connection.signalingParameters.generateSipSdp(connection.signalingParameters.answerSdp,
                             connection.signalingParameters.iceCandidates));
+                    connection.state = state.CONNECTED;
                 }
             }
         };
@@ -822,8 +824,15 @@ public boolean isIncoming()
     public void accept()
     {
         if (haveConnectivity()) {
-            DeviceImpl.GetInstance().Accept();
-            this.state = state.CONNECTED;
+          //  DeviceImpl.GetInstance().Accept(
+            LinkedList<PeerConnection.IceServer> iceServers = new LinkedList<>();
+            iceServers.add(new PeerConnection.IceServer("stun:stun.l.google.com:19302", "", ""));
+            this.signalingParameters = new SignalingParameters(iceServers, false, "", "", "", null, null);
+            SignalingParameters params = SignalingParameters.extractCandidates(new SessionDescription(SessionDescription.Type.OFFER, incomingCallSdp));
+            this.signalingParameters.offerSdp = params.offerSdp;
+            this.signalingParameters.iceCandidates = params.iceCandidates;
+
+            startCall(this.signalingParameters);
         }
     }
 

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

@@ -464,11 +464,12 @@ public void onSipUAConnectionArrived(SipEvent event) {
         incomingConnection = new RCConnection();
         incomingConnection.incoming = true;
         incomingConnection.state = RCConnection.ConnectionState.CONNECTING;
+        incomingConnection.incomingCallSdp = event.sdp;
         DeviceImpl.GetInstance().sipuaConnectionListener = incomingConnection;
 
         // Important: need to fire the event in UI context cause currently we 're in JAIN SIP thread
         final String from = event.from;
-        final String sdp = event.sdp;
+        //final String sdp = event.sdp;
         Handler mainHandler = new Handler(RCClient.getInstance().context.getMainLooper());
         Runnable myRunnable = new Runnable() {
             @Override
@@ -478,7 +479,7 @@ public void run() {
                     Intent dataIntent = new Intent();
                     dataIntent.setAction(INCOMING_CALL);
                     dataIntent.putExtra(RCDevice.EXTRA_DID, from);
-                    dataIntent.putExtra(RCDevice.EXTRA_SDP, sdp);
+                    //dataIntent.putExtra(RCDevice.EXTRA_SDP, sdp);
                     pendingIntent.send(RCClient.getInstance().context, 0, dataIntent);
 
                 } catch (PendingIntent.CanceledException e) {