zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Properly send URL parameters in all requests

Browse Source 
https://codereview.webrtc.org/2825313002/
added this only to connection URL but it's needed everywhere

BUG=webrtc:7548

Review-Url: https://codereview.webrtc.org/2858493003
Cr-Commit-Position: refs/heads/master@{#17981}
This commit is contained in:
oprypin
2017-05-03 01:58:39 -07:00
committed by Commit bot
parent bee4ff8d82
commit 9c7e56498b
2 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
webrtc/examples/androidapp/src/org/appspot/apprtc/WebSocketRTCClient.java
View File

@ -131,23 +131,28 @@ public class WebSocketRTCClient implements AppRTCClient, WebSocketChannelEvents
// Helper functions to get connection, post message and leave message URLs // Helper functions to get connection, post message and leave message URLs
private String getConnectionUrl(RoomConnectionParameters connectionParameters) { private String getConnectionUrl(RoomConnectionParameters connectionParameters) {
String url = connectionParameters.roomUrl + "/" + ROOM_JOIN + "/" + connectionParameters.roomId; return connectionParameters.roomUrl + "/" + ROOM_JOIN + "/" + connectionParameters.roomId
if (connectionParameters.urlParameters != null) { + getQueryString(connectionParameters);
url += "?" + connectionParameters.urlParameters;
}
return url;
} }
private String getMessageUrl( private String getMessageUrl(
RoomConnectionParameters connectionParameters, SignalingParameters signalingParameters) { RoomConnectionParameters connectionParameters, SignalingParameters signalingParameters) {
return connectionParameters.roomUrl + "/" + ROOM_MESSAGE + "/" + connectionParameters.roomId return connectionParameters.roomUrl + "/" + ROOM_MESSAGE + "/" + connectionParameters.roomId
+ "/" + signalingParameters.clientId; + "/" + signalingParameters.clientId + getQueryString(connectionParameters);
} }
private String getLeaveUrl( private String getLeaveUrl(
RoomConnectionParameters connectionParameters, SignalingParameters signalingParameters) { RoomConnectionParameters connectionParameters, SignalingParameters signalingParameters) {
return connectionParameters.roomUrl + "/" + ROOM_LEAVE + "/" + connectionParameters.roomId + "/" return connectionParameters.roomUrl + "/" + ROOM_LEAVE + "/" + connectionParameters.roomId + "/"
+ signalingParameters.clientId; + signalingParameters.clientId + getQueryString(connectionParameters);
}
private String getQueryString(RoomConnectionParameters connectionParameters) {
if (connectionParameters.urlParameters != null) {
return "?" + connectionParameters.urlParameters;
} else {
return "";
}
} }
// Callback issued when room parameters are extracted. Runs on local // Callback issued when room parameters are extracted. Runs on local

4
webrtc/examples/androidtests/video_quality_loopback_test.py
View File

@ -85,10 +85,6 @@ def _ParseArgs():
def main(): def main():
# Disabled, see bugs.webrtc.org/7548
if True:
return 0
logging.basicConfig(level=logging.INFO) logging.basicConfig(level=logging.INFO)
args = _ParseArgs() args = _ParseArgs()