From e7e3f8fb7c8da279202141619ae41a8d448546c3 Mon Sep 17 00:00:00 2001
From: Ognjen Manevski <ognjen.manevski@telestax.com>
Date: Mon, 29 Jan 2018 11:25:05 +0100
Subject: [PATCH 1/3] Small change for Hello World

---
 Examples/restcomm-helloworld/app/app.iml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Examples/restcomm-helloworld/app/app.iml b/Examples/restcomm-helloworld/app/app.iml
index d3b6a79d..861f5e6f 100644
--- a/Examples/restcomm-helloworld/app/app.iml
+++ b/Examples/restcomm-helloworld/app/app.iml
@@ -84,8 +84,6 @@
       <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" />
@@ -93,6 +91,7 @@
       <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" />

From 7c4c8971198d33774545a1213829b3d83a911f7c Mon Sep 17 00:00:00 2001
From: Ognjen Manevski <ognjen.manevski@telestax.com>
Date: Mon, 29 Jan 2018 15:34:10 +0100
Subject: [PATCH 2/3] Added value of PUSH_NOTIFICATIONS_FCM_SERVER_KEY

---
 Examples/restcomm-olympus/app/app.iml         | 28 +++++++++----------
 .../restcomm/android/olympus/Util/Utils.java  |  3 +-
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/Examples/restcomm-olympus/app/app.iml b/Examples/restcomm-olympus/app/app.iml
index 29e09ecf..a13d48cb 100644
--- a/Examples/restcomm-olympus/app/app.iml
+++ b/Examples/restcomm-olympus/app/app.iml
@@ -92,13 +92,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/assets" type="java-test-resource" />
@@ -106,6 +99,13 @@
       <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
@@ -113,13 +113,6 @@
       <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" />
@@ -127,6 +120,13 @@
       <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" />
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
index 80b940a1..3ec20e82 100644
--- 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;
@@ -103,7 +104,7 @@ public static HashMap<String, Object> createParameters(SharedPreferences prefs,
         params.put(RCDevice.ParameterKeys.PUSH_NOTIFICATIONS_ENABLE_PUSH_FOR_ACCOUNT, prefs.getBoolean(RCDevice.ParameterKeys.PUSH_NOTIFICATIONS_ENABLE_PUSH_FOR_ACCOUNT , true));
         params.put(RCDevice.ParameterKeys.PUSH_NOTIFICATIONS_PUSH_DOMAIN, prefs.getString(RCDevice.ParameterKeys.PUSH_NOTIFICATIONS_PUSH_DOMAIN ,""));
         params.put(RCDevice.ParameterKeys.PUSH_NOTIFICATIONS_HTTP_DOMAIN, prefs.getString(RCDevice.ParameterKeys.PUSH_NOTIFICATIONS_HTTP_DOMAIN ,""));
-        params.put(RCDevice.ParameterKeys.PUSH_NOTIFICATIONS_FCM_SERVER_KEY, prefs.getString(RCDevice.ParameterKeys.PUSH_NOTIFICATIONS_FCM_SERVER_KEY ,""));
+        params.put(RCDevice.ParameterKeys.PUSH_NOTIFICATIONS_FCM_SERVER_KEY, BuildConfig.TEST_PUSH_FCM_KEY);
 
         return params;
     }

From 084714c6803ff42a06d0faac67db9259b66b2f22 Mon Sep 17 00:00:00 2001
From: Ognjen Manevski <ognjen.manevski@telestax.com>
Date: Mon, 29 Jan 2018 16:29:51 +0100
Subject: [PATCH 3/3] PR changes.

---
 Examples/restcomm-olympus/app/app.iml                           | 1 +
 .../main/java/org/restcomm/android/olympus/SigninActivity.java  | 2 +-
 .../src/main/java/org/restcomm/android/olympus/Util/Utils.java  | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Examples/restcomm-olympus/app/app.iml b/Examples/restcomm-olympus/app/app.iml
index a2d1b0da..6f541d9e 100644
--- a/Examples/restcomm-olympus/app/app.iml
+++ b/Examples/restcomm-olympus/app/app.iml
@@ -120,6 +120,7 @@
       <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/transforms" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
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
index 63285530..6eed6b74 100644
--- 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
index 3ec20e82..24a0f7c0 100644
--- 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
@@ -104,7 +104,7 @@ public static HashMap<String, Object> createParameters(SharedPreferences prefs,
         params.put(RCDevice.ParameterKeys.PUSH_NOTIFICATIONS_ENABLE_PUSH_FOR_ACCOUNT, prefs.getBoolean(RCDevice.ParameterKeys.PUSH_NOTIFICATIONS_ENABLE_PUSH_FOR_ACCOUNT , true));
         params.put(RCDevice.ParameterKeys.PUSH_NOTIFICATIONS_PUSH_DOMAIN, prefs.getString(RCDevice.ParameterKeys.PUSH_NOTIFICATIONS_PUSH_DOMAIN ,""));
         params.put(RCDevice.ParameterKeys.PUSH_NOTIFICATIONS_HTTP_DOMAIN, prefs.getString(RCDevice.ParameterKeys.PUSH_NOTIFICATIONS_HTTP_DOMAIN ,""));
-        params.put(RCDevice.ParameterKeys.PUSH_NOTIFICATIONS_FCM_SERVER_KEY, BuildConfig.TEST_PUSH_FCM_KEY);
+        params.put(RCDevice.ParameterKeys.PUSH_NOTIFICATIONS_FCM_SERVER_KEY, prefs.getString(RCDevice.ParameterKeys.PUSH_NOTIFICATIONS_FCM_SERVER_KEY ,""));
 
         return params;
     }