Error handling galore

app/src/main/java/net/pipe01/pinepartner/MainActivity.kt

@@ -1,79 +1,101 @@
 package net.pipe01.pinepartner
 
 import android.annotation.SuppressLint
-import android.content.ComponentName
-import android.content.Intent
-import android.content.ServiceConnection
 import android.os.Bundle
-import android.os.IBinder
-import android.util.Log
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.Scaffold
+import androidx.compose.material3.SnackbarDuration
+import androidx.compose.material3.SnackbarHost
+import androidx.compose.material3.SnackbarHostState
+import androidx.compose.material3.SnackbarResult
 import androidx.compose.runtime.DisposableEffect
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.navigation.compose.rememberNavController
 import net.pipe01.pinepartner.data.AppDatabase
+import net.pipe01.pinepartner.pages.ConnectingServicePage
 import net.pipe01.pinepartner.scripting.BuiltInPlugins
-import net.pipe01.pinepartner.service.BackgroundService
+import net.pipe01.pinepartner.service.ServiceHandle
 import net.pipe01.pinepartner.ui.theme.PinePartnerTheme
+import net.pipe01.pinepartner.utils.composables.PluginsDisabledDialog
 
 @SuppressLint("MissingPermission")
 class MainActivity : ComponentActivity() {
+    private val serviceHandle = ServiceHandle(this)
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
         val db = AppDatabase.create(applicationContext)
 
         BuiltInPlugins.init(assets)
 
-        val intent = Intent(this, BackgroundService::class.java)
-
         setContent {
             val navController = rememberNavController()
+            val snackbarHostState = remember { SnackbarHostState() }
 
-            var service by remember { mutableStateOf<BackgroundService?>(null) }
             var showBottomBar by remember { mutableStateOf(false) }
 
             DisposableEffect(Unit) {
-                val conn = object : ServiceConnection {
-                    override fun onServiceConnected(name: ComponentName?, binder: IBinder?) {
-                        service = (binder as BackgroundService.ServiceBinder).service
-                    }
-
-                    override fun onServiceDisconnected(name: ComponentName?) {
-                        Log.d("MainActivity", "Service disconnected")
-                    }
-                }
-
-                bindService(intent, conn, 0)
+                serviceHandle.start()
 
                 onDispose {
-                    unbindService(conn)
+                    serviceHandle.unbind()
                 }
             }
 
             PinePartnerTheme {
-                Scaffold(
-                    bottomBar = {
-                        if (showBottomBar) {
-                            BottomBar(navController = navController)
+                if (serviceHandle.service == null) {
+                    ConnectingServicePage(crashed = serviceHandle.hasCrashed)
+                } else {
+                    var showPluginsDisabledDialog by remember { mutableStateOf(false) }
+
+                    if (serviceHandle.pluginsDisabled) {
+                        LaunchedEffect(Unit) {
+                            val result = snackbarHostState.showSnackbar(
+                                message = "Plugins have been disabled",
+                                duration = SnackbarDuration.Long,
+                                actionLabel = "Why?",
+                            )
+                            when (result) {
+                                SnackbarResult.ActionPerformed -> {
+                                    showPluginsDisabledDialog = true
+                                }
+                                SnackbarResult.Dismissed -> {
+                                }
+                            }
                         }
                     }
-                ) { padding ->
-                    PermissionsFrame(
-                        onGotAllPermissions = { showBottomBar = true },
-                    ) {
-                        if (service != null) {
+
+                    if (showPluginsDisabledDialog) {
+                        PluginsDisabledDialog(
+                            onDismissRequest = { showPluginsDisabledDialog = false }
+                        )
+                    }
+
+                    Scaffold(
+                        snackbarHost = {
+                            SnackbarHost(hostState = snackbarHostState)
+                        },
+                        bottomBar = {
+                            if (showBottomBar) {
+                                BottomBar(navController = navController)
+                            }
+                        }
+                    ) { padding ->
+                        PermissionsFrame(
+                            onGotAllPermissions = { showBottomBar = true },
+                        ) {
                             NavFrame(
                                 modifier = Modifier.padding(padding),
                                 navController = navController,
-                                backgroundService = service!!,
+                                backgroundService = serviceHandle.service!!,
                                 onShowBottomBar = { showBottomBar = it },
                                 db = db,
                             )
@@ -87,7 +109,6 @@ class MainActivity : ComponentActivity() {
     override fun onResume() {
         super.onResume()
 
-        val intent = Intent(this, BackgroundService::class.java)
-        startForegroundService(intent)
+        serviceHandle.start()
     }
 }

app/src/main/java/net/pipe01/pinepartner/NavFrame.kt

@@ -51,6 +51,7 @@ import net.pipe01.pinepartner.pages.plugins.PluginsPage
 import net.pipe01.pinepartner.pages.settings.NotificationSettingsPage
 import net.pipe01.pinepartner.pages.settings.SettingsPage
 import net.pipe01.pinepartner.service.BackgroundService
+import net.pipe01.pinepartner.utils.PineError
 import net.pipe01.pinepartner.utils.composables.ErrorDialog
 import java.net.URLDecoder
 import java.net.URLEncoder
@@ -132,7 +133,7 @@ fun NavFrame(
     onShowBottomBar: (Boolean) -> Unit,
     modifier: Modifier = Modifier,
 ) {
-    val errors = remember { mutableStateListOf<Error>() }
+    val errors = remember { mutableStateListOf<PineError>() }
 
     if (errors.isNotEmpty()) {
         val error = errors.first()

app/src/main/java/net/pipe01/pinepartner/pages/ConnectingServicePage.kt

@@ -0,0 +1,41 @@
+package net.pipe01.pinepartner.pages
+
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+
+@Composable
+fun ConnectingServicePage(crashed: Boolean) {
+    Column(
+        modifier = Modifier.fillMaxWidth(),
+        horizontalAlignment = Alignment.CenterHorizontally,
+    ) {
+        Spacer(modifier = Modifier.weight(1f))
+
+        CircularProgressIndicator()
+
+        Text(
+            modifier = Modifier.padding(top = 16.dp),
+            text = when (crashed) {
+                true -> "Background service crashed, restarting it"
+                false -> "Connecting to service"
+            }
+        )
+
+        Spacer(modifier = Modifier.weight(1f))
+    }
+}
+
+@Preview(showBackground = true, widthDp = 360, heightDp = 640)
+@Composable
+private fun ConnectingServicePagePreview() {
+    ConnectingServicePage(false)
+}

app/src/main/java/net/pipe01/pinepartner/pages/devices/DFUPage.kt

@@ -28,6 +28,7 @@ import kotlinx.coroutines.runBlocking
 import net.pipe01.pinepartner.components.Header
 import net.pipe01.pinepartner.service.BackgroundService
 import net.pipe01.pinepartner.service.TransferProgress
+import net.pipe01.pinepartner.utils.PineError
 import net.pipe01.pinepartner.utils.composables.ErrorDialog
 import net.pipe01.pinepartner.utils.toMinutesSeconds
 import java.time.Duration
@@ -43,7 +44,7 @@ fun DFUPage(
 ) {
     var uri by remember { mutableStateOf<Uri?>(null) }
 
-    var showErrorDialog by remember { mutableStateOf<Error?>(null) }
+    var showErrorDialog by remember { mutableStateOf<PineError?>(null) }
 
     if (showErrorDialog != null) {
         ErrorDialog(
@@ -105,7 +106,7 @@ private fun Uploader(
     onStart: () -> Unit = { },
     onFinish: () -> Unit = { },
     onCancel: () -> Unit = { },
-    onError: (Error) -> Unit = { },
+    onError: (PineError) -> Unit = { },
 ) {
     var progress by remember { mutableStateOf<TransferProgress?>(null) }
 
@@ -119,7 +120,7 @@ private fun Uploader(
 
             launch {
                 backgroundService.startWatchDFU(jobId, address, uri).onFailure {
-                    onError(Error("Failed to do DFU transfer", it))
+                    onError(PineError("Failed to do DFU transfer", it))
                 }
             }
 

app/src/main/java/net/pipe01/pinepartner/pages/devices/DevicePage.kt

@@ -26,6 +26,7 @@ import net.pipe01.pinepartner.data.AppDatabase
 import net.pipe01.pinepartner.data.Watch
 import net.pipe01.pinepartner.devices.WatchState
 import net.pipe01.pinepartner.service.BackgroundService
+import net.pipe01.pinepartner.utils.PineError
 
 @SuppressLint("MissingPermission")
 @Composable
@@ -35,7 +36,7 @@ fun DevicePage(
     backgroundService: BackgroundService,
     onUploadFirmware: () -> Unit,
     onBrowseFiles: () -> Unit,
-    onError: (Error) -> Unit,
+    onError: (PineError) -> Unit,
 ) {
     val coroutineScope = rememberCoroutineScope()
 
@@ -50,12 +51,12 @@ fun DevicePage(
             }
 
             backgroundService.connectWatch(deviceAddress).onFailure {
-                onError(Error("Failed to connect to watch", it))
+                onError(PineError("Failed to connect to watch", it))
                 return@launch
             }
 
             state = backgroundService.getWatchState(deviceAddress).onFailure {
-                onError(Error("Failed to get watch state", it))
+                onError(PineError("Failed to get watch state", it))
             }.getOrNull()
         }
     }
@@ -80,7 +81,7 @@ fun DevicePage(
             Button(onClick = {
                 coroutineScope.launch {
                     backgroundService.sendTestNotification().onFailure {
-                        onError(Error("Failed to send test notification", it))
+                        onError(PineError("Failed to send test notification", it))
                     }
                 }
             }) {

app/src/main/java/net/pipe01/pinepartner/pages/devices/DevicesPage.kt

@@ -38,13 +38,15 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
+import net.pipe01.pinepartner.BuildConfig
 import net.pipe01.pinepartner.components.Header
 import net.pipe01.pinepartner.components.LoadingStandIn
 import net.pipe01.pinepartner.data.AppDatabase
 import net.pipe01.pinepartner.data.Watch
 import net.pipe01.pinepartner.devices.Device
 import net.pipe01.pinepartner.devices.WatchState
 import net.pipe01.pinepartner.service.BackgroundService
+import net.pipe01.pinepartner.utils.PineError
 import net.pipe01.pinepartner.utils.composables.BoxWithFAB
 
 
@@ -54,7 +56,7 @@ fun DevicesPage(
     backgroundService: BackgroundService,
     onAddDevice: () -> Unit,
     onDeviceClick: (address: String) -> Unit,
-    onError: (Error) -> Unit,
+    onError: (PineError) -> Unit,
 ) {
     val coroutineScope = rememberCoroutineScope()
 
@@ -114,6 +116,17 @@ fun DevicesPage(
                         )
                     }
                 }
+
+                if (BuildConfig.DEBUG) {
+                    Button(onClick = {
+                        CoroutineScope(Dispatchers.IO).launch {
+                            backgroundService.crash()
+                            Log.d("DevicesPage", "Crashed the service")
+                        }
+                    }) {
+                        Text(text = "Crash")
+                    }
+                }
             }
         }
     }
@@ -127,7 +140,7 @@ private fun DeviceItem(
     backgroundService: BackgroundService,
     onClick: () -> Unit,
     onRemoveDevice: () -> Unit,
-    onError: (Error) -> Unit,
+    onError: (PineError) -> Unit,
 ) {
     val haptics = LocalHapticFeedback.current
 
@@ -139,7 +152,7 @@ private fun DeviceItem(
         withContext(Dispatchers.Main) {
             while (true) {
                 state = backgroundService.getWatchState(watch.address).onFailure {
-                    onError(Error("Failed to get watch state", it))
+                    onError(PineError("Failed to get watch state", it))
                 }.getOrNull()
 
                 delay(1000)
@@ -213,7 +226,7 @@ private fun DeviceItem(
             Button(onClick = {
                 coroutineScope.launch {
                     backgroundService.disconnectWatch(watch.address).onFailure {
-                        onError(Error("Failed to disconnect watch", it))
+                        onError(PineError("Failed to disconnect watch", it))
                     }
                 }