chore: review

Author: ovitrif

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

@@ -339,7 +339,7 @@ class LightningService @Inject constructor(
         val node = this.node ?: throw ServiceError.NodeNotSetup
 
         return ServiceQueue.LDK.background {
-            runCatching {
+            try {
                 val pushToCounterpartyMsat = pushToCounterpartySats?.let { it * 1000u }
                 Logger.debug("Initiating channel open (sats: $channelAmountSats) with peer: ${peer.uri}")
 
@@ -361,11 +361,11 @@ class LightningService @Inject constructor(
 
                 Logger.info("Channel open initiated, result: $result")
 
-                result
-            }.onFailure { e ->
-                val error = if (e is NodeException) LdkError(e) else e
+                Result.success(result)
+            } catch (e: NodeException) {
+                val error = LdkError(e)
                 Logger.error("Error initiating channel open", error)
-                error
+                Result.failure(error)
             }
         }
     }

app/src/main/java/to/bitkit/ui/screens/wallets/activity/components/ActivityListSimple.kt

@@ -4,7 +4,6 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.wrapContentWidth
-import androidx.compose.material3.HorizontalDivider
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier

app/src/main/java/to/bitkit/utils/Logger.kt

@@ -248,10 +248,10 @@ private fun buildSessionLogFilePath(source: LogSource): String {
     return sessionLogFilePath
 }
 
-private fun formatLog(level: LogLevel, msg: String?, tag: String, path: String, line: Int): String {
+private fun formatLog(level: LogLevel, msg: String?, context: String, path: String, line: Int): String {
     val timestamp = utcDateFormatterOf(DatePattern.LOG_LINE).format(Date())
     val message = msg?.trim().orEmpty()
-    val context = if (tag.isNotEmpty()) " - $tag" else ""
+    val contextString = if (context.isNotEmpty()) " - $context" else ""
     return String.format(
         Locale.US,
         "%s %-7s [%s:%d] %s%s",
@@ -260,10 +260,24 @@ private fun formatLog(level: LogLevel, msg: String?, tag: String, path: String,
         path,
         line,
         message,
-        context,
+        contextString,
     )
 }
 
+/**
+ * Determines which stack frame to use for caller info.
+ *
+ * The value 5 is chosen based on the current call chain:
+ * - [0] `Thread.getStackTrace`
+ * - [1] `getCallerPath`/`getCallerLine`
+ * - [2] `LoggerImpl.log_method` (e.g., debug, info, etc.)
+ * - [3] `LdkLogWriter.log_method`
+ * - [4] external caller
+ * - [5] actual caller of logging function
+ *
+ * If the call chain changes, this index may need to be updated.
+ */
+
 private const val STACK_INDEX = 5
 private fun getCallerPath(): String = Thread.currentThread().stackTrace.getOrNull(STACK_INDEX)?.fileName ?: "Unknown"
 private fun getCallerLine(): Int = Thread.currentThread().stackTrace.getOrNull(STACK_INDEX)?.lineNumber ?: -1