Skip to content

Commit 7c4c897

Browse files
author
Ognjen Manevski
committed
Added value of PUSH_NOTIFICATIONS_FCM_SERVER_KEY
1 parent b34364f commit 7c4c897

File tree

2 files changed

+16
-15
lines changed
  • Examples/restcomm-olympus/app

2 files changed

+16
-15
lines changed

Examples/restcomm-olympus/app/app.iml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -92,41 +92,41 @@
9292
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
9393
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
9494
<sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
95-
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
96-
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
97-
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
98-
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
99-
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
100-
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
101-
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
10295
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/res" type="java-test-resource" />
10396
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/resources" type="java-test-resource" />
10497
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/assets" type="java-test-resource" />
10598
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/aidl" isTestSource="true" />
10699
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/java" isTestSource="true" />
107100
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/rs" isTestSource="true" />
108101
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/shaders" isTestSource="true" />
102+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
103+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
104+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
105+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
106+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
107+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
108+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
109109
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
110110
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
111111
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
112112
<sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
113113
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
114114
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
115115
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
116-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
117-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
118-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
119-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
120-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
121-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
122-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
123116
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
124117
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
125118
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
126119
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
127120
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
128121
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
129122
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
123+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
124+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
125+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
126+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
127+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
128+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
129+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
130130
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
131131
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
132132
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import android.content.Intent;
2727
import android.content.SharedPreferences;
2828

29+
import org.restcomm.android.olympus.BuildConfig;
2930
import org.restcomm.android.olympus.CallActivity;
3031
import org.restcomm.android.olympus.MessageActivity;
3132
import org.restcomm.android.sdk.RCDevice;
@@ -103,7 +104,7 @@ public static HashMap<String, Object> createParameters(SharedPreferences prefs,
103104
params.put(RCDevice.ParameterKeys.PUSH_NOTIFICATIONS_ENABLE_PUSH_FOR_ACCOUNT, prefs.getBoolean(RCDevice.ParameterKeys.PUSH_NOTIFICATIONS_ENABLE_PUSH_FOR_ACCOUNT , true));
104105
params.put(RCDevice.ParameterKeys.PUSH_NOTIFICATIONS_PUSH_DOMAIN, prefs.getString(RCDevice.ParameterKeys.PUSH_NOTIFICATIONS_PUSH_DOMAIN ,""));
105106
params.put(RCDevice.ParameterKeys.PUSH_NOTIFICATIONS_HTTP_DOMAIN, prefs.getString(RCDevice.ParameterKeys.PUSH_NOTIFICATIONS_HTTP_DOMAIN ,""));
106-
params.put(RCDevice.ParameterKeys.PUSH_NOTIFICATIONS_FCM_SERVER_KEY, prefs.getString(RCDevice.ParameterKeys.PUSH_NOTIFICATIONS_FCM_SERVER_KEY ,""));
107+
params.put(RCDevice.ParameterKeys.PUSH_NOTIFICATIONS_FCM_SERVER_KEY, BuildConfig.TEST_PUSH_FCM_KEY);
107108

108109
return params;
109110
}

0 commit comments

Comments
 (0)