Add Android wrapper

Author: stellaraccident

.classpath

@@ -2,7 +2,9 @@
 <classpath>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="test"/>
+	<classpathentry kind="src" path="android"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
+	<classpathentry kind="var" path="ANDROID_PLATFORM/android.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

.gitignore

@@ -1,2 +1,4 @@
 bin
 
+/local.properties
+/build

android/net/rcode/wsclient/AndroidWebSocket.java

@@ -0,0 +1,57 @@
+package net.rcode.wsclient;
+
+import android.os.Handler;
+
+/**
+ * Android specific WebSocket client that interfaces with the Looper
+ * to provide threading control.
+ * 
+ * @author stella
+ *
+ */
+public class AndroidWebSocket extends WebSocket {
+	private Handler handler;
+	
+	/**
+	 * Instantiate the class so that events are directed back at the Looper
+	 * attached to this thread.  In typical parlance, this means that you must
+	 * instantiate the instance on the main thread.  A task will be posted to
+	 * the current thread to start the instance.
+	 * 
+	 * @param url
+	 * @param requestedProtocols
+	 */
+	public AndroidWebSocket(String url, String... requestedProtocols) {
+		this(new Handler(), url, requestedProtocols);
+		handler.post(new Runnable() {
+			@Override
+			public void run() {
+				start();
+			}
+		});
+	}
+
+	/**
+	 * Instantiate the instance targeting an explicit handler.  This variant is
+	 * typically not used.  This constructor does not automatically post a message
+	 * to the handler to start the instance.  The caller must arrange to start
+	 * it via another means.
+	 * 
+	 * @param url
+	 * @param requestedProtocols
+	 */
+	public AndroidWebSocket(Handler handler, String url, String... requestedProtocols) {
+		super(url, requestedProtocols);
+		handler=new Handler();
+	}
+
+	@Override
+	protected void dispatchEvent(final Event event, final EventListener l) {
+		handler.post(new Runnable() {
+			@Override
+			public void run() {
+				l.handleEvent(event);
+			}
+		});
+	}
+}

build.xml

@@ -0,0 +1,49 @@
+<project name="java-websocket-client" default="dist">
+	<property file="local.properties"/>
+	
+	<target name="init-base">
+		<mkdir dir="build"/>
+		<mkdir dir="build/classes"/>
+		<mkdir dir="build/android-classes"/>
+		<mkdir dir="build/dist"/>
+		<available property="has.android.jar" file="${android.jar}"/>
+	</target>
+	
+	<target name="init-no-android" unless="has.android.jar">
+		<echo>Android support will not be built because the property android.jar is not</echo>
+		<echo>set correctly.  It is currently ${android.jar}</echo>
+	</target>
+	
+	<target name="init" depends="init-base,init-no-android"/>
+	
+	<target name="clean">
+		<delete dir="build"/>
+	</target>
+	
+	<target name="compile-core">
+		<javac srcdir="src" destdir="build/classes" target="1.5" source="1.5" debug="true" includeantruntime="false"/>
+	</target>
+	
+	<target name="compile-android" if="has.android.jar">
+		<javac srcdir="android" destdir="build/android-classes" target="1.5" source="1.5" debug="true" includeantruntime="false">
+			<classpath>
+				<pathelement location="build/classes"/>
+				<pathelement location="${android.jar}"/>
+			</classpath>
+		</javac>
+	</target>
+	
+	<target name="compile" depends="init,compile-core,compile-android"/>
+	
+	<target name="dist-android" if="has.android.jar">
+		<jar jarfile="build/dist/java-websocket-client-android.jar">
+			<fileset dir="build/classes"/>
+			<fileset dir="build/android-classes"/>
+		</jar>
+	</target>
+	
+	<target name="dist" depends="compile,dist-android">
+		<jar jarfile="build/dist/java-websocket-client.jar" basedir="build/classes"/>
+	</target>
+</project>
+

src/net/rcode/wsclient/WebSocket.java

@@ -353,9 +353,8 @@ public synchronized void removeAllListeners() {
 	 * does nothing.  Otherwise, starts the processing thread.  Environment specific
 	 * subclasses will typically integrate with the native message loop to handle this
 	 * detail for you.
-	 * @throws InterruptedException 
 	 */
-	public void start() throws InterruptedException {
+	public void start() {
 		if (started) return;
 		started=true;
 		readerThread=new Thread("WebSocket read " + url) {