Fix loading

greenart7c3 · Oct 25, 2024 · b8d49c6 · b8d49c6
1 parent 49ac067
commit b8d49c6
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/app/src/main/java/com/greenart7c3/citrine/MainActivity.kt b/app/src/main/java/com/greenart7c3/citrine/MainActivity.kt
@@ -113,14 +113,15 @@ class MainActivity : ComponentActivity() {
 
     private suspend fun stop() {
         try {
-            isLoading.value = false // TODO: return this to true after finding where its getting the loading stuck forever
+            isLoading.value = true
             val intent = Intent(applicationContext, WebSocketServerService::class.java)
             stopService(intent)
             if (bound) unbindService(connection)
             bound = false
             service = null
             delay(2000)
         } catch (e: Exception) {
+            isLoading.value = false
             if (e is CancellationException) throw e
             Log.d(Citrine.TAG, e.message ?: "", e)
         } finally {
@@ -130,12 +131,13 @@ class MainActivity : ComponentActivity() {
 
     private suspend fun start() {
         try {
-            isLoading.value = false // TODO: return this to true after finding where its getting the loading stuck forever
+            isLoading.value = true
             val intent = Intent(applicationContext, WebSocketServerService::class.java)
             startService(intent)
             bindService(intent, connection, Context.BIND_AUTO_CREATE)
             delay(2000)
         } catch (e: Exception) {
+            isLoading.value = false
             if (e is CancellationException) throw e
             Log.d(Citrine.TAG, e.message ?: "", e)
         } finally {