chore: review

Author: ovitrif

app/src/main/java/to/bitkit/App.kt

@@ -36,11 +36,14 @@ internal open class App : Application(), Configuration.Provider {
 class CurrentActivity : ActivityLifecycleCallbacks {
     var value: Activity? = null
         private set
+
     override fun onActivityCreated(activity: Activity, bundle: Bundle?) = Unit
     override fun onActivityStarted(activity: Activity) = run { this.value = activity }
     override fun onActivityResumed(activity: Activity) = run { this.value = activity }
-    override fun onActivityPaused(activity: Activity) = run { if (this.value == activity) this.value = null }
-    override fun onActivityStopped(activity: Activity) = run { if (this.value == activity) this.value = null }
+    override fun onActivityPaused(activity: Activity) = clearIfCurrent(activity)
+    override fun onActivityStopped(activity: Activity) = clearIfCurrent(activity)
     override fun onActivitySaveInstanceState(activity: Activity, bundle: Bundle) = Unit
-    override fun onActivityDestroyed(activity: Activity) = run { if (this.value == activity) this.value = null }
+    override fun onActivityDestroyed(activity: Activity) = clearIfCurrent(activity)
+
+    private fun clearIfCurrent(activity: Activity) = run { if (this.value == activity) this.value = null }
 }

app/src/main/java/to/bitkit/repositories/LightningRepo.kt

@@ -278,7 +278,7 @@ class LightningRepo @Inject constructor(
 
     private suspend fun onEvent(event: Event) {
         handleLdkEvent(event)
-        _eventHandlers.forEach { it.invoke(event) }
+        _eventHandlers.toList().forEach { it.invoke(event) }
         _nodeEvents.emit(event)
     }
 

app/src/main/java/to/bitkit/services/LightningService.kt

@@ -101,6 +101,8 @@ class LightningService @Inject constructor(
 
         trustedPeers?.takeIf { it.isNotEmpty() }?.let {
             this.trustedPeers = it
+        } ?: run {
+            Logger.info("Using fallback trusted peers from Env (${Env.trustedLnPeers.size})", context = TAG)
         }
         val trustedPeerNodeIds = this.trustedPeers.map { it.nodeId }
 

app/src/main/java/to/bitkit/ui/screens/settings/LdkDebugScreen.kt

@@ -41,6 +41,7 @@ import to.bitkit.ui.components.TextInput
 import to.bitkit.ui.components.settings.SectionFooter
 import to.bitkit.ui.components.settings.SectionHeader
 import to.bitkit.ui.components.settings.SettingsTextButtonRow
+import to.bitkit.ui.scaffold.AppAlertDialog
 import to.bitkit.ui.scaffold.AppTopBar
 import to.bitkit.ui.scaffold.DrawerNavIcon
 import to.bitkit.ui.scaffold.ScreenColumn
@@ -88,6 +89,7 @@ private fun LdkDebugContent(
     onRestartNode: () -> Unit,
 ) {
     val context = LocalContext.current
+    var showDeleteAllConfirmation by remember { mutableStateOf(false) }
 
     ScreenColumn {
         AppTopBar(
@@ -202,8 +204,8 @@ private fun LdkDebugContent(
             SettingsTextButtonRow(
                 title = "Delete All",
                 iconRes = R.drawable.ic_trash,
-                enabled = !uiState.isLoading,
-                onClick = onDeleteAllVssKeys,
+                enabled = !uiState.isLoading && uiState.vssKeys.isNotEmpty(),
+                onClick = { showDeleteAllConfirmation = true },
             )
 
             SectionHeader("NODE")
@@ -217,6 +219,19 @@ private fun LdkDebugContent(
             Spacer(modifier = Modifier.height(32.dp))
         }
     }
+
+    if (showDeleteAllConfirmation) {
+        AppAlertDialog(
+            title = "Delete All VSS Keys?",
+            text = "This will permanently delete all ${uiState.vssKeys.size} VSS key(s). This action cannot be undone.",
+            confirmText = "Delete All",
+            onConfirm = {
+                showDeleteAllConfirmation = false
+                onDeleteAllVssKeys()
+            },
+            onDismiss = { showDeleteAllConfirmation = false },
+        )
+    }
 }
 
 private const val MAX_VSS_KEYS_DISPLAY = 10