Repackaged HybiParser and WebSocketClient

Author: Vinay S Shenoy

src/com/koushikdutta/http/HybiParser.java …utler/android_websockets/HybiParser.javasrc/com/koushikdutta/http/HybiParser.java renamed to src/com/codebutler/android_websockets/HybiParser.java src/com/koushikdutta/http/HybiParser.java renamed to src/com/codebutler/android_websockets/HybiParser.java

@@ -28,7 +28,7 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-package com.koushikdutta.http;
+package com.codebutler.android_websockets;
 
 import java.io.ByteArrayOutputStream;
 import java.io.DataInputStream;

…m/koushikdutta/http/WebSocketClient.java …/android_websockets/WebSocketClient.javasrc/com/koushikdutta/http/WebSocketClient.java renamed to src/com/codebutler/android_websockets/WebSocketClient.java src/com/koushikdutta/http/WebSocketClient.java renamed to src/com/codebutler/android_websockets/WebSocketClient.java

@@ -1,4 +1,4 @@
-package com.koushikdutta.http;
+package com.codebutler.android_websockets;
 
 import java.io.EOFException;
 import java.io.IOException;
@@ -25,7 +25,7 @@
 import org.apache.http.message.BasicLineParser;
 import org.apache.http.message.BasicNameValuePair;
 
-import com.koushikdutta.http.HybiParser.HappyDataInputStream;
+import com.codebutler.android_websockets.HybiParser.HappyDataInputStream;
 
 import android.os.Handler;
 import android.os.HandlerThread;
@@ -87,22 +87,17 @@ public void connect() {
             @Override
             public void run() {
                 try {
-                    int port = (mURI.getPort() != -1) ? mURI.getPort()
-                            : ((mURI.getScheme().equals("wss") || mURI.getScheme().equals("https")) ? 443
-                                    : 80);
+                    int port = (mURI.getPort() != -1) ? mURI.getPort() : ((mURI.getScheme().equals("wss") || mURI.getScheme().equals("https")) ? 443 : 80);
 
-                    String path = TextUtils.isEmpty(mURI.getPath()) ? "/"
-                            : mURI.getPath();
+                    String path = TextUtils.isEmpty(mURI.getPath()) ? "/" : mURI.getPath();
                     if (!TextUtils.isEmpty(mURI.getQuery())) {
                         path += "?" + mURI.getQuery();
                     }
 
-                    String originScheme = mURI.getScheme().equals("wss") ? "https"
-                            : "http";
+                    String originScheme = mURI.getScheme().equals("wss") ? "https" : "http";
                     URI origin = new URI(originScheme, "//" + mURI.getHost(), null);
 
-                    SocketFactory factory = (mURI.getScheme().equals("wss") || mURI.getScheme().equals("https")) ? getSSLSocketFactory()
-                            : SocketFactory.getDefault();
+                    SocketFactory factory = (mURI.getScheme().equals("wss") || mURI.getScheme().equals("https")) ? getSSLSocketFactory() : SocketFactory.getDefault();
                     mSocket = factory.createSocket(mURI.getHost(), port);
 
                     PrintWriter out = new PrintWriter(mSocket.getOutputStream());
@@ -164,7 +159,7 @@ public void run() {
     }
 
     public void startParsing() {
-        
+
         // Now decode websocket frames.
         try {
             mParser.start(stream);

src/com/koushikdutta/async/http/socketio/SocketIOClient.java

@@ -6,9 +6,9 @@
 import android.os.Handler;
 import android.text.TextUtils;
 
+import com.codebutler.android_websockets.WebSocketClient;
 import com.koushikdutta.http.AsyncHttpClient;
 import com.koushikdutta.http.AsyncHttpClient.SocketIORequest;
-import com.koushikdutta.http.WebSocketClient;
 
 public class SocketIOClient extends EventEmitter {
 

src/com/koushikdutta/async/http/socketio/SocketIOConnection.java

@@ -6,11 +6,11 @@
 import org.json.JSONArray;
 import org.json.JSONObject;
 
+import com.codebutler.android_websockets.WebSocketClient;
+import com.codebutler.android_websockets.WebSocketClient.ClosedCallback;
+import com.codebutler.android_websockets.WebSocketClient.DataCallback;
 import com.koushikdutta.http.AsyncHttpClient;
 import com.koushikdutta.http.AsyncHttpClient.SocketIORequest;
-import com.koushikdutta.http.WebSocketClient;
-import com.koushikdutta.http.WebSocketClient.ClosedCallback;
-import com.koushikdutta.http.WebSocketClient.DataCallback;
 
 import java.util.ArrayList;
 import java.util.Arrays;

src/com/koushikdutta/http/AsyncHttpClient.java

@@ -9,6 +9,8 @@
 import org.apache.http.HttpResponse;
 import org.apache.http.client.methods.HttpPost;
 
+import com.codebutler.android_websockets.WebSocketClient;
+
 import android.net.Uri;
 import android.net.http.AndroidHttpClient;
 import android.os.AsyncTask;