From 0feb395e8d4b9a469db07ee0ac06541abd89dd33 Mon Sep 17 00:00:00 2001
From: Janne Koschinski <janne@kuschku.de>
Date: Sun, 24 Sep 2017 22:07:11 +0200
Subject: [PATCH] Maybe fixed a bug on some devices

---
 .../main/java/de/kuschku/quasseldroid_ng/ui/MainActivity.kt | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/MainActivity.kt b/app/src/main/java/de/kuschku/quasseldroid_ng/ui/MainActivity.kt
index 4595cd766..5af0e5171 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/MainActivity.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid_ng/ui/MainActivity.kt
@@ -104,12 +104,14 @@ class MainActivity : ServiceBoundActivity() {
     }
 
     state.observe(this, Observer {
-      val disconnected = it == ConnectionState.DISCONNECTED
+      val status = it ?: ConnectionState.DISCONNECTED
+      val disconnected = status == ConnectionState.DISCONNECTED
+
       disconnect.isEnabled = !disconnected
       connect.isEnabled = disconnected
 
       snackbar?.dismiss()
-      snackbar = Snackbar.make(errorList, it!!.name, Snackbar.LENGTH_SHORT)
+      snackbar = Snackbar.make(errorList, status.name, Snackbar.LENGTH_SHORT)
       snackbar?.show()
     })
   }
-- 
GitLab