Fixes #94: Avoid passing video view and preferences from the activity to SDK. Fixes #95: Various trivial fixes

Author: atsakiridis

Examples/restcomm-messenger/app/src/main/AndroidManifest.xml

@@ -21,7 +21,7 @@
             android:configChanges="orientation|screenSize|keyboardHidden"
             android:label="@string/app_name"
             android:launchMode="singleTask"
-            android:screenOrientation="fullUser" > <!-- "portrait" > -->
+            android:screenOrientation="portrait" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -35,8 +35,8 @@
         <activity
             android:name=".CallActivity"
             android:label="@string/title_activity_call"
-            android:screenOrientation="fullUser"
-            android:configChanges="orientation|screenSize" >
+            android:screenOrientation="portrait"
+            android:configChanges="orientation|screenSize|keyboardHidden" >
         </activity>
 
     </application>

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

@@ -21,6 +21,8 @@
 import android.widget.Button;
 import android.widget.CheckBox;
 import android.widget.CompoundButton;
+import android.widget.LinearLayout;
+import android.widget.RelativeLayout;
 
 import org.mobicents.restcomm.android.client.sdk.RCClient;
 import org.mobicents.restcomm.android.client.sdk.RCConnection;
@@ -35,26 +37,24 @@
 public class CallActivity extends Activity implements RCConnectionListener, View.OnClickListener,
         CompoundButton.OnCheckedChangeListener, AudioManager.OnAudioFocusChangeListener {
 
-    private GLSurfaceView videoView;
+    //private GLSurfaceView videoView;
     private RCConnection connection, pendingConnection;
     SharedPreferences prefs;
     private static final String TAG = "CallActivity";
     private HashMap<String, String> connectParams = new HashMap<String, String>();
     private RCDevice device;
+    private RelativeLayout parentLayout;
     MediaPlayer ringingPlayer;
     MediaPlayer callingPlayer;
     AudioManager audioManager;
+    final String TAG_LOCAL_VIDEO_VIEW = "local-video-view";
 
     CheckBox cbMuted;
     Button btnHangup;
     Button btnAnswer;
     Button btnDecline;
     Button btnCancel;
 
-    String incomingCallDid = "";
-    // TODO: remove those when the API is structured properlu
-    // String incomingCallSdp = "";
-
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -85,7 +85,8 @@ protected void onCreate(Bundle savedInstanceState) {
         btnCancel.setOnClickListener(this);
         cbMuted = (CheckBox)findViewById(R.id.checkbox_muted);
         cbMuted.setOnCheckedChangeListener(this);
-        videoView = (GLSurfaceView) findViewById(R.id.glview_call);
+        parentLayout = (RelativeLayout) findViewById(R.id.layout_video_call);
+        //videoView = (GLSurfaceView) findViewById(R.id.glview_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
@@ -108,7 +109,7 @@ protected void onCreate(Bundle savedInstanceState) {
         final Intent intent = getIntent();
         if (intent.getAction() == RCDevice.OUTGOING_CALL) {
             connectParams.put("username", intent.getStringExtra(RCDevice.EXTRA_DID));
-            connection = device.connect(connectParams, this, videoView, prefs);
+            connection = device.connect(connectParams, this);
 
             if (connection == null) {
                 Log.e(TAG, "Error: error connecting");
@@ -121,21 +122,15 @@ protected void onCreate(Bundle savedInstanceState) {
                 ringingPlayer.start();
             }
             pendingConnection = device.incomingConnection;
-            pendingConnection.updateListener(this);
-            pendingConnection.setupWebrtcForIncomingCall(videoView, prefs);
+            pendingConnection.listenerReady(this);
 
             // the number from which we got the call
-            incomingCallDid =  intent.getStringExtra(RCDevice.EXTRA_DID);
-            //incomingCallSdp = intent.getStringExtra(RCDevice.EXTRA_SDP);
+            String incomingCallDid =  intent.getStringExtra(RCDevice.EXTRA_DID);
         }
     }
 
     // UI Events
     public void onClick(View view) {
-        if (view.getId() == R.id.glview_call) {
-            //connection = device.connect(connectParams, this, videoView, prefs);
-        }
-
         if (view.getId() == R.id.button_hangup) {
             if (connection == null) {
                 Log.e(TAG, "Error: not connected");
@@ -148,8 +143,8 @@ public void onClick(View view) {
         } else if (view.getId() == R.id.button_answer) {
             if (pendingConnection != null) {
                 pendingConnection.accept();
-                //pendingConnection.answerCall(incomingCallDid, incomingCallSdp);
                 connection = this.pendingConnection;
+                pendingConnection = null;
                 ringingPlayer.pause();
                 // Abandon audio focus when playback complete
                 audioManager.abandonAudioFocus(this);
@@ -161,6 +156,7 @@ public void onClick(View view) {
                 ringingPlayer.pause();
                 // Abandon audio focus when playback complete
                 audioManager.abandonAudioFocus(this);
+                finish();
             }
         } else if (view.getId() == R.id.button_cancel) {
             if (connection == null) {
@@ -173,6 +169,7 @@ public void onClick(View view) {
                 callingPlayer.pause();
                 // Abandon audio focus when playback complete
                 audioManager.abandonAudioFocus(this);
+                finish();
             }
         }
     }
@@ -202,7 +199,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
     @Override
     public void onResume() {
         super.onResume();
-        videoView.onResume();
+        //videoView.onResume();
         /*
         activityRunning = true;
         if (peerConnectionClient != null) {
@@ -256,6 +253,8 @@ public void onCancelled(RCConnection connection) {
 
         this.connection = null;
         pendingConnection = null;
+
+        finish();
     }
 
     public void onDeclined(RCConnection connection) {
@@ -267,6 +266,8 @@ public void onDeclined(RCConnection connection) {
 
         this.connection = null;
         pendingConnection = null;
+
+        finish();
     }
 
     public void onDisconnected(RCConnection connection, int errorCode, String errorText) {
@@ -290,6 +291,17 @@ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked)
         }
     }
 
+    public void onReceiveLocalVideo(RCConnection connection, GLSurfaceView videoView) {
+        if (videoView != null) {
+            //show media on screen
+            videoView.setTag(TAG_LOCAL_VIDEO_VIEW);
+            if (parentLayout.findViewWithTag(TAG_LOCAL_VIDEO_VIEW) != null) {
+                parentLayout.removeView(videoView);
+            }
+            parentLayout.addView(videoView, 0);
+        }
+    }
+
     // Callbacks for auio focus change events
     public void onAudioFocusChange(int focusChange)
     {

Examples/restcomm-messenger/app/src/main/res/layout/activity_call.xml

@@ -1,15 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <RelativeLayout
+    android:id="@+id/layout_video_call"
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
-
+<!--
     <android.opengl.GLSurfaceView
         android:id="@+id/glview_call"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
+        -->
 
 <!--
     <FrameLayout

Examples/restcomm-messenger/app/src/main/res/layout/activity_main.xml

@@ -10,9 +10,9 @@
         android:layout_height="wrap_content"
         android:text="Dial"
         android:id="@+id/button_dial"
-        android:layout_alignBottom="@+id/text_uri"
-        android:layout_alignRight="@+id/button_send"
-        android:layout_alignEnd="@+id/button_send" />
+        android:layout_below="@+id/text_uri"
+        android:layout_alignEnd="@+id/button_send"
+        android:layout_alignParentStart="true" />
 <!--
     <Button
         android:layout_width="wrap_content"
@@ -30,12 +30,9 @@
         android:layout_height="wrap_content"
         android:text="Register"
         android:id="@+id/button_register"
-        android:layout_below="@+id/text_message"
-        android:layout_alignParentLeft="true"
+        android:layout_alignParentBottom="true"
         android:layout_alignParentStart="true"
-        android:layout_marginTop="30dp"
-        android:layout_alignRight="@+id/button_send"
-        android:layout_alignEnd="@+id/button_send" />
+        android:layout_alignParentEnd="true" />
 <!--
     <Button
         android:layout_width="wrap_content"
@@ -73,9 +70,9 @@
         android:layout_height="wrap_content"
         android:text="Send"
         android:id="@+id/button_send"
-        android:layout_alignBottom="@+id/text_message"
-        android:layout_alignParentRight="true"
-        android:layout_alignParentEnd="true" />
+        android:layout_below="@+id/text_message"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentStart="true" />
 
     <EditText
         android:layout_width="wrap_content"
@@ -86,7 +83,7 @@
         android:layout_alignParentStart="true"
         android:layout_toStartOf="@+id/button_send"
         android:layout_marginTop="10dp"
-        android:layout_toLeftOf="@+id/button_send" />
+        android:layout_alignEnd="@+id/button_send" />
 
     <EditText
         android:layout_width="wrap_content"
@@ -99,7 +96,7 @@
         android:layout_alignParentStart="true"
         android:layout_marginTop="25dp"
         android:layout_toStartOf="@+id/button_send"
-        android:layout_toLeftOf="@+id/button_send" />
+        android:layout_alignParentEnd="true" />
 
     <EditText
         android:layout_width="wrap_content"