Properly send URL parameters in all requests

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

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..32150519346c3a9f4111325a41ec3490a9c69293 100644
--- a/webrtc/examples/androidapp/src/org/appspot/apprtc/WebSocketRTCClient.java
+++ b/webrtc/examples/androidapp/src/org/appspot/apprtc/WebSocketRTCClient.java
@@ -131,23 +131,28 @@ public class WebSocketRTCClient implements AppRTCClient, WebSocketChannelEvents
 
   // 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