Check if server is a non connected state before continuing

app/src/main/java/chat/rocket/android/service/RocketChatService.java

@@ -80,7 +80,7 @@ public class RocketChatService extends Service implements ConnectivityServiceInt
   @Override
   public Single<Boolean> disconnectFromServer(String hostname) { //called via binder.
     return Single.defer(() -> {
-      if (!threadCreatedForHostname(hostname)) {
+      if (!existsThreadForHostname(hostname)) {
         return Single.just(true);
       }
 
@@ -104,8 +104,8 @@ public class RocketChatService extends Service implements ConnectivityServiceInt
     return Single.defer(() -> {
       webSocketThreadLock.acquire();
       int connectivityState = ConnectivityManager.getInstance(getApplicationContext()).getConnectivityState(hostname);
-      boolean isConnected = connectivityState == ServerConnectivity.STATE_CONNECTED;
-      if (currentWebSocketThread != null && threadCreatedForHostname(hostname)) {
+      boolean isDisconnected = connectivityState != ServerConnectivity.STATE_CONNECTED;
+      if (currentWebSocketThread != null && existsThreadForHostname(hostname) && !isDisconnected) {
         webSocketThreadLock.release();
         return Single.just(currentWebSocketThread);
       }
@@ -114,6 +114,7 @@ public class RocketChatService extends Service implements ConnectivityServiceInt
 
       if (currentWebSocketThread != null) {
         return currentWebSocketThread.terminate()
+              .doAfterTerminate(() -> currentWebSocketThread = null)
               .doOnError(RCLog::e)
               .flatMap(terminated ->
                   RocketChatWebSocketThread.getStarted(getApplicationContext(), hostname)
@@ -144,7 +145,7 @@ public class RocketChatService extends Service implements ConnectivityServiceInt
     });
   }
 
-  private boolean threadCreatedForHostname(String hostname) {
+  private boolean existsThreadForHostname(String hostname) {
     if (hostname == null || currentWebSocketThread == null) {
       return false;
     }

app/src/main/java/chat/rocket/android/service/RocketChatWebSocketThread.java

@@ -320,10 +320,7 @@ public class RocketChatWebSocketThread extends HandlerThread {
                   error -> {
                     logErrorAndUnsubscribe(reconnectSubscription, error);
                     connectivityManager.notifyConnectionLost(hostname,
-                            DDPClient.REASON_CLOSED_BY_USER);
-                    if (isAlive()) {
-                      new Handler(getLooper()).post(this::unregisterListeners);
-                    }
+                            DDPClient.REASON_NETWORK_ERROR);
                   }
             )
     );