Little fixes in WebSocket's

Change-Id: If71f5dd814fa08240b43981b3265f4b25c8a9e23

Author: jacek-marchwicki

AndroidSocketIO/build.gradle

@@ -29,7 +29,7 @@ dependencies {
     androidTestCompile fileTree(dir: 'src/androidTest/libs', include: '*.jar')
 }
 
-def baseVersionName = "1.1.1"
+def baseVersionName = "1.1.2"
 if (project.hasProperty("versionSuffix")) {
     project.ext.versionSuffix = project.versionSuffix
 } else {

AndroidSocketIO/src/main/java/com/appunite/websocket/WebSocketListener.java

@@ -34,7 +34,7 @@ public interface WebSocketListener {
 	 * @throws InterruptedException
 	 * @throws NotConnectedException
 	 */
-	void onConnected() throws IOException, InterruptedException,
+	public void onConnected() throws IOException, InterruptedException,
 			NotConnectedException;
 
 	/**
@@ -44,7 +44,7 @@ void onConnected() throws IOException, InterruptedException,
 	 * @throws InterruptedException
 	 * @throws NotConnectedException
 	 */
-	void onStringMessage(String message) throws IOException,
+    public void onStringMessage(String message) throws IOException,
 			InterruptedException, NotConnectedException;
 
 	/**
@@ -54,7 +54,7 @@ void onStringMessage(String message) throws IOException,
 	 * @throws InterruptedException
 	 * @throws NotConnectedException
 	 */
-	void onBinaryMessage(byte[] data) throws IOException,
+    public void onBinaryMessage(byte[] data) throws IOException,
 			InterruptedException, NotConnectedException;
 
 	/**
@@ -64,7 +64,7 @@ void onBinaryMessage(byte[] data) throws IOException,
 	 * @throws InterruptedException
 	 * @throws NotConnectedException
 	 */
-	void onPing(byte[] data) throws IOException, InterruptedException,
+    public void onPing(byte[] data) throws IOException, InterruptedException,
 			NotConnectedException;
 
 	/**
@@ -74,7 +74,7 @@ void onPing(byte[] data) throws IOException, InterruptedException,
 	 * @throws InterruptedException
 	 * @throws NotConnectedException
 	 */
-	void onPong(byte[] data) throws IOException, InterruptedException,
+    public void onPong(byte[] data) throws IOException, InterruptedException,
 			NotConnectedException;
 
 	/**
@@ -84,7 +84,7 @@ void onPong(byte[] data) throws IOException, InterruptedException,
 	 * @throws InterruptedException
 	 * @throws NotConnectedException
 	 */
-	void onServerRequestedClose(byte[] data) throws IOException,
+    public void onServerRequestedClose(byte[] data) throws IOException,
 			InterruptedException, NotConnectedException;
 
 	/**
@@ -94,7 +94,7 @@ void onServerRequestedClose(byte[] data) throws IOException,
 	 * @throws InterruptedException
 	 * @throws NotConnectedException
 	 */
-	void onUnknownMessage(byte[] data) throws IOException,
+    public void onUnknownMessage(byte[] data) throws IOException,
 			InterruptedException, NotConnectedException;
 
 }

AndroidSocketIO/src/main/java/com/appunite/websocket/WebSocketReader.java

@@ -17,6 +17,7 @@
 package com.appunite.websocket;
 
 import java.io.DataInputStream;
+import java.io.EOFException;
 import java.io.IOException;
 import java.io.InputStream;
 
@@ -33,11 +34,10 @@ public WebSocketReader(InputStream inputStream) {
 		this.mInputStream = new DataInputStream(inputStream);
 	}
 
-	public int readByteOrThrow() throws IOException, WrongWebsocketResponse {
+	public int readByteOrThrow() throws IOException {
 		int read = mInputStream.read();
 		if (read == -1) {
-			// Maybe we should return ConnectionClosed
-			throw new WrongWebsocketResponse("Socket closed");
+			throw new EOFException("Socket closed");
 		}
 		return read;
 	}