Close connection cleanly

app/src/main/java/de/kuschku/quasseldroid/service/QuasselService.kt

@@ -276,8 +276,10 @@ class QuasselService : DaggerLifecycleService(),
       .throttleFirst(1, TimeUnit.SECONDS)
       .toLiveData()
       .observe(this, Observer {
+        handlerService.backend {
           if (wasEverConnected && !sessionManager.hasErrored)
             sessionManager.reconnect(true)
+        }
       })
 
     sessionManager.state
@@ -287,12 +289,14 @@ class QuasselService : DaggerLifecycleService(),
       .toLiveData()
       .observe(
         this, Observer {
+        handlerService.backend {
           if (it == ConnectionState.DISCONNECTED || it == ConnectionState.CLOSED) {
             if (wasEverConnected && !sessionManager.hasErrored)
               sessionManager.reconnect()
           } else {
             wasEverConnected = true
           }
+        }
       })
 
     sharedPreferences(Keys.Status.NAME, Context.MODE_PRIVATE) {

lib/src/main/java/de/kuschku/libquassel/connection/CoreConnection.kt

@@ -127,10 +127,11 @@ class CoreConnection(
   override fun close() {
     try {
       setState(ConnectionState.CLOSED)
+      channel?.flush()
+      channel?.close()
       interrupt()
     } catch (e: Throwable) {
-      log(WARN,
-          TAG, "Error encountered while closing connection", e)
+      log(WARN, TAG, "Error encountered while closing connection", e)
     }
   }
 
@@ -200,14 +201,13 @@ class CoreConnection(
           }
         }
       }
+      channel?.close()
     } catch (e: QuasselSecurityException) {
       close()
       securityExceptionCallback(e)
     } catch (e: Throwable) {
-      log(WARN,
-          TAG, "Error encountered in connection", e)
-      log(WARN,
-          TAG, "Last sent message: ${MessageRunnable.lastSent.get()}")
+      log(WARN, TAG, "Error encountered in connection", e)
+      log(WARN, TAG, "Last sent message: ${MessageRunnable.lastSent.get()}")
       close()
     }
   }

lib/src/main/java/de/kuschku/libquassel/util/nio/WrappedChannel.kt

@@ -186,6 +186,7 @@ class WrappedChannel(
     rawIn = null
     rawOut?.close()
     rawOut = null
+    socket.close()
   }
 
   /**