Merge branch 'master' of https://github.com/RestComm/restcomm-android-sdk

# Conflicts:
#	Examples/restcomm-olympus/app/app.iml

Author: Ognjen Manevski

Examples/restcomm-olympus/.idea/modules.xml

@@ -135,54 +135,38 @@
     <orderEntry type="library" name="com.google.firebase:firebase-iid-11.6.2" level="project" />
     <orderEntry type="library" name="android.arch.lifecycle:common:1.0.0@jar" level="project" />
     <orderEntry type="library" name="org.slf4j:slf4j-api:1.6.1@jar" level="project" />
-    <orderEntry type="library" scope="TEST" name="org.assertj:assertj-core:1.7.1@jar" level="project" />
-    <orderEntry type="library" scope="TEST" name="com.squareup:javawriter:2.1.1@jar" level="project" />
-    <orderEntry type="library" scope="TEST" name="org.objenesis:objenesis:2.5.1@jar" level="project" />
     <orderEntry type="library" name="android.arch.lifecycle:runtime-1.0.0" level="project" />
     <orderEntry type="library" name="testfairy:testfairy-android-sdk-1.5.15" level="project" />
     <orderEntry type="library" name="com.android.support:appcompat-v7-26.1.0" level="project" />
     <orderEntry type="library" name="com.google.android.gms:play-services-basement-license-11.6.2" level="project" />
     <orderEntry type="library" name="com.android.support:support-annotations:26.1.0@jar" level="project" />
     <orderEntry type="library" name="com.madgag.spongycastle:prov:1.54.0.0@jar" level="project" />
     <orderEntry type="library" name="com.android.support:support-core-ui-26.1.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="com.android.support.test:runner-1.0.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="com.google.code.findbugs:jsr305:2.0.1@jar" level="project" />
     <orderEntry type="library" name="com.madgag.spongycastle:core:1.54.0.0@jar" level="project" />
-    <orderEntry type="library" scope="TEST" name="com.squareup.assertj:assertj-android:1.1.1@jar" level="project" />
     <orderEntry type="library" scope="TEST" name="org.hamcrest:hamcrest-core:1.3@jar" level="project" />
-    <orderEntry type="library" scope="TEST" name="com.android.support.test.espresso:espresso-idling-resource-3.0.0" level="project" />
     <orderEntry type="library" name="com.android.support:support-compat-26.1.0" level="project" />
     <orderEntry type="library" name="com.madgag.spongycastle:pkix:1.54.0.0@jar" level="project" />
     <orderEntry type="library" name="com.google.android.gms:play-services-basement-11.6.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="com.android.support.test.uiautomator:uiautomator-v18-2.1.3" level="project" />
     <orderEntry type="library" name="com.google.firebase:firebase-messaging-license-11.6.2" level="project" />
     <orderEntry type="library" name="android.arch.core:common:1.0.0@jar" level="project" />
     <orderEntry type="library" name="com.google.firebase:firebase-common-11.6.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="org.hamcrest:hamcrest-integration:1.3@jar" level="project" />
     <orderEntry type="library" name="com.google.android.gms:play-services-tasks-11.6.2" level="project" />
     <orderEntry type="library" name="com.google.firebase:firebase-common-license-11.6.2" level="project" />
     <orderEntry type="library" name="com.google.firebase:firebase-core-11.6.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="net.sf.kxml:kxml2:2.3.0@jar" level="project" />
     <orderEntry type="library" name="com.android.support:transition-26.1.0" level="project" />
     <orderEntry type="library" name="com.android.support:design-26.1.0" level="project" />
     <orderEntry type="library" name="com.google.firebase:firebase-analytics-impl-11.6.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="org.awaitility:awaitility:3.0.0@jar" level="project" />
     <orderEntry type="library" name="com.google.firebase:firebase-iid-license-11.6.2" level="project" />
     <orderEntry type="library" scope="TEST" name="junit:junit:4.12@jar" level="project" />
     <orderEntry type="library" name="com.android.support:support-fragment-26.1.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="javax.inject:javax.inject:1@jar" level="project" />
     <orderEntry type="library" name="com.android.support:support-vector-drawable-26.1.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="com.android.support.test.espresso:espresso-core-3.0.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="cz.msebera.android:httpclient:4.3.6@jar" level="project" />
     <orderEntry type="library" name="com.android.support:support-core-utils-26.1.0" level="project" />
     <orderEntry type="library" name="com.google.firebase:firebase-analytics-11.6.2" level="project" />
     <orderEntry type="library" name="org.webrtc:google-webrtc-1.0.21217" level="project" />
-    <orderEntry type="library" scope="TEST" name="com.android.support.test:rules-1.0.1" level="project" />
     <orderEntry type="library" name="dnsjava:dnsjava:2.1.7@jar" level="project" />
     <orderEntry type="library" name="com.google.guava:guava:16.0.1@jar" level="project" />
     <orderEntry type="library" name="com.firebase:firebase-jobdispatcher-0.6.0" level="project" />
     <orderEntry type="library" name="org.slf4j:slf4j-log4j12:1.6.1@jar" level="project" />
-    <orderEntry type="library" scope="TEST" name="org.hamcrest:hamcrest-library:1.3@jar" level="project" />
     <orderEntry type="library" name="org.apache.commons:commons-lang3:3.1@jar" level="project" />
     <orderEntry type="library" name="log4j:log4j:1.2.17@jar" level="project" />
     <orderEntry type="library" name="org.mobicents.javax.sip:android-jain-sip-ext:1.3.33@jar" level="project" />
@@ -191,14 +175,12 @@
     <orderEntry type="library" name="org.mvel:mvel2:2.1.8.Final@jar" level="project" />
     <orderEntry type="library" name="com.android.support:animated-vector-drawable-26.1.0" level="project" />
     <orderEntry type="library" name="org.squirrelframework:squirrel-foundation:0.3.8@jar" level="project" />
-    <orderEntry type="library" scope="TEST" name="com.loopj.android:android-async-http:1.4.9@jar" level="project" />
     <orderEntry type="library" name="javax.sip:android-jain-sip-ri:1.2.293@jar" level="project" />
     <orderEntry type="library" name="org.restcomm.commons:commons-congestion:2.0.147@jar" level="project" />
     <orderEntry type="library" name="javolution:javolution:5.5.1@jar" level="project" />
     <orderEntry type="library" name="com.google.firebase:firebase-analytics-license-11.6.2" level="project" />
     <orderEntry type="library" name="com.google.firebase:firebase-analytics-impl-license-11.6.2" level="project" />
     <orderEntry type="library" name="com.google.android.gms:play-services-tasks-license-11.6.2" level="project" />
     <orderEntry type="module" module-name="restcomm.android.sdk" />
-    <orderEntry type="module" module-name="restcomm.android.sdk" />
   </component>
 </module>

Examples/restcomm-olympus/app/app.iml

@@ -116,9 +116,9 @@ android {
             // or org.restcomm.android.olympus.debug depending on buildType
 
             // Set specific application name as a resource, so that it's clear in the device what flavor a user is looking at
-            resValue "string", "app_name", "Restcomm Olympus Community"
-            buildConfigField "boolean", "ENABLE_TEST_FAIRY_RUNTIME", "false"
-            buildConfigField "String", "TESTFAIRY_APP_TOKEN", TESTFAIRY_APP_TOKEN
+            resValue "string", "app_name", "Restcomm WebRTC Demo Community"
+            //buildConfigField "boolean", "ENABLE_TEST_FAIRY_RUNTIME", "false"
+            //buildConfigField "String", "TESTFAIRY_APP_TOKEN", TESTFAIRY_APP_TOKEN
 
             // ICE_USERNAME, ICE_PASSWORD, ICE_DOMAIN &ICE_URL are defined in project gradle.properties for community builds, but also overriden
             // by gradle properties passed from command line (i.e. $ gradlew ... -PICE_DOMAIN=...) for Telestax builds from our
@@ -140,9 +140,9 @@ android {
             applicationIdSuffix ".premium"
 
             // Set specific application name as a resource, so that it's clear in the device what flavor a user is looking at
-            resValue "string", "app_name", "Restcomm Olympus Premium"
-            buildConfigField "boolean", "ENABLE_TEST_FAIRY_RUNTIME", "false"
-            buildConfigField "String", "TESTFAIRY_APP_TOKEN", TESTFAIRY_APP_TOKEN
+            resValue "string", "app_name", "Restcomm WebRTC Demo Premium"
+            //buildConfigField "boolean", "ENABLE_TEST_FAIRY_RUNTIME", "false"
+            //buildConfigField "String", "TESTFAIRY_APP_TOKEN", TESTFAIRY_APP_TOKEN
 
             // ICE_USERNAME, ICE_PASSWORD, ICE_DOMAIN &ICE_URL are defined in project gradle.properties for community builds, but also overriden
             // by gradle properties passed from command line (i.e. $ gradlew ... -PICE_DOMAIN=...) for Telestax builds from our

Examples/restcomm-olympus/app/build.gradle

@@ -34,10 +34,16 @@
 
         <!-- <meta-data android:name="net.hockeyapp.android.appIdentifier" android:value="${HOCKEYAPP_APP_ID}" /> -->
 
+        <!--
+        Notice a workaround: we 're using the app_name as the label of the signin activity. Reason for this is that without it somehow
+        the value we put there gets picked up as the name of the App as a whole and shows up in the launcher. Similar to
+        https://stackoverflow.com/questions/39971859/app-name-doesnt-change-in-launcher-when-using-product-flavors, check comments on the
+        submitter
+        -->
         <activity
             android:name=".SigninActivity"
             android:configChanges="orientation|screenSize|keyboardHidden"
-            android:label="@string/title_activity_signin" >
+            android:label="@string/app_name" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
 

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

@@ -209,7 +209,7 @@ public void sendBugReport()
          // Send logs via email and add timezone in the subject so that we can exactly correlate
          Intent i = new Intent(Intent.ACTION_SEND);
          i.setType("message/rfc822");
-         i.putExtra(Intent.EXTRA_EMAIL, new String[]{"antonis.tsakiridis@telestax.com"});
+         i.putExtra(Intent.EXTRA_EMAIL, new String[]{"mobile-sdks-squad@telestax.com"});
          i.putExtra(Intent.EXTRA_SUBJECT, "[restcomm-android-sdk] User bug report for Olympus");
          i.putExtra(Intent.EXTRA_TEXT, emailBody);
          //i.putExtra(Intent.EXTRA_HTML_TEXT, logs);

Examples/restcomm-olympus/app/src/main/java/org/restcomm/android/olympus/BugReportActivity.java

@@ -133,8 +133,6 @@ protected void onCreate(Bundle savedInstanceState) {
 
         alertDialog = new AlertDialog.Builder(CallActivity.this, R.style.SimpleAlertStyle).create();
 
-        //device = RCClient.listDevices().get(0);
-
         PreferenceManager.setDefaultValues(this, "preferences.xml", MODE_PRIVATE, R.xml.preferences, false);
         prefs = PreferenceManager.getDefaultSharedPreferences(this);
 
@@ -170,13 +168,6 @@ protected void onPause() {
         super.onPause();
         Log.i(TAG, "%% onPause");
         activityVisible = false;
-        // TODO: Issue #380: once we figure out the issue with the backgrounding we need to uncomment this
-        // I don't think we need this, but let's keep it around until we 're done with pausing video view functionality
-        /*
-        if (connection != null && connection.getState() == RCConnection.ConnectionState.CONNECTED) {
-            connection.pauseVideo();
-        }
-        */
 
         if (connection != null && connection.getState() == RCConnection.ConnectionState.CONNECTED) {
             connection.detachVideo();
@@ -225,23 +216,26 @@ protected void onResume() {
 
         // The activity has become visible (it is now "resumed").
         Log.i(TAG, "%% onResume");
-        if (connection != null && connection.getState() == RCConnection.ConnectionState.CONNECTED) {
-           // update the intent action if there's an ongoing call that we need to resume so that we provide a hint
-           // to handleCall() to do proper handling
-           getIntent().setAction(RCDevice.ACTION_RESUME_CALL);
-           //connection.resumeVideo();
-            //connection.reattachVideo((PercentFrameLayout)findViewById(R.id.local_video_layout),
-            //        (PercentFrameLayout)findViewById(R.id.remote_video_layout));
-
-            // Now that we can mute/umnute via notification, we need to update the UI accordingly if there was a change
-           // while we were not in the foreground
-           muteAudio = connection.isAudioMuted();
-           if (!muteAudio) {
-              btnMuteAudio.setImageResource(R.drawable.audio_unmuted);
-           }
-           else {
-              btnMuteAudio.setImageResource(R.drawable.audio_muted);
-           }
+        if (connection != null) {
+            if (connection.getState() == RCConnection.ConnectionState.CONNECTED) {
+                // update the intent action if there's an ongoing call that we need to resume so that we provide a hint
+                // to handleCall() to do proper handling
+                getIntent().setAction(RCDevice.ACTION_RESUME_CALL);
+
+                // Now that we can mute/umnute via notification, we need to update the UI accordingly if there was a change
+                // while we were not in the foreground
+                muteAudio = connection.isAudioMuted();
+                if (!muteAudio) {
+                    btnMuteAudio.setImageResource(R.drawable.audio_unmuted);
+                } else {
+                    btnMuteAudio.setImageResource(R.drawable.audio_muted);
+                }
+            }
+            else if (connection.getState() == RCConnection.ConnectionState.DISCONNECTED) {
+                // When a user returns to CallActivity, after the call was hung up by the peer, while App
+                // was in the background, we need to just close the Activity
+                finish();
+            }
         }
     }
 

Examples/restcomm-olympus/app/src/main/java/org/restcomm/android/olympus/CallActivity.java

@@ -89,7 +89,7 @@
     <string name="pref_ringtone_silent">Silent</string>
 
     <string name="pref_title_vibrate">Vibrate</string>
-    <string name="title_activity_signin">Restcomm Olympus</string>
+    <string name="title_activity_signin">Sign-in</string>
 
     <!-- Strings related to login -->
     <string name="prompt_email">Email</string>

Examples/restcomm-olympus/app/src/main/res/values/strings.xml

@@ -1451,11 +1451,12 @@ void onNotificationCall(RCConnection connection, HashMap<String, String> customH
          builder = builder.setSound(Uri.parse("android.resource://" + getPackageName() + "/" + audioManager.getResourceIdForKey(ParameterKeys.RESOURCE_SOUND_RINGING)));
       if (callIntent != null) {
          builder = builder
-         .addAction(R.drawable.ic_videocam_24dp, "Video", PendingIntent.getService(getApplicationContext(), 0, serviceIntentVideo, PendingIntent.FLAG_UPDATE_CURRENT))
-         .addAction(R.drawable.ic_call_24dp, "Audio", PendingIntent.getService(getApplicationContext(), 0, serviceIntentAudio, PendingIntent.FLAG_UPDATE_CURRENT))
-         .addAction(R.drawable.ic_call_end_24dp, "Hang Up", PendingIntent.getService(getApplicationContext(), 0, serviceIntentDecline, PendingIntent.FLAG_UPDATE_CURRENT))
-         .setContentIntent(PendingIntent.getService(getApplicationContext(), 0, serviceIntentDefault, PendingIntent.FLAG_UPDATE_CURRENT))
-         .setDeleteIntent(PendingIntent.getService(getApplicationContext(), 0, serviceIntentDelete, PendingIntent.FLAG_UPDATE_CURRENT));
+                 .addAction(R.drawable.ic_videocam_24dp, "Video", PendingIntent.getService(getApplicationContext(), 0, serviceIntentVideo, PendingIntent.FLAG_UPDATE_CURRENT))
+                 .addAction(R.drawable.ic_call_24dp, "Audio", PendingIntent.getService(getApplicationContext(), 0, serviceIntentAudio, PendingIntent.FLAG_UPDATE_CURRENT))
+                 .addAction(R.drawable.ic_call_end_24dp, "Hang Up", PendingIntent.getService(getApplicationContext(), 0, serviceIntentDecline, PendingIntent.FLAG_UPDATE_CURRENT))
+                 .setContentIntent(PendingIntent.getService(getApplicationContext(), 0, serviceIntentDefault, PendingIntent.FLAG_UPDATE_CURRENT))
+                 .setDeleteIntent(PendingIntent.getService(getApplicationContext(), 0, serviceIntentDelete, PendingIntent.FLAG_UPDATE_CURRENT));
+
       } else {
          //we dont want to show the notification to primary channel
          builder = builder.setContentIntent(PendingIntent.getService(getApplicationContext(), 0, serviceIntentDefault, PendingIntent.FLAG_UPDATE_CURRENT));
@@ -1743,7 +1744,7 @@ void onNotificationCallCanceled(RCConnection connection)
          // And then create a new notification to show that the call is missed, together with a means to call the peer. Notice
          // that if this notification is tapped, the peer will be called using the video preference of
          callIntent.setAction(ACTION_OUTGOING_CALL);
-         callIntent.putExtra(RCDevice.EXTRA_DID, connection.getPeer());
+         callIntent.putExtra(RCDevice.EXTRA_DID, peerUsername);
          callIntent.putExtra(RCDevice.EXTRA_VIDEO_ENABLED, (connection.getRemoteMediaType() == RCConnection.ConnectionMediaType.AUDIO_VIDEO));
 
          // We need to create a Task Stack to make sure we maintain proper flow at all times

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

@@ -1,7 +1,7 @@
 <resources>
-    <!-- -->
+    <!-- Provided by build.gradle for the App so that it can be parameterized based on flavor
     <string name="app_name">Restcomm Olympus</string>
-    <!-- -->
+     -->
 
     <string name="messenger">Messenger</string>
     <string name="action_settings">Settings</string>