Fixed #484: Fix Android emulator to work with Olympus

Author: Antonis

Examples/restcomm-olympus/app/app.iml

@@ -66,14 +66,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
@@ -82,6 +74,14 @@
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />

restcomm.android.sdk/src/main/java/org/restcomm/android/sdk/SignalingClient/JainSipClient/JainSipClient.java

@@ -50,6 +50,7 @@
 import android.javax.sip.message.Response;
 import android.net.wifi.WifiInfo;
 import android.net.wifi.WifiManager;
+import android.os.Build;
 import android.os.Environment;
 import android.os.Handler;
 import android.os.SystemClock;
@@ -990,7 +991,15 @@ public String getIPAddress(boolean useIPv4) throws SocketException
       }
 
       if (jainSipNotificationManager.getNetworkStatus() == JainSipNotificationManager.NetworkStatus.NetworkStatusCellular) {
-         stringAddress = interface2Address(useIPv4, "rmnet");
+         if (Build.FINGERPRINT.contains("generic")) {
+            // Emulator; when using emulator, network access is provided via Cellular interface (no idea why this happens instead of ConnectivityManager.TYPE_ETHERNET)
+            // but the actual interface name is usually 'eth0', so let's pass that as well in the network interface prefix argument
+            stringAddress = interface2Address(useIPv4, "rmnet|eth");
+         }
+         else {
+            // Real device
+            stringAddress = interface2Address(useIPv4, "rmnet");
+         }
       }
 
       if (jainSipNotificationManager.getNetworkStatus() == JainSipNotificationManager.NetworkStatus.NetworkStatusEthernet) {

restcomm.android.sdk/src/main/java/org/restcomm/android/sdk/SignalingClient/JainSipClient/JainSipNotificationManager.java

@@ -87,6 +87,7 @@ public void close()
    @Override
    public void onReceive(Context context, Intent intent)
    {
+      RCLogger.d(TAG, "BroadcastReceiver:onReceive()");
       ConnectivityChange connectivityChange = ConnectivityChange.OFFLINE;
 
       // retrieve new connectivity status
@@ -152,26 +153,27 @@ public void onReceive(Context context, Intent intent)
 
    static public NetworkStatus checkConnectivity(Context context)
    {
+      RCLogger.d(TAG, "checkConnectivity()");
       ConnectivityManager connectivityManager = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
 
       NetworkInfo activeNetwork = connectivityManager.getActiveNetworkInfo();
       if (activeNetwork != null) {
          if (activeNetwork.getType() == ConnectivityManager.TYPE_WIFI && activeNetwork.isConnected()) {
-            RCLogger.w(TAG, "Connectivity event: WIFI");
+            RCLogger.w(TAG, "Connectivity status: WIFI");
             return NetworkStatus.NetworkStatusWiFi;
          }
 
          if (activeNetwork.getType() == ConnectivityManager.TYPE_MOBILE && activeNetwork.isConnected()) {
-            Log.w(TAG, "Connectivity event: CELLULAR DATA");
+            RCLogger.w(TAG, "Connectivity status: CELLULAR DATA");
             return NetworkStatus.NetworkStatusCellular;
          }
 
          if (activeNetwork.getType() == ConnectivityManager.TYPE_ETHERNET && activeNetwork.isConnected()) {
-            Log.w(TAG, "Connectivity event: ETHERNET");
+            RCLogger.w(TAG, "Connectivity status: ETHERNET");
             return NetworkStatus.NetworkStatusEthernet;
          }
       }
-      RCLogger.w(TAG, "Connectivity event: NONE");
+      RCLogger.w(TAG, "Connectivity status: NONE");
       return NetworkStatus.NetworkStatusNone;
    }