Skip to content

Commit f5f2095

Browse files
author
Ognjen Manevski
committed
Working on #831: finished
1 parent 72dd7da commit f5f2095

File tree

3 files changed

+128
-135
lines changed

3 files changed

+128
-135
lines changed

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

Lines changed: 46 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -8,62 +8,48 @@
88
</facet>
99
<facet type="android" name="Android">
1010
<configuration>
11-
<option name="SELECTED_BUILD_VARIANT" value="premiumDebug" />
12-
<option name="ASSEMBLE_TASK_NAME" value="assemblePremiumDebug" />
13-
<option name="COMPILE_JAVA_TASK_NAME" value="compilePremiumDebugSources" />
11+
<option name="SELECTED_BUILD_VARIANT" value="premiumRelease" />
12+
<option name="ASSEMBLE_TASK_NAME" value="assemblePremiumRelease" />
13+
<option name="COMPILE_JAVA_TASK_NAME" value="compilePremiumReleaseSources" />
1414
<afterSyncTasks>
15-
<task>generatePremiumDebugSources</task>
15+
<task>generatePremiumReleaseSources</task>
1616
</afterSyncTasks>
1717
<option name="ALLOW_USER_CONFIGURATION" value="false" />
1818
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
1919
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
20-
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res;file://$MODULE_DIR$/src/debug/res" />
20+
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
2121
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
2222
</configuration>
2323
</facet>
2424
</component>
2525
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
26-
<output url="file://$MODULE_DIR$/build/intermediates/classes/premium/debug" />
27-
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/premium/debug" />
26+
<output url="file://$MODULE_DIR$/build/intermediates/classes/premium/release" />
27+
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/premium/release" />
2828
<exclude-output />
2929
<content url="file://$MODULE_DIR$">
30-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/premium/debug" isTestSource="false" generated="true" />
31-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/premium/debug" isTestSource="false" generated="true" />
32-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/premium/debug" isTestSource="false" generated="true" />
33-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/premium/debug" isTestSource="false" generated="true" />
34-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/premium/debug" isTestSource="false" generated="true" />
35-
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/google-services/premium/debug" type="java-resource" />
36-
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/premium/debug" type="java-resource" />
37-
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/premium/debug" type="java-resource" />
38-
<sourceFolder url="file://$MODULE_DIR$/src/premiumDebug/res" type="java-resource" />
39-
<sourceFolder url="file://$MODULE_DIR$/src/premiumDebug/resources" type="java-resource" />
40-
<sourceFolder url="file://$MODULE_DIR$/src/premiumDebug/assets" type="java-resource" />
41-
<sourceFolder url="file://$MODULE_DIR$/src/premiumDebug/aidl" isTestSource="false" />
42-
<sourceFolder url="file://$MODULE_DIR$/src/premiumDebug/java" isTestSource="false" />
43-
<sourceFolder url="file://$MODULE_DIR$/src/premiumDebug/rs" isTestSource="false" />
44-
<sourceFolder url="file://$MODULE_DIR$/src/premiumDebug/shaders" isTestSource="false" />
45-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/premium/debug" isTestSource="true" generated="true" />
46-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/premium/debug" isTestSource="true" generated="true" />
47-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/premium/debug" isTestSource="true" generated="true" />
48-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/premium/debug" isTestSource="true" generated="true" />
49-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/premium/debug" isTestSource="true" generated="true" />
50-
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/premium/debug" type="java-test-resource" />
51-
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/premium/debug" type="java-test-resource" />
52-
<sourceFolder url="file://$MODULE_DIR$/src/androidTestPremiumDebug/res" type="java-test-resource" />
53-
<sourceFolder url="file://$MODULE_DIR$/src/androidTestPremiumDebug/resources" type="java-test-resource" />
54-
<sourceFolder url="file://$MODULE_DIR$/src/androidTestPremiumDebug/assets" type="java-test-resource" />
55-
<sourceFolder url="file://$MODULE_DIR$/src/androidTestPremiumDebug/aidl" isTestSource="true" />
56-
<sourceFolder url="file://$MODULE_DIR$/src/androidTestPremiumDebug/java" isTestSource="true" />
57-
<sourceFolder url="file://$MODULE_DIR$/src/androidTestPremiumDebug/rs" isTestSource="true" />
58-
<sourceFolder url="file://$MODULE_DIR$/src/androidTestPremiumDebug/shaders" isTestSource="true" />
59-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/test/premium/debug" isTestSource="true" generated="true" />
60-
<sourceFolder url="file://$MODULE_DIR$/src/testPremiumDebug/res" type="java-test-resource" />
61-
<sourceFolder url="file://$MODULE_DIR$/src/testPremiumDebug/resources" type="java-test-resource" />
62-
<sourceFolder url="file://$MODULE_DIR$/src/testPremiumDebug/assets" type="java-test-resource" />
63-
<sourceFolder url="file://$MODULE_DIR$/src/testPremiumDebug/aidl" isTestSource="true" />
64-
<sourceFolder url="file://$MODULE_DIR$/src/testPremiumDebug/java" isTestSource="true" />
65-
<sourceFolder url="file://$MODULE_DIR$/src/testPremiumDebug/rs" isTestSource="true" />
66-
<sourceFolder url="file://$MODULE_DIR$/src/testPremiumDebug/shaders" isTestSource="true" />
30+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/premium/release" isTestSource="false" generated="true" />
31+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/premium/release" isTestSource="false" generated="true" />
32+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/premium/release" isTestSource="false" generated="true" />
33+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/premium/release" isTestSource="false" generated="true" />
34+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/premium/release" isTestSource="false" generated="true" />
35+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/google-services/premium/release" type="java-resource" />
36+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/premium/release" type="java-resource" />
37+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/premium/release" type="java-resource" />
38+
<sourceFolder url="file://$MODULE_DIR$/src/premiumRelease/res" type="java-resource" />
39+
<sourceFolder url="file://$MODULE_DIR$/src/premiumRelease/resources" type="java-resource" />
40+
<sourceFolder url="file://$MODULE_DIR$/src/premiumRelease/assets" type="java-resource" />
41+
<sourceFolder url="file://$MODULE_DIR$/src/premiumRelease/aidl" isTestSource="false" />
42+
<sourceFolder url="file://$MODULE_DIR$/src/premiumRelease/java" isTestSource="false" />
43+
<sourceFolder url="file://$MODULE_DIR$/src/premiumRelease/rs" isTestSource="false" />
44+
<sourceFolder url="file://$MODULE_DIR$/src/premiumRelease/shaders" isTestSource="false" />
45+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/test/premium/release" isTestSource="true" generated="true" />
46+
<sourceFolder url="file://$MODULE_DIR$/src/testPremiumRelease/res" type="java-test-resource" />
47+
<sourceFolder url="file://$MODULE_DIR$/src/testPremiumRelease/resources" type="java-test-resource" />
48+
<sourceFolder url="file://$MODULE_DIR$/src/testPremiumRelease/assets" type="java-test-resource" />
49+
<sourceFolder url="file://$MODULE_DIR$/src/testPremiumRelease/aidl" isTestSource="true" />
50+
<sourceFolder url="file://$MODULE_DIR$/src/testPremiumRelease/java" isTestSource="true" />
51+
<sourceFolder url="file://$MODULE_DIR$/src/testPremiumRelease/rs" isTestSource="true" />
52+
<sourceFolder url="file://$MODULE_DIR$/src/testPremiumRelease/shaders" isTestSource="true" />
6753
<sourceFolder url="file://$MODULE_DIR$/src/premium/res" type="java-resource" />
6854
<sourceFolder url="file://$MODULE_DIR$/src/premium/resources" type="java-resource" />
6955
<sourceFolder url="file://$MODULE_DIR$/src/premium/assets" type="java-resource" />
@@ -85,27 +71,20 @@
8571
<sourceFolder url="file://$MODULE_DIR$/src/androidTestPremium/java" isTestSource="true" />
8672
<sourceFolder url="file://$MODULE_DIR$/src/androidTestPremium/rs" isTestSource="true" />
8773
<sourceFolder url="file://$MODULE_DIR$/src/androidTestPremium/shaders" isTestSource="true" />
88-
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
89-
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
90-
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
91-
<sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
92-
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
93-
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
94-
<sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
95-
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/res" type="java-test-resource" />
96-
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/resources" type="java-test-resource" />
97-
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/assets" type="java-test-resource" />
98-
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/aidl" isTestSource="true" />
99-
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/java" isTestSource="true" />
100-
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/rs" isTestSource="true" />
101-
<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" />
74+
<sourceFolder url="file://$MODULE_DIR$/src/release/res" type="java-resource" />
75+
<sourceFolder url="file://$MODULE_DIR$/src/release/resources" type="java-resource" />
76+
<sourceFolder url="file://$MODULE_DIR$/src/release/assets" type="java-resource" />
77+
<sourceFolder url="file://$MODULE_DIR$/src/release/aidl" isTestSource="false" />
78+
<sourceFolder url="file://$MODULE_DIR$/src/release/java" isTestSource="false" />
79+
<sourceFolder url="file://$MODULE_DIR$/src/release/rs" isTestSource="false" />
80+
<sourceFolder url="file://$MODULE_DIR$/src/release/shaders" isTestSource="false" />
81+
<sourceFolder url="file://$MODULE_DIR$/src/testRelease/res" type="java-test-resource" />
82+
<sourceFolder url="file://$MODULE_DIR$/src/testRelease/resources" type="java-test-resource" />
83+
<sourceFolder url="file://$MODULE_DIR$/src/testRelease/assets" type="java-test-resource" />
84+
<sourceFolder url="file://$MODULE_DIR$/src/testRelease/aidl" isTestSource="true" />
85+
<sourceFolder url="file://$MODULE_DIR$/src/testRelease/java" isTestSource="true" />
86+
<sourceFolder url="file://$MODULE_DIR$/src/testRelease/rs" isTestSource="true" />
87+
<sourceFolder url="file://$MODULE_DIR$/src/testRelease/shaders" isTestSource="true" />
10988
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
11089
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
11190
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
@@ -127,6 +106,7 @@
127106
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
128107
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
129108
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
109+
<excludeFolder url="file://$MODULE_DIR$/build/.DS_Store" />
130110
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
131111
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
132112
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
@@ -219,5 +199,6 @@
219199
<orderEntry type="library" name="com.google.firebase:firebase-analytics-impl-license-11.6.2" level="project" />
220200
<orderEntry type="library" name="com.google.android.gms:play-services-tasks-license-11.6.2" level="project" />
221201
<orderEntry type="module" module-name="restcomm.android.sdk" />
202+
<orderEntry type="module" module-name="restcomm.android.sdk" />
222203
</component>
223204
</module>

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,13 @@ public boolean onOptionsItemSelected(MenuItem item)
223223
Integer.parseInt(candidateTimeout)
224224
);
225225

226-
device.reconfigure(params);
226+
if (device.isInitialized()) {
227+
device.reconfigure(params);
228+
} else {
229+
//try to initialize with params
230+
device.initialize(this, params, this);
231+
}
232+
227233
}
228234
NavUtils.navigateUpFromSameTask(this);
229235
} catch (RCException e) {

0 commit comments

Comments
 (0)