Chromium Code Reviews| Index: webrtc/examples/androidapp/src/org/appspot/apprtc/WebSocketRTCClient.java |
| diff --git a/webrtc/examples/androidapp/src/org/appspot/apprtc/WebSocketRTCClient.java b/webrtc/examples/androidapp/src/org/appspot/apprtc/WebSocketRTCClient.java |
| index 28eef2e51e5f55f54835f14a2ec4a4ddc286578a..66f682438a607c2253c1032ae9fa2f6e550c24b5 100644 |
| --- a/webrtc/examples/androidapp/src/org/appspot/apprtc/WebSocketRTCClient.java |
| +++ b/webrtc/examples/androidapp/src/org/appspot/apprtc/WebSocketRTCClient.java |
| @@ -131,7 +131,16 @@ public class WebSocketRTCClient implements AppRTCClient, WebSocketChannelEvents |
| // Helper functions to get connection, post message and leave message URLs |
| private String getConnectionUrl(RoomConnectionParameters connectionParameters) { |
| - return connectionParameters.roomUrl + "/" + ROOM_JOIN + "/" + connectionParameters.roomId; |
| + StringBuilder builder = new StringBuilder( |
| + connectionParameters.roomUrl + "/" + ROOM_JOIN + "/" + connectionParameters.roomId); |
| + if (connectionParameters.colliderUrl != null) { |
| + // TODO false for wstls to disable https, should be option later or if URL is http |
| + builder.append("?wstls=false"); |
| + builder.append("?debug=loopback"); |
|
magjed_webrtc
2017/04/20 13:53:30
This seems unrelated to colliderUrl. Maybe we shou
magjed_webrtc
2017/04/20 13:53:30
Don't you need to use '&' instead of '?' for the f
oprypin_webrtc
2017/04/20 15:46:15
To me this kinda makes sense - if collider URL is
oprypin_webrtc
2017/04/20 15:46:15
Probably. I'll check if the test still works with
magjed_webrtc
2017/04/21 08:23:09
I was thinking we should have a String parameter '
oprypin_webrtc
2017/04/24 10:08:06
Turns out having all '?' works, and having '&' on
oprypin_webrtc
2017/04/24 10:41:10
Done.
|
| + builder.append("?ts="); |
| + builder.append("?wshpp=").append(connectionParameters.colliderUrl); |
| + } |
| + return builder.toString(); |
| } |
| private String getMessageUrl( |