Merge pull request #839 from ognjenns/master

Merge and small changes
RestComm · Jan 29, 2018 · 6b96229 · 6b96229
2 parents 0211523 + 084714c
commit 6b96229
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 37 deletions.
diff --git a/Examples/restcomm-helloworld/app/app.iml b/Examples/restcomm-helloworld/app/app.iml
@@ -84,15 +84,14 @@
       <sourceFolder url="file://$MODULE_DIR$/src/test/java" 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/.DS_Store" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/.DS_Store" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaPrecompile" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/prebuild" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />

diff --git a/Examples/restcomm-olympus/app/app.iml b/Examples/restcomm-olympus/app/app.iml
@@ -57,20 +57,20 @@
       <sourceFolder url="file://$MODULE_DIR$/src/community/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/community/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/community/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testCommunity/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testCommunity/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testCommunity/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testCommunity/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testCommunity/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testCommunity/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testCommunity/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTestCommunity/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTestCommunity/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTestCommunity/assets" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTestCommunity/aidl" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTestCommunity/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTestCommunity/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTestCommunity/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testCommunity/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testCommunity/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testCommunity/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testCommunity/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testCommunity/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testCommunity/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testCommunity/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/release/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/release/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/release/assets" type="java-resource" />
@@ -92,20 +92,20 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" 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/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" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" 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/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" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/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/check-manifest" />
@@ -120,7 +120,6 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/splits-support" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
@@ -133,54 +132,38 @@
     <orderEntry type="library" name="com.google.firebase:firebase-iid-11.8.0" 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.8.0" 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.8.0" level="project" />
     <orderEntry type="library" name="com.google.firebase:firebase-messaging-license-11.8.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="com.android.support.test.uiautomator:uiautomator-v18-2.1.3" 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.8.0" 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.8.0" level="project" />
     <orderEntry type="library" name="com.google.firebase:firebase-common-license-11.8.0" level="project" />
     <orderEntry type="library" name="com.google.firebase:firebase-core-11.8.0" 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.8.0" 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.8.0" 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.8.0" 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" />
@@ -189,15 +172,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.8.0" level="project" />
     <orderEntry type="library" name="com.google.firebase:firebase-analytics-impl-license-11.8.0" level="project" />
     <orderEntry type="library" name="com.google.android.gms:play-services-tasks-license-11.8.0" level="project" />
     <orderEntry type="module" module-name="restcomm.android.sdk" />
-    <orderEntry type="module" module-name="restcomm.android.sdk" />
-    <orderEntry type="module" module-name="restcomm.android.sdk" />
   </component>
 </module>
diff --git a/Examples/restcomm-olympus/app/build.gradle b/Examples/restcomm-olympus/app/build.gradle
@@ -67,6 +67,7 @@ android {
             // Not specifying applicationIdSuffix since release uses the default applicationId: org.restcomm.android.olympus
             buildConfigField "boolean", "ENABLE_TEST_FAIRY_RUNTIME", "true"
             buildConfigField "String", "TESTFAIRY_APP_TOKEN", TESTFAIRY_APP_TOKEN
+            buildConfigField "String", "TEST_PUSH_FCM_KEY", TEST_PUSH_FCM_KEY
 
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'

diff --git a/Examples/restcomm-olympus/app/src/main/java/org/restcomm/android/olympus/SigninActivity.java b/Examples/restcomm-olympus/app/src/main/java/org/restcomm/android/olympus/SigninActivity.java
@@ -256,7 +256,7 @@ private void updatePrefs()
       /** Push notifications will not work if these parameters are replaced with real values: **/
       /** PUSH_NOTIFICATIONS_APPLICATION_NAME, PUSH_NOTIFICATIONS_FCM_SERVER_KEY **/
       prefEdit.putString(RCDevice.ParameterKeys.PUSH_NOTIFICATIONS_APPLICATION_NAME, "Olympus");
-      prefEdit.putString(RCDevice.ParameterKeys.PUSH_NOTIFICATIONS_FCM_SERVER_KEY, "");
+      prefEdit.putString(RCDevice.ParameterKeys.PUSH_NOTIFICATIONS_FCM_SERVER_KEY, BuildConfig.TEST_PUSH_FCM_KEY);
 
       prefEdit.putString(RCDevice.ParameterKeys.PUSH_NOTIFICATIONS_ACCOUNT_EMAIL, txtPushAccount.getText().toString());
       prefEdit.putString(RCDevice.ParameterKeys.PUSH_NOTIFICATIONS_ACCOUNT_PASSWORD, txtPushPassword.getText().toString());

diff --git a/Examples/restcomm-olympus/app/src/main/java/org/restcomm/android/olympus/Util/Utils.java b/Examples/restcomm-olympus/app/src/main/java/org/restcomm/android/olympus/Util/Utils.java
@@ -26,6 +26,7 @@
 import android.content.Intent;
 import android.content.SharedPreferences;
 
+import org.restcomm.android.olympus.BuildConfig;
 import org.restcomm.android.olympus.CallActivity;
 import org.restcomm.android.olympus.MessageActivity;
 import org.restcomm.android.sdk.RCDevice;