Merge pull request koush#1 from FilipZawada/master

Fixed a bug with incorrect URL when base URI with trailing slash is used.
bkase · Jan 3, 2013 · 9760910 · 9760910
2 parents 7de2163 + 8bce20f
commit 9760910
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();
@@ -200,7 +200,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(":");
@@ -229,3 +229,4 @@ public void run() {
         }.start();
     }
 }
+