Properly send URL parameters in all requests

webrtc/examples/androidapp/src/org/appspot/apprtc/WebSocketRTCClient.java

 /*
  *  Copyright 2014 The WebRTC Project Authors. All rights reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 113 matching lines @@
       sendPostMessage(MessageType.LEAVE, leaveUrl, null);
     }
     roomState = ConnectionState.CLOSED;
     if (wsClient != null) {
       wsClient.disconnect(true);
     }
   }
 
   // Helper functions to get connection, post message and leave message URLs
   private String getConnectionUrl(RoomConnectionParameters connectionParameters) {
-    String url = connectionParameters.roomUrl + "/" + ROOM_JOIN + "/" + connectionParameters.roomId;
-    if (connectionParameters.urlParameters != null) {
-      url += "?" + connectionParameters.urlParameters;
-    }
-    return url;
+    return connectionParameters.roomUrl + "/" + ROOM_JOIN + "/" + connectionParameters.roomId
+        + getQueryString(connectionParameters);

[magjed_webrtc, 2017/05/02 13:14:43]

It looks like it would be easier to assign "" to connectionParameters instead of
null when you don't have any arguments and remove the if-checks here.

[oprypin_webrtc, 2017/05/02 13:17:37]

It's not just a null check - it's also about the "?". It's arguably nicer to not
require it when passing connectionParameters.

[magjed_webrtc, 2017/05/03 07:58:41]

Ok, let's do it this way.

   }
 
   private String getMessageUrl(
       RoomConnectionParameters connectionParameters, SignalingParameters signalingParameters) {
     return connectionParameters.roomUrl + "/" + ROOM_MESSAGE + "/" + connectionParameters.roomId
-        + "/" + signalingParameters.clientId;
+        + "/" + signalingParameters.clientId + getQueryString(connectionParameters);
   }
 
   private String getLeaveUrl(
       RoomConnectionParameters connectionParameters, SignalingParameters signalingParameters) {
     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
   // looper thread.
   private void signalingParametersReady(final SignalingParameters signalingParameters) {
     Log.d(TAG, "Room connection completed.");
     if (connectionParameters.loopback
         && (!signalingParameters.initiator || signalingParameters.offerSdp != null)) {
       reportError("Loopback room is busy.");
       return;
@@ skipping 253 matching lines @@
     jsonPut(json, "candidate", candidate.sdp);
     return json;
   }
 
   // Converts a JSON candidate to a Java object.
   IceCandidate toJavaCandidate(JSONObject json) throws JSONException {
     return new IceCandidate(
         json.getString("id"), json.getInt("label"), json.getString("candidate"));
   }
 }