Fixes #105: Remove the video view requirement from SDK

Author: atsakiridis

Examples/restcomm-messenger/app/build.gradle

@@ -9,7 +9,7 @@ android {
         minSdkVersion 17
         targetSdkVersion 22
         versionCode 1
-        versionName "1.2.1"
+        versionName "1.2.2"
     }
     buildTypes {
         release {

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

@@ -37,7 +37,8 @@ public class CallActivity extends Activity implements RCConnectionListener, View
     private static final String TAG = "CallActivity";
     private HashMap<String, String> connectParams = new HashMap<String, String>();
     private RCDevice device;
-    private RelativeLayout parentLayout;
+    // #WEBRTC-VIDEO TODO: uncomment when video is introduced
+    //private RelativeLayout parentLayout;
     MediaPlayer ringingPlayer;
     MediaPlayer callingPlayer;
     AudioManager audioManager;
@@ -78,7 +79,8 @@ protected void onCreate(Bundle savedInstanceState) {
         btnCancel.setOnClickListener(this);
         cbMuted = (CheckBox)findViewById(R.id.checkbox_muted);
         cbMuted.setOnCheckedChangeListener(this);
-        parentLayout = (RelativeLayout) findViewById(R.id.layout_video_call);
+        // #WEBRTC-VIDEO TODO: uncomment when video is introduced
+        //parentLayout = (RelativeLayout) findViewById(R.id.layout_video_call);
 
         audioManager = (AudioManager)getSystemService(Context.AUDIO_SERVICE);
         // volume control should be by default 'music' which will control the ringing sounds and 'voice call' when within a call
@@ -280,6 +282,8 @@ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked)
         }
     }
 
+    // #WEBRTC-VIDEO TODO: uncomment when video is introduced
+    /*
     public void onReceiveLocalVideo(RCConnection connection, GLSurfaceView videoView) {
         if (videoView != null) {
             //show media on screen
@@ -290,6 +294,7 @@ public void onReceiveLocalVideo(RCConnection connection, GLSurfaceView videoView
             parentLayout.addView(videoView, 0);
         }
     }
+    */
 
     // Callbacks for auio focus change events
     public void onAudioFocusChange(int focusChange)

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

@@ -331,7 +331,7 @@ private void createPeerConnectionFactoryInternal(
             preferIsac = true;
         }
         if (!PeerConnectionFactory.initializeAndroidGlobals(
-                context, true, true,
+                context, true, /*peerConnectionParameters.videoCallEnabled */ true,
                 peerConnectionParameters.videoCodecHwAcceleration, renderEGLContext)) {
             events.onPeerConnectionError("Failed to initializeAndroidGlobals");
         }

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

@@ -484,8 +484,8 @@ void initializeWebrtc()
         signalingParameters = null;
         scalingType = VideoRendererGui.ScalingType.SCALE_ASPECT_FILL;
 
-        // Uncomment when video is enabled
-        /**/
+        // #WEBRTC-VIDEO TODO: Uncomment when video is enabled
+        /*
         videoView = new GLSurfaceView(context);
         listener.onReceiveLocalVideo(this, videoView);
 
@@ -503,8 +503,7 @@ public void run() {
         localRender = VideoRendererGui.create(
                 LOCAL_X_CONNECTING, LOCAL_Y_CONNECTING,
                 LOCAL_WIDTH_CONNECTING, LOCAL_HEIGHT_CONNECTING, scalingType, true);
-        /**/
-        //createPeerConnectionFactory();
+        */
 
         // Check for mandatory permissions.
         for (String permission : MANDATORY_PERMISSIONS) {
@@ -595,6 +594,9 @@ public void run() {
                 "OPUS",
                 false,
                 true);
+
+        // #WEBRTC-VIDEO TODO: remove this
+        createPeerConnectionFactory();
     }
 
     private void startCall(SignalingParameters signalingParameters)
@@ -681,7 +683,11 @@ public void run() {
                 }
                 if (signalingParameters != null) {
                     Log.w(TAG, "EGL context is ready after room connection.");
-                    onConnectedToRoomInternal(signalingParameters);
+                    // #WEBRTC-VIDEO TODO: when I disabled the video view stuff, I also had to comment this out cause it turns out
+                    // that in that case this part of the code was executed (as if signalingParameters was null and now it isn't),
+                    // which resulted in onConnectedToRoomInternal being called twice for the same call! When I reinstate
+                    // video this should probably be uncommented:
+                    //onConnectedToRoomInternal(signalingParameters);
                 }
             }
         };
@@ -832,7 +838,7 @@ public void run() {
     @Override
     public void onPeerConnectionError(final String description) {
         //reportError(description);
-        Log.e(TAG, "PeerConnection error");
+        Log.e(TAG, "PeerConnection error: " + description);
         disconnect();
     }
 

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

@@ -71,13 +71,15 @@ public interface RCConnectionListener {
      * @param connection Connection
      * @param videoView View hosting the local video
      */
-    public void onReceiveLocalVideo(RCConnection connection, GLSurfaceView videoView);
+    // #WEBRTC-VIDEO TODO uncomment
+    //public void onReceiveLocalVideo(RCConnection connection, GLSurfaceView videoView);
 
     /**
      * Connection just disconnected with an error
      * @param connection Connection
      * @param videoView View hosting the remote video
      */
-    //public void onReceiveRemoteVideo(RCConnection connection, GLSurfaceView videoView);
+    // #WEBRTC-VIDEO TODO uncomment
+    // public void onReceiveRemoteVideo(RCConnection connection, GLSurfaceView videoView);
 }