Merge pull request #478 from synonymdev/fix/foreground-server-starting

fix: LightningNodeService startup

Author: ovitrif

app/src/main/java/to/bitkit/ui/ContentView.kt

@@ -186,16 +186,21 @@ fun ContentView(
     val context = LocalContext.current
     val lifecycle = LocalLifecycleOwner.current.lifecycle
 
+    val walletUiState by walletViewModel.walletState.collectAsStateWithLifecycle()
+    val lightningState by walletViewModel.lightningState.collectAsStateWithLifecycle()
+    val nodeLifecycleState = lightningState.nodeLifecycleState
+
+    val isRecoveryMode by walletViewModel.isRecoveryMode.collectAsStateWithLifecycle()
+    val notificationsGranted by settingsViewModel.notificationsGranted.collectAsStateWithLifecycle()
+    val walletExists = walletUiState.walletExists
+
     // Effects on app entering fg (ON_START) / bg (ON_STOP)
     DisposableEffect(lifecycle) {
-        // TODO ADAPT THIS LOGIC TO WORK WITH LightningNodeService
         val observer = LifecycleEventObserver { _, event ->
             when (event) {
                 Lifecycle.Event.ON_START -> {
-                    try {
+                    if (walletExists && !isRecoveryMode) {
                         walletViewModel.start()
-                    } catch (e: Throwable) {
-                        Logger.error("Failed to start wallet", e)
                     }
 
                     val pendingTransaction = NewTransactionSheetDetails.load(context)
@@ -208,6 +213,14 @@ fun ContentView(
                     blocktankViewModel.refreshOrders()
                 }
 
+                Lifecycle.Event.ON_STOP -> {
+                    if (walletExists && !isRecoveryMode && !notificationsGranted) {
+                        // App backgrounded without notification permission - stop node
+                        walletViewModel.stop()
+                    }
+                    // If notificationsGranted=true, service keeps node running
+                }
+
                 else -> Unit
             }
         }
@@ -242,9 +255,6 @@ fun ContentView(
         }
     }
 
-    val walletUiState by walletViewModel.uiState.collectAsStateWithLifecycle()
-    val nodeLifecycleState = walletUiState.nodeLifecycleState
-
     var walletIsInitializing by remember { mutableStateOf(nodeLifecycleState == NodeLifecycleState.Initializing) }
     var walletInitShouldFinish by remember { mutableStateOf(false) }
 

app/src/main/java/to/bitkit/ui/MainActivity.kt

@@ -25,6 +25,7 @@ import androidx.navigation.compose.rememberNavController
 import androidx.navigation.toRoute
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.launch
 import kotlinx.serialization.Serializable
 import to.bitkit.androidServices.LightningNodeService
@@ -45,6 +46,7 @@ import to.bitkit.ui.sheets.NewTransactionSheet
 import to.bitkit.ui.theme.AppThemeSurface
 import to.bitkit.ui.utils.composableWithDefaultTransitions
 import to.bitkit.ui.utils.enableAppEdgeToEdge
+import to.bitkit.utils.Logger
 import to.bitkit.viewmodels.ActivityListViewModel
 import to.bitkit.viewmodels.AppViewModel
 import to.bitkit.viewmodels.BackupsViewModel
@@ -78,7 +80,7 @@ class MainActivity : FragmentActivity() {
             importance = NotificationManager.IMPORTANCE_LOW
         )
         appViewModel.handleDeeplinkIntent(intent)
-        startForegroundService(Intent(this, LightningNodeService::class.java))
+
         installSplashScreen()
         enableAppEdgeToEdge()
         setContent {
@@ -89,6 +91,21 @@ class MainActivity : FragmentActivity() {
             ) {
                 val scope = rememberCoroutineScope()
                 val isRecoveryMode by walletViewModel.isRecoveryMode.collectAsStateWithLifecycle()
+                val notificationsGranted by settingsViewModel.notificationsGranted.collectAsStateWithLifecycle()
+                val walletExists by walletViewModel.walletState
+                    .map { it.walletExists }
+                    .collectAsStateWithLifecycle(initialValue = walletViewModel.walletExists)
+
+                LaunchedEffect(
+                    walletExists,
+                    isRecoveryMode,
+                    notificationsGranted
+                ) {
+                    if (walletExists && !isRecoveryMode && notificationsGranted) {
+                        tryStartForegroundService()
+                    }
+                }
+
                 if (!walletViewModel.walletExists && !isRecoveryMode) {
                     OnboardingNav(
                         startupNavController = rememberNavController(),
@@ -170,6 +187,27 @@ class MainActivity : FragmentActivity() {
         setIntent(intent)
         appViewModel.handleDeeplinkIntent(intent)
     }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        if (!settingsViewModel.notificationsGranted.value) {
+            runCatching {
+                stopService(Intent(this, LightningNodeService::class.java))
+            }
+        }
+    }
+
+    /**
+     * Attempts to start the LightningNodeService if it's not already running.
+     */
+    private fun tryStartForegroundService() {
+        runCatching {
+            Logger.debug("Attempting to start LightningNodeService", context = "MainActivity")
+            startForegroundService(Intent(this, LightningNodeService::class.java))
+        }.onFailure { error ->
+            Logger.error("Failed to start LightningNodeService", error, context = "MainActivity")
+        }
+    }
 }
 
 @Composable

app/src/main/java/to/bitkit/viewmodels/WalletViewModel.kt

@@ -153,6 +153,18 @@ class WalletViewModel @Inject constructor(
         }
     }
 
+    fun stop() {
+        if (!walletExists) return
+
+        viewModelScope.launch(bgDispatcher) {
+            lightningRepo.stop()
+                .onFailure { error ->
+                    Logger.error("Node stop error", error)
+                    ToastEventBus.send(error)
+                }
+        }
+    }
+
     suspend fun observeLdkWallet() {
         walletRepo.observeLdkWallet()
     }