Skip to content

Commit 6b96229

Browse files
author
Antonis Tsakiridis
authored
Merge pull request #839 from ognjenns/master
Merge and small changes
2 parents 0211523 + 084714c commit 6b96229

File tree

5 files changed

+18
-37
lines changed

5 files changed

+18
-37
lines changed

‎Examples/restcomm-helloworld/app/app.iml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,15 +84,14 @@
8484
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
8585
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
8686
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
87-
<excludeFolder url="file://$MODULE_DIR$/build/.DS_Store" />
88-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/.DS_Store" />
8987
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
9088
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
9189
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
9290
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
9391
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
9492
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaPrecompile" />
9593
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
94+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
9695
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
9796
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/prebuild" />
9897
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />

‎Examples/restcomm-olympus/app/app.iml‎

Lines changed: 14 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -57,20 +57,20 @@
5757
<sourceFolder url="file://$MODULE_DIR$/src/community/java" isTestSource="false" />
5858
<sourceFolder url="file://$MODULE_DIR$/src/community/rs" isTestSource="false" />
5959
<sourceFolder url="file://$MODULE_DIR$/src/community/shaders" isTestSource="false" />
60-
<sourceFolder url="file://$MODULE_DIR$/src/testCommunity/res" type="java-test-resource" />
61-
<sourceFolder url="file://$MODULE_DIR$/src/testCommunity/resources" type="java-test-resource" />
62-
<sourceFolder url="file://$MODULE_DIR$/src/testCommunity/assets" type="java-test-resource" />
63-
<sourceFolder url="file://$MODULE_DIR$/src/testCommunity/aidl" isTestSource="true" />
64-
<sourceFolder url="file://$MODULE_DIR$/src/testCommunity/java" isTestSource="true" />
65-
<sourceFolder url="file://$MODULE_DIR$/src/testCommunity/rs" isTestSource="true" />
66-
<sourceFolder url="file://$MODULE_DIR$/src/testCommunity/shaders" isTestSource="true" />
6760
<sourceFolder url="file://$MODULE_DIR$/src/androidTestCommunity/res" type="java-test-resource" />
6861
<sourceFolder url="file://$MODULE_DIR$/src/androidTestCommunity/resources" type="java-test-resource" />
6962
<sourceFolder url="file://$MODULE_DIR$/src/androidTestCommunity/assets" type="java-test-resource" />
7063
<sourceFolder url="file://$MODULE_DIR$/src/androidTestCommunity/aidl" isTestSource="true" />
7164
<sourceFolder url="file://$MODULE_DIR$/src/androidTestCommunity/java" isTestSource="true" />
7265
<sourceFolder url="file://$MODULE_DIR$/src/androidTestCommunity/rs" isTestSource="true" />
7366
<sourceFolder url="file://$MODULE_DIR$/src/androidTestCommunity/shaders" isTestSource="true" />
67+
<sourceFolder url="file://$MODULE_DIR$/src/testCommunity/res" type="java-test-resource" />
68+
<sourceFolder url="file://$MODULE_DIR$/src/testCommunity/resources" type="java-test-resource" />
69+
<sourceFolder url="file://$MODULE_DIR$/src/testCommunity/assets" type="java-test-resource" />
70+
<sourceFolder url="file://$MODULE_DIR$/src/testCommunity/aidl" isTestSource="true" />
71+
<sourceFolder url="file://$MODULE_DIR$/src/testCommunity/java" isTestSource="true" />
72+
<sourceFolder url="file://$MODULE_DIR$/src/testCommunity/rs" isTestSource="true" />
73+
<sourceFolder url="file://$MODULE_DIR$/src/testCommunity/shaders" isTestSource="true" />
7474
<sourceFolder url="file://$MODULE_DIR$/src/release/res" type="java-resource" />
7575
<sourceFolder url="file://$MODULE_DIR$/src/release/resources" type="java-resource" />
7676
<sourceFolder url="file://$MODULE_DIR$/src/release/assets" type="java-resource" />
@@ -92,20 +92,20 @@
9292
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
9393
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
9494
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
95-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
96-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
97-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
98-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
99-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
100-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
101-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
10295
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
10396
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
10497
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
10598
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
10699
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
107100
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
108101
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
102+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
103+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
104+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
105+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
106+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
107+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
108+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
109109
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
110110
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
111111
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
@@ -120,7 +120,6 @@
120120
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
121121
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/splits-support" />
122122
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
123-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />
124123
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
125124
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
126125
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
@@ -133,54 +132,38 @@
133132
<orderEntry type="library" name="com.google.firebase:firebase-iid-11.8.0" level="project" />
134133
<orderEntry type="library" name="android.arch.lifecycle:common:1.0.0@jar" level="project" />
135134
<orderEntry type="library" name="org.slf4j:slf4j-api:1.6.1@jar" level="project" />
136-
<orderEntry type="library" scope="TEST" name="org.assertj:assertj-core:1.7.1@jar" level="project" />
137-
<orderEntry type="library" scope="TEST" name="com.squareup:javawriter:2.1.1@jar" level="project" />
138-
<orderEntry type="library" scope="TEST" name="org.objenesis:objenesis:2.5.1@jar" level="project" />
139135
<orderEntry type="library" name="android.arch.lifecycle:runtime-1.0.0" level="project" />
140136
<orderEntry type="library" name="testfairy:testfairy-android-sdk-1.5.15" level="project" />
141137
<orderEntry type="library" name="com.android.support:appcompat-v7-26.1.0" level="project" />
142138
<orderEntry type="library" name="com.google.android.gms:play-services-basement-license-11.8.0" level="project" />
143139
<orderEntry type="library" name="com.android.support:support-annotations:26.1.0@jar" level="project" />
144140
<orderEntry type="library" name="com.madgag.spongycastle:prov:1.54.0.0@jar" level="project" />
145141
<orderEntry type="library" name="com.android.support:support-core-ui-26.1.0" level="project" />
146-
<orderEntry type="library" scope="TEST" name="com.android.support.test:runner-1.0.1" level="project" />
147-
<orderEntry type="library" scope="TEST" name="com.google.code.findbugs:jsr305:2.0.1@jar" level="project" />
148142
<orderEntry type="library" name="com.madgag.spongycastle:core:1.54.0.0@jar" level="project" />
149-
<orderEntry type="library" scope="TEST" name="com.squareup.assertj:assertj-android:1.1.1@jar" level="project" />
150143
<orderEntry type="library" scope="TEST" name="org.hamcrest:hamcrest-core:1.3@jar" level="project" />
151-
<orderEntry type="library" scope="TEST" name="com.android.support.test.espresso:espresso-idling-resource-3.0.0" level="project" />
152144
<orderEntry type="library" name="com.android.support:support-compat-26.1.0" level="project" />
153145
<orderEntry type="library" name="com.madgag.spongycastle:pkix:1.54.0.0@jar" level="project" />
154146
<orderEntry type="library" name="com.google.android.gms:play-services-basement-11.8.0" level="project" />
155147
<orderEntry type="library" name="com.google.firebase:firebase-messaging-license-11.8.0" level="project" />
156-
<orderEntry type="library" scope="TEST" name="com.android.support.test.uiautomator:uiautomator-v18-2.1.3" level="project" />
157148
<orderEntry type="library" name="android.arch.core:common:1.0.0@jar" level="project" />
158149
<orderEntry type="library" name="com.google.firebase:firebase-common-11.8.0" level="project" />
159-
<orderEntry type="library" scope="TEST" name="org.hamcrest:hamcrest-integration:1.3@jar" level="project" />
160150
<orderEntry type="library" name="com.google.android.gms:play-services-tasks-11.8.0" level="project" />
161151
<orderEntry type="library" name="com.google.firebase:firebase-common-license-11.8.0" level="project" />
162152
<orderEntry type="library" name="com.google.firebase:firebase-core-11.8.0" level="project" />
163-
<orderEntry type="library" scope="TEST" name="net.sf.kxml:kxml2:2.3.0@jar" level="project" />
164153
<orderEntry type="library" name="com.android.support:transition-26.1.0" level="project" />
165154
<orderEntry type="library" name="com.android.support:design-26.1.0" level="project" />
166155
<orderEntry type="library" name="com.google.firebase:firebase-analytics-impl-11.8.0" level="project" />
167-
<orderEntry type="library" scope="TEST" name="org.awaitility:awaitility:3.0.0@jar" level="project" />
168156
<orderEntry type="library" name="com.google.firebase:firebase-iid-license-11.8.0" level="project" />
169157
<orderEntry type="library" scope="TEST" name="junit:junit:4.12@jar" level="project" />
170158
<orderEntry type="library" name="com.android.support:support-fragment-26.1.0" level="project" />
171-
<orderEntry type="library" scope="TEST" name="javax.inject:javax.inject:1@jar" level="project" />
172159
<orderEntry type="library" name="com.android.support:support-vector-drawable-26.1.0" level="project" />
173-
<orderEntry type="library" scope="TEST" name="com.android.support.test.espresso:espresso-core-3.0.0" level="project" />
174-
<orderEntry type="library" scope="TEST" name="cz.msebera.android:httpclient:4.3.6@jar" level="project" />
175160
<orderEntry type="library" name="com.android.support:support-core-utils-26.1.0" level="project" />
176161
<orderEntry type="library" name="com.google.firebase:firebase-analytics-11.8.0" level="project" />
177162
<orderEntry type="library" name="org.webrtc:google-webrtc-1.0.21217" level="project" />
178-
<orderEntry type="library" scope="TEST" name="com.android.support.test:rules-1.0.1" level="project" />
179163
<orderEntry type="library" name="dnsjava:dnsjava:2.1.7@jar" level="project" />
180164
<orderEntry type="library" name="com.google.guava:guava:16.0.1@jar" level="project" />
181165
<orderEntry type="library" name="com.firebase:firebase-jobdispatcher-0.6.0" level="project" />
182166
<orderEntry type="library" name="org.slf4j:slf4j-log4j12:1.6.1@jar" level="project" />
183-
<orderEntry type="library" scope="TEST" name="org.hamcrest:hamcrest-library:1.3@jar" level="project" />
184167
<orderEntry type="library" name="org.apache.commons:commons-lang3:3.1@jar" level="project" />
185168
<orderEntry type="library" name="log4j:log4j:1.2.17@jar" level="project" />
186169
<orderEntry type="library" name="org.mobicents.javax.sip:android-jain-sip-ext:1.3.33@jar" level="project" />
@@ -189,15 +172,12 @@
189172
<orderEntry type="library" name="org.mvel:mvel2:2.1.8.Final@jar" level="project" />
190173
<orderEntry type="library" name="com.android.support:animated-vector-drawable-26.1.0" level="project" />
191174
<orderEntry type="library" name="org.squirrelframework:squirrel-foundation:0.3.8@jar" level="project" />
192-
<orderEntry type="library" scope="TEST" name="com.loopj.android:android-async-http:1.4.9@jar" level="project" />
193175
<orderEntry type="library" name="javax.sip:android-jain-sip-ri:1.2.293@jar" level="project" />
194176
<orderEntry type="library" name="org.restcomm.commons:commons-congestion:2.0.147@jar" level="project" />
195177
<orderEntry type="library" name="javolution:javolution:5.5.1@jar" level="project" />
196178
<orderEntry type="library" name="com.google.firebase:firebase-analytics-license-11.8.0" level="project" />
197179
<orderEntry type="library" name="com.google.firebase:firebase-analytics-impl-license-11.8.0" level="project" />
198180
<orderEntry type="library" name="com.google.android.gms:play-services-tasks-license-11.8.0" level="project" />
199181
<orderEntry type="module" module-name="restcomm.android.sdk" />
200-
<orderEntry type="module" module-name="restcomm.android.sdk" />
201-
<orderEntry type="module" module-name="restcomm.android.sdk" />
202182
</component>
203183
</module>

‎Examples/restcomm-olympus/app/build.gradle‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ android {
6767
// Not specifying applicationIdSuffix since release uses the default applicationId: org.restcomm.android.olympus
6868
buildConfigField "boolean", "ENABLE_TEST_FAIRY_RUNTIME", "true"
6969
buildConfigField "String", "TESTFAIRY_APP_TOKEN", TESTFAIRY_APP_TOKEN
70+
buildConfigField "String", "TEST_PUSH_FCM_KEY", TEST_PUSH_FCM_KEY
7071

7172
minifyEnabled false
7273
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ private void updatePrefs()
256256
/** Push notifications will not work if these parameters are replaced with real values: **/
257257
/** PUSH_NOTIFICATIONS_APPLICATION_NAME, PUSH_NOTIFICATIONS_FCM_SERVER_KEY **/
258258
prefEdit.putString(RCDevice.ParameterKeys.PUSH_NOTIFICATIONS_APPLICATION_NAME, "Olympus");
259-
prefEdit.putString(RCDevice.ParameterKeys.PUSH_NOTIFICATIONS_FCM_SERVER_KEY, "");
259+
prefEdit.putString(RCDevice.ParameterKeys.PUSH_NOTIFICATIONS_FCM_SERVER_KEY, BuildConfig.TEST_PUSH_FCM_KEY);
260260

261261
prefEdit.putString(RCDevice.ParameterKeys.PUSH_NOTIFICATIONS_ACCOUNT_EMAIL, txtPushAccount.getText().toString());
262262
prefEdit.putString(RCDevice.ParameterKeys.PUSH_NOTIFICATIONS_ACCOUNT_PASSWORD, txtPushPassword.getText().toString());

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

Lines changed: 1 addition & 0 deletions
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;

0 commit comments

Comments
 (0)