Merge pull request #1 from Kutashov/master

Some critical fixes

Author: codeestX

RxSocketClient/src/main/java/moe/codeest/rxsocketclient/SocketObservable.kt

@@ -44,16 +44,16 @@ class SocketObservable(val mConfig: SocketConfig, val mSocket: Socket) : Observa
         observerWrapper = SocketObserver(observer)
         observer?.onSubscribe(observerWrapper)
 
-        try {
-            Thread(Runnable {
-                mSocket.connect(InetSocketAddress(mConfig.mIp, mConfig.mPort?: 1080), mConfig.mTimeout?: 0)
+        Thread(Runnable {
+            try {
+                mSocket.connect(InetSocketAddress(mConfig.mIp, mConfig.mPort ?: 1080), mConfig.mTimeout ?: 0)
                 observer?.onNext(DataWrapper(SocketState.OPEN, ByteArray(0)))
                 mReadThread.start()
-            }).start()
-        } catch (e: IOException) {
-            println(e.toString())
-            observer?.onNext(DataWrapper(SocketState.CLOSE, ByteArray(0)))
-        }
+            } catch (e: IOException) {
+                println(e.toString())
+                observer?.onNext(DataWrapper(SocketState.CLOSE, ByteArray(0)))
+            }
+        }).start()
     }
 
     fun setHeartBeatRef(ref: Disposable) {
@@ -102,7 +102,7 @@ class SocketObservable(val mConfig: SocketConfig, val mSocket: Socket) : Observa
                         observerWrapper.onNext(buffer)
                     }
                 }
-            }catch (e: Exception) {
+            } catch (e: Exception) {
 
             }
         }

RxSocketClient/src/main/java/moe/codeest/rxsocketclient/post/AsyncPoster.kt

@@ -38,7 +38,7 @@ class AsyncPoster(private val mSocketClient: SocketClient, private val mExecutor
 
     override fun run() {
         val pendingPost = queue.poll() ?: throw IllegalStateException("No pending post available")
-        mSocketClient.mSocket.getOutputStream()?.apply {
+        mSocketClient.mSocket.takeIf { it.isConnected }?.getOutputStream()?.apply {
             try {
                 write(pendingPost.data)
                 flush()

app/src/main/java/moe/codeest/rxsocketclientdemo/JavaActivity.java

@@ -133,7 +133,9 @@ public void onClick(View v) {
 
             case R.id.btn_disconnect:
                 //disconnect
-                mClient.disconnect();
+                if (mClient.isConnecting()) {
+                    mClient.disconnect();
+                }
 
                 //or disconnect
 //                ref.dispose();