bluetooth: smoother checks (fixes #2090) (#2154)

Co-authored-by: dogi <dogi@users.noreply.github.com>
treehouses · Dec 3, 2024 · 0114f01 · 0114f01
1 parent 27b544c
commit 0114f01
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/app/src/main/kotlin/io/treehouses/remote/bases/FragmentViewModel.kt b/app/src/main/kotlin/io/treehouses/remote/bases/FragmentViewModel.kt
@@ -110,9 +110,14 @@ open class FragmentViewModel(application: Application) : AndroidViewModel(applic
      * Load the bluetooth service and update the handler and connection status
      */
     fun loadBT() {
-        mChatService = getApplication<MainApplication>().getCurrentBluetoothService()!!
-        mChatService.updateHandler(mHandler)
-        _connectionStatus.value = mChatService.state
+        val bluetoothService = getApplication<MainApplication>().getCurrentBluetoothService()
+        if (bluetoothService != null) {
+            mChatService = bluetoothService
+            mChatService.updateHandler(mHandler)
+            _connectionStatus.value = mChatService.state
+        } else {
+            _connectionStatus.value = Constants.STATE_NONE
+        }
     }
 
     /**