Fixes #102: With the latest changes for webrtc, if Messenger starts without Wifi, it crashes. Fixes #103: Implement mute for webrtc audio. Fixes #104: Minor UI enhancements in the call activity

Author: atsakiridis

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

@@ -9,6 +9,7 @@
 import android.content.res.Configuration;
 import android.media.AudioManager;
 import android.media.MediaPlayer;
+import android.net.wifi.WifiManager;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
 import android.view.Menu;
@@ -88,7 +89,6 @@ public void onError(Exception exception) {
 
         // preferences
         prefs.registerOnSharedPreferenceChangeListener(this);
-        initializeSipFromPreferences();
 
         txtUri.setText("sip:[email protected]:5080");
         //txtUri.setText("sip:[email protected]:5080");
@@ -118,10 +118,16 @@ public void onPrepared(MediaPlayer mp)
     // UI Events
     public void onClick(View view) {
         if (view.getId() == R.id.button_dial) {
-            Intent intent = new Intent(this, CallActivity.class);
-            intent.setAction(RCDevice.OUTGOING_CALL);
-            intent.putExtra(RCDevice.EXTRA_DID, txtUri.getText().toString());
-            startActivityForResult(intent, CONNECTION_REQUEST);
+            WifiManager wifi = (WifiManager) getSystemService(WIFI_SERVICE);
+            if (wifi.isWifiEnabled()) {
+                Intent intent = new Intent(this, CallActivity.class);
+                intent.setAction(RCDevice.OUTGOING_CALL);
+                intent.putExtra(RCDevice.EXTRA_DID, txtUri.getText().toString());
+                startActivityForResult(intent, CONNECTION_REQUEST);
+            }
+            else {
+                showOkAlert("No Connectivity", "No network connectivity");
+            }
         }
         else if (view.getId() == R.id.button_register) {
             device.updateParams(params);
@@ -259,6 +265,9 @@ protected void onResume() {
         // The activity has become visible (it is now "resumed").
         Log.i(TAG, "%% onResume");
         Intent intent = getIntent();
+
+        initializeSipFromPreferences();
+
         // If reason for resume is that we got an intent designating either an incoming call or message
         if (intent.getAction() == RCDevice.INCOMING_CALL) {
             ArrayList<RCDevice> list = RCClient.getInstance().listDevices();

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

@@ -15,17 +15,19 @@
         android:layout_alignParentLeft="true"
         android:layout_alignParentStart="true"
         android:layout_marginBottom="61dp"
-        android:minWidth="100dp" />
+        android:minWidth="100dp"
+        android:layout_marginLeft="10dp" />
 
     <Button
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="Answer"
         android:id="@+id/button_answer"
+        android:minWidth="100dp"
         android:layout_alignParentBottom="true"
-        android:layout_alignParentRight="true"
         android:layout_alignParentEnd="true"
-        android:minWidth="100dp" />
+        android:layout_marginBottom="10dp"
+        android:layout_marginRight="10dp" />
 
     <Button
         android:layout_width="wrap_content"
@@ -35,17 +37,19 @@
         android:layout_alignParentBottom="true"
         android:layout_alignParentLeft="true"
         android:layout_alignParentStart="true"
-        android:minWidth="100dp" />
+        android:minWidth="100dp"
+        android:layout_marginLeft="10dp"
+        android:layout_marginBottom="10dp" />
 
     <Button
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="Cancel"
         android:id="@+id/button_cancel"
+        android:minWidth="100dp"
+        android:layout_marginRight="10dp"
         android:layout_alignTop="@+id/button_hangup"
-        android:layout_alignParentRight="true"
-        android:layout_alignParentEnd="true"
-        android:minWidth="100dp" />
+        android:layout_alignStart="@+id/button_answer" />
 
     <CheckBox
         android:layout_width="wrap_content"
@@ -55,6 +59,7 @@
         android:layout_below="@+id/button_register"
         android:layout_alignParentLeft="true"
         android:layout_alignParentStart="true"
-        android:layout_marginTop="17dp" />
+        android:layout_marginTop="17dp"
+        android:layout_marginLeft="10dp" />
 
 </RelativeLayout>

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

@@ -302,6 +302,14 @@ private void setMicrophoneMute(boolean on) {
     audioManager.setMicrophoneMute(on);
   }
 
+  public void setMute(boolean on) {
+    audioManager.setMicrophoneMute(on);
+  }
+
+  public boolean getMute() {
+    return audioManager.isMicrophoneMute();
+  }
+
   /** Gets the current earpiece state. */
   private boolean hasEarpiece() {
     return apprtcContext.getPackageManager().hasSystemFeature(

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

@@ -28,6 +28,7 @@
 import android.opengl.GLSurfaceView;
 import android.os.Handler;
 import android.util.Log;
+import android.view.Gravity;
 import android.widget.Toast;
 import java.util.HashMap;
 import java.util.LinkedList;
@@ -300,7 +301,8 @@ public void disconnect()
      */
     public void setMuted(boolean muted)
     {
-        DeviceImpl.GetInstance().Mute(muted);
+        audioManager.setMute(muted);
+        //DeviceImpl.GetInstance().Mute(muted);
     }
 
     /**
@@ -309,7 +311,7 @@ public void setMuted(boolean muted)
      */
     public boolean isMuted()
     {
-        return false;
+        return audioManager.getMute();
     }
 
     /**
@@ -693,6 +695,7 @@ private void logAndToast(String msg) {
             logToast.cancel();
         }
         logToast = Toast.makeText(RCClient.getInstance().context, msg, Toast.LENGTH_SHORT);
+        logToast.setGravity(Gravity.CENTER_HORIZONTAL|Gravity.CENTER_VERTICAL, 0, 0);
         logToast.show();
     }