Fixed bug with incorrect URL when base URI with trailing slash used.

bkase · May 17, 2012 · 8bce20f · 8bce20f
1 parent 4f49431
commit 8bce20f
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/src/com/codebutler/android_websockets/SocketIOClient.java b/src/com/codebutler/android_websockets/SocketIOClient.java
@@ -30,15 +30,15 @@ public static interface Handler {
         public void onError(Exception error);
     }
 
-    URI mURI;
+    String mURL;
     Handler mHandler;
     String mSession;
     int mHeartbeat;
-    int mClosingTimeout;
     WebSocketClient mClient;
 
     public SocketIOClient(URI uri, Handler handler) {
-        mURI = uri;
+        // remove trailing "/" from URI, in case user provided e.g. http://test.com/
+        mURL = uri.toString().replaceAll("/$", "") + "/socket.io/1/";
         mHandler = handler;
     }
 
@@ -86,7 +86,7 @@ public void run() {
     }
 
     private void connectSession() throws URISyntaxException {
-        mClient = new WebSocketClient(new URI(mURI.toString() + "/socket.io/1/websocket/" + mSession), new WebSocketClient.Handler() {
+        mClient = new WebSocketClient(new URI(mURL + "websocket/" + mSession), new WebSocketClient.Handler() {
             @Override
             public void onMessage(byte[] data) {
                 cleanup();
@@ -195,7 +195,7 @@ public void connect() {
             return;
         new Thread() {
             public void run() {
-                HttpPost post = new HttpPost(mURI.toString() + "/socket.io/1/");
+                HttpPost post = new HttpPost(mURL);
                 try {
                     String line = downloadUriAsString(post);
                     String[] parts = line.split(":");
@@ -224,3 +224,4 @@ public void run() {
         }.start();
     }
 }
+