Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(258)

Unified Diff: webrtc/examples/androidapp/src/org/appspot/apprtc/WebSocketRTCClient.java

Issue 2858493003: Properly send URL parameters in all requests (Closed)
Patch Set: Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | webrtc/examples/androidtests/video_quality_loopback_test.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 5e8380ae0c14025d4f82cfabb7a2088bece389bc..3bd707aecf5efb711bf51b1857abe9d8fc093041 100644
--- a/webrtc/examples/androidapp/src/org/appspot/apprtc/WebSocketRTCClient.java
+++ b/webrtc/examples/androidapp/src/org/appspot/apprtc/WebSocketRTCClient.java
@@ -140,14 +140,22 @@ public class WebSocketRTCClient implements AppRTCClient, WebSocketChannelEvents
private String getMessageUrl(
RoomConnectionParameters connectionParameters, SignalingParameters signalingParameters) {
- return connectionParameters.roomUrl + "/" + ROOM_MESSAGE + "/" + connectionParameters.roomId
- + "/" + signalingParameters.clientId;
+ String url = connectionParameters.roomUrl + "/" + ROOM_MESSAGE + "/"
+ + connectionParameters.roomId + "/" + signalingParameters.clientId;
+ if (connectionParameters.urlParameters != null) {
kjellander_webrtc 2017/05/02 11:52:56 I think the code duplication pattern calls for int
oprypin_webrtc 2017/05/02 12:15:03 Done.
+ url += "?" + connectionParameters.urlParameters;
+ }
+ return url;
}
private String getLeaveUrl(
RoomConnectionParameters connectionParameters, SignalingParameters signalingParameters) {
- return connectionParameters.roomUrl + "/" + ROOM_LEAVE + "/" + connectionParameters.roomId + "/"
- + signalingParameters.clientId;
+ String url = connectionParameters.roomUrl + "/" + ROOM_LEAVE + "/"
+ + connectionParameters.roomId + "/" + signalingParameters.clientId;
+ if (connectionParameters.urlParameters != null) {
+ url += "?" + connectionParameters.urlParameters;
+ }
+ return url;
}
// Callback issued when room parameters are extracted. Runs on local
« no previous file with comments | « no previous file | webrtc/examples/androidtests/video_quality_loopback_test.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698