Skip to content

Commit 267aaad

Browse files
author
Antonis
committed
Fixed #534: Fix Hello World sample App issues
1 parent aacff93 commit 267aaad

File tree

8 files changed

+46
-51
lines changed

8 files changed

+46
-51
lines changed

‎Examples/restcomm-helloworld/.idea/.name‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎Examples/restcomm-helloworld/.idea/gradle.xml‎

Lines changed: 3 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Examples/restcomm-helloworld/.idea/modules.xml‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 32 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -64,14 +64,6 @@
6464
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
6565
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
6666
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
67-
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
68-
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
69-
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
70-
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
71-
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
72-
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
73-
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
74-
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
7567
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
7668
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
7769
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
@@ -80,32 +72,36 @@
8072
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
8173
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
8274
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
75+
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
76+
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
77+
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
78+
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
79+
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
80+
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
81+
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
82+
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
8383
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
8484
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
85-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
8685
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
8786
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
8887
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
89-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/animated-vector-drawable/24.2.1/jars" />
90-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/24.2.1/jars" />
91-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-compat/24.2.1/jars" />
92-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-core-ui/24.2.1/jars" />
93-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-core-utils/24.2.1/jars" />
94-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-fragment/24.2.1/jars" />
95-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-media-compat/24.2.1/jars" />
96-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/24.2.1/jars" />
97-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-vector-drawable/24.2.1/jars" />
88+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/animated-vector-drawable/25.1.1/jars" />
89+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/25.1.1/jars" />
90+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-compat/25.1.1/jars" />
91+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-core-ui/25.1.1/jars" />
92+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-core-utils/25.1.1/jars" />
93+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-fragment/25.1.1/jars" />
94+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-media-compat/25.1.1/jars" />
95+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/25.1.1/jars" />
96+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-vector-drawable/25.1.1/jars" />
97+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/restcomm-helloworld/libwebrtc/unspecified/jars" />
9898
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
99-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
100-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
10199
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
102-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
103100
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
104101
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
105102
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
106-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
103+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
107104
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
108-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/restart-dex" />
109105
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
110106
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
111107
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
@@ -115,20 +111,23 @@
115111
</content>
116112
<orderEntry type="jdk" jdkName="Android API 24 Platform" jdkType="Android SDK" />
117113
<orderEntry type="sourceFolder" forTests="false" />
118-
<orderEntry type="library" exported="" name="support-v4-24.2.1" level="project" />
119-
<orderEntry type="library" exported="" name="support-compat-24.2.1" level="project" />
120-
<orderEntry type="library" exported="" name="support-media-compat-24.2.1" level="project" />
121-
<orderEntry type="library" exported="" name="animated-vector-drawable-24.2.1" level="project" />
122-
<orderEntry type="library" exported="" name="support-fragment-24.2.1" level="project" />
123114
<orderEntry type="library" exported="" name="android-jain-sip-ri-1.2.293" level="project" />
124-
<orderEntry type="library" exported="" name="support-core-ui-24.2.1" level="project" />
125115
<orderEntry type="library" exported="" name="core-1.54.0.0" level="project" />
126-
<orderEntry type="library" exported="" name="appcompat-v7-24.2.1" level="project" />
127-
<orderEntry type="library" exported="" name="support-vector-drawable-24.2.1" level="project" />
128-
<orderEntry type="library" exported="" name="support-core-utils-24.2.1" level="project" />
129-
<orderEntry type="library" exported="" name="support-annotations-24.2.1" level="project" />
130116
<orderEntry type="library" exported="" name="prov-1.54.0.0" level="project" />
117+
<orderEntry type="library" exported="" name="log4j-1.2.17" level="project" />
118+
<orderEntry type="library" exported="" name="support-v4-25.1.1" level="project" />
131119
<orderEntry type="library" exported="" name="pkix-1.54.0.0" level="project" />
120+
<orderEntry type="library" exported="" name="support-compat-25.1.1" level="project" />
121+
<orderEntry type="library" exported="" name="support-media-compat-25.1.1" level="project" />
122+
<orderEntry type="library" exported="" name="support-core-ui-25.1.1" level="project" />
123+
<orderEntry type="library" exported="" name="appcompat-v7-25.1.1" level="project" />
124+
<orderEntry type="library" exported="" name="support-annotations-25.1.1" level="project" />
125+
<orderEntry type="library" exported="" name="support-vector-drawable-25.1.1" level="project" />
126+
<orderEntry type="library" exported="" name="support-core-utils-25.1.1" level="project" />
127+
<orderEntry type="library" exported="" name="support-fragment-25.1.1" level="project" />
128+
<orderEntry type="library" exported="" name="animated-vector-drawable-25.1.1" level="project" />
132129
<orderEntry type="module" module-name="restcomm.android.sdk" exported="" />
130+
<orderEntry type="module" module-name="libwebrtc" exported="" />
131+
<orderEntry type="library" exported="" name="libwebrtc-unspecified" level="project" />
133132
</component>
134133
</module>

‎Examples/restcomm-helloworld/app/src/main/java/com/telestax/restcomm_helloworld/MainActivity.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,15 +50,15 @@
5050
import java.util.HashMap;
5151
import java.util.ListIterator;
5252

53-
import org.restcomm.android.sdk.RCClient;
53+
//import org.restcomm.android.sdk.RCClient;
5454
import org.restcomm.android.sdk.RCConnection;
5555
import org.restcomm.android.sdk.RCConnectionListener;
5656
import org.restcomm.android.sdk.RCDevice;
5757
import org.restcomm.android.sdk.RCDeviceListener;
5858
import org.restcomm.android.sdk.RCPresenceEvent;
59-
import org.webrtc.VideoRenderer;
60-
import org.webrtc.VideoRendererGui;
61-
import org.webrtc.VideoTrack;
59+
//import org.webrtc.VideoRenderer;
60+
//import org.webrtc.VideoRendererGui;
61+
//import org.webrtc.VideoTrack;
6262

6363
public class MainActivity extends Activity implements RCDeviceListener, RCConnectionListener, OnClickListener,
6464
ServiceConnection {
@@ -161,6 +161,7 @@ public void onServiceConnected(ComponentName className, IBinder service)
161161
params.put(RCDevice.ParameterKeys.SIGNALING_USERNAME, "android-sdk");
162162
params.put(RCDevice.ParameterKeys.SIGNALING_PASSWORD, "1234");
163163
params.put(RCDevice.ParameterKeys.MEDIA_ICE_URL, "https://service.xirsys.com/ice");
164+
params.put(RCDevice.ParameterKeys.MEDIA_ICE_DOMAIN, "cloud.restcomm.com");
164165
params.put(RCDevice.ParameterKeys.MEDIA_ICE_USERNAME, "atsakiridis");
165166
params.put(RCDevice.ParameterKeys.MEDIA_ICE_PASSWORD, "4e89a09e-bf6f-11e5-a15c-69ffdcc2b8a7");
166167
params.put(RCDevice.ParameterKeys.MEDIA_TURN_ENABLED, true);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<content url="file://$MODULE_DIR$">
1414
<excludeFolder url="file://$MODULE_DIR$/.gradle" />
1515
</content>
16-
<orderEntry type="inheritedJdk" />
16+
<orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
1717
<orderEntry type="sourceFolder" forTests="false" />
1818
</component>
1919
</module>

‎Examples/restcomm-helloworld/settings.gradle‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
include ':app'
22
include ':restcomm.android.sdk'
3-
project(':restcomm.android.sdk').projectDir=new File('../../restcomm.android.sdk')
3+
project(':restcomm.android.sdk').projectDir=new File('../../restcomm.android.sdk')
4+
include ':libwebrtc'
5+
project(':libwebrtc').projectDir=new File('../../restcomm.android.sdk/libwebrtc')

‎Examples/restcomm-olympus/.idea/misc.xml‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)