diff --git a/openvidu-android/app/src/main/AndroidManifest.xml b/openvidu-android/app/src/main/AndroidManifest.xml
index 5533c8f0..185c7cc6 100644
--- a/openvidu-android/app/src/main/AndroidManifest.xml
+++ b/openvidu-android/app/src/main/AndroidManifest.xml
@@ -10,6 +10,7 @@
impl
private Map IDS_RECEIVEVIDEO = new ConcurrentHashMap<>();
private Set IDS_ONICECANDIDATE = Collections.newSetFromMap(new ConcurrentHashMap<>());
private Session session;
- private String openviduUrl;
private String mediaServer;
private SessionActivity activity;
private WebSocket websocket;
private boolean websocketCancelled = false;
- public CustomWebSocket(Session session, String openviduUrl, SessionActivity activity) {
+ public CustomWebSocket(Session session, SessionActivity activity) {
this.session = session;
- this.openviduUrl = openviduUrl;
this.activity = activity;
}
@@ -652,13 +652,17 @@ public class CustomWebSocket extends AsyncTask impl
}, initialDelay, PING_MESSAGE_INTERVAL, TimeUnit.SECONDS);
}
- private String getWebSocketAddress(String openviduUrl) {
+ private String getWebSocketAddress() {
+ String wsUri;
try {
- URL url = new URL(openviduUrl);
- if (url.getPort() > -1)
- return "wss://" + url.getHost() + ":" + url.getPort() + "/openvidu";
- return "wss://" + url.getHost() + "/openvidu";
- } catch (MalformedURLException e) {
+ URI url = new URI(this.session.getToken());
+ if (url.getPort() > -1) {
+ wsUri = url.getScheme() + "://" + url.getHost() + ":" + url.getPort() + "/openvidu";
+ } else {
+ wsUri = url.getScheme() + "://" + url.getHost() + "/openvidu";
+ }
+ return wsUri;
+ } catch (URISyntaxException e) {
Log.e(TAG, "Wrong URL", e);
e.printStackTrace();
return "";
@@ -673,7 +677,7 @@ public class CustomWebSocket extends AsyncTask impl
sslContext.init(null, trustManagers, new java.security.SecureRandom());
factory.setSSLContext(sslContext);
factory.setVerifyHostname(false);
- websocket = factory.createSocket(getWebSocketAddress(openviduUrl));
+ websocket = factory.createSocket(getWebSocketAddress());
websocket.addListener(this);
websocket.connect();
} catch (KeyManagementException | NoSuchAlgorithmException | IOException | WebSocketException e) {
diff --git a/openvidu-android/app/src/main/res/layout/activity_main.xml b/openvidu-android/app/src/main/res/layout/activity_main.xml
index 9643c110..6b4946b1 100644
--- a/openvidu-android/app/src/main/res/layout/activity_main.xml
+++ b/openvidu-android/app/src/main/res/layout/activity_main.xml
@@ -90,16 +90,6 @@
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent">
-
-
-
diff --git a/openvidu-android/app/src/main/res/values/strings.xml b/openvidu-android/app/src/main/res/values/strings.xml
index 1c293fdd..7e1c5add 100644
--- a/openvidu-android/app/src/main/res/values/strings.xml
+++ b/openvidu-android/app/src/main/res/values/strings.xml
@@ -1,12 +1,11 @@
+ http://192.168.1.19:5000/
OpenVidu Android Sample
Join
Session Name
SessionA
Participant Name
Participant
- https://X.Y.W.Z:5000/
- https://X.Y.W.Z:4443/
Leave session
COULD NOT ESTABLISH THE CONNECTION, TRY AGAIN
We can not give you service without your permission