Merge branch 'master' into refactor/secure-strings

Author: ovitrif

app/src/main/java/to/bitkit/ext/PaymentFailureReasonExt.kt

@@ -0,0 +1,17 @@
+package to.bitkit.ext
+
+import android.content.Context
+import org.lightningdevkit.ldknode.PaymentFailureReason
+import to.bitkit.R
+
+fun PaymentFailureReason?.toUserMessage(context: Context): String = when (this) {
+    PaymentFailureReason.RECIPIENT_REJECTED ->
+        context.getString(R.string.wallet__toast_payment_failed_recipient_rejected)
+    PaymentFailureReason.RETRIES_EXHAUSTED ->
+        context.getString(R.string.wallet__toast_payment_failed_retries_exhausted)
+    PaymentFailureReason.ROUTE_NOT_FOUND ->
+        context.getString(R.string.wallet__toast_payment_failed_route_not_found)
+    PaymentFailureReason.PAYMENT_EXPIRED ->
+        context.getString(R.string.wallet__toast_payment_failed_timeout)
+    else -> context.getString(R.string.wallet__toast_payment_failed_description)
+}

app/src/main/java/to/bitkit/fcm/WakeNodeWorker.kt

@@ -23,6 +23,7 @@ import to.bitkit.data.CacheStore
 import to.bitkit.data.SettingsStore
 import to.bitkit.di.json
 import to.bitkit.ext.amountOnClose
+import to.bitkit.ext.toUserMessage
 import to.bitkit.models.BITCOIN_SYMBOL
 import to.bitkit.models.BlocktankNotificationType
 import to.bitkit.models.BlocktankNotificationType.cjitPaymentArrived
@@ -153,7 +154,7 @@ class WakeNodeWorker @AssistedInject constructor(
             is Event.PaymentFailed -> {
                 bestAttemptContent = NotificationDetails(
                     title = appContext.getString(R.string.notification__payment_failed_title),
-                    body = "⚡ ${event.reason}",
+                    body = "⚡ ${event.reason.toUserMessage(appContext)}",
                 )
 
                 if (notificationType == wakeToTimeout) {

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

@@ -134,8 +134,8 @@ class BlocktankRepo @Inject constructor(
         }
     }
 
-    suspend fun refreshOrders() = withContext(bgDispatcher) {
-        if (isRefreshing) return@withContext
+    suspend fun refreshOrders(): Result<Unit> = withContext(bgDispatcher) {
+        if (isRefreshing) return@withContext Result.success(Unit)
         isRefreshing = true
 
         runCatching {
@@ -172,11 +172,9 @@ class BlocktankRepo @Inject constructor(
                 context = TAG
             )
             openChannelWithPaidOrders()
-        }.onFailure {
-            Logger.error("Failed to refresh orders", it, context = TAG)
+        }.also {
+            isRefreshing = false
         }
-
-        isRefreshing = false
     }
 
     suspend fun refreshMinCjitSats() = withContext(bgDispatcher) {
@@ -303,7 +301,7 @@ class BlocktankRepo @Inject constructor(
     ): Result<IBtOrder?> = withContext(bgDispatcher) {
         runCatching {
             if (refresh) {
-                refreshOrders()
+                refreshOrders().getOrThrow()
             }
             val order = _blocktankState.value.orders.find { it.id == orderId }
             return@runCatching order

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

@@ -31,6 +31,7 @@ import kotlinx.coroutines.withTimeoutOrNull
 import org.lightningdevkit.ldknode.Address
 import org.lightningdevkit.ldknode.BalanceDetails
 import org.lightningdevkit.ldknode.BestBlock
+import org.lightningdevkit.ldknode.Bolt11Invoice
 import org.lightningdevkit.ldknode.ChannelConfig
 import org.lightningdevkit.ldknode.ChannelDataMigration
 import org.lightningdevkit.ldknode.ChannelDetails
@@ -1040,6 +1041,23 @@ class LightningRepo @Inject constructor(
         }
     // endregion
 
+    // region probing
+    suspend fun sendProbeForInvoice(bolt11: String, amountSats: ULong? = null): Result<Unit> =
+        executeWhenNodeRunning("sendProbeForInvoice") {
+            runCatching {
+                val invoice = Bolt11Invoice.fromStr(bolt11)
+                if (amountSats != null) {
+                    val amountMsat = amountSats * 1000u
+                    lightningService.sendProbesUsingAmount(invoice, amountMsat)
+                } else {
+                    lightningService.sendProbes(invoice)
+                }
+            }.getOrElse {
+                Result.failure(it)
+            }
+        }
+    // endregion
+
     suspend fun restartNode(): Result<Unit> = withContext(bgDispatcher) {
         Logger.info("Restarting node", context = TAG)
         stop().onFailure {

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

@@ -598,6 +598,34 @@ class LightningService @Inject constructor(
     }
     // endregion
 
+    // region probing
+    suspend fun sendProbes(invoice: Bolt11Invoice): Result<Unit> {
+        val node = this.node ?: throw ServiceError.NodeNotSetup()
+
+        return ServiceQueue.LDK.background {
+            runCatching {
+                node.bolt11Payment().sendProbes(invoice, null)
+                Result.success(Unit)
+            }.getOrElse {
+                Result.failure(if (it is NodeException) LdkError(it) else it)
+            }
+        }
+    }
+
+    suspend fun sendProbesUsingAmount(invoice: Bolt11Invoice, amountMsat: ULong): Result<Unit> {
+        val node = this.node ?: throw ServiceError.NodeNotSetup()
+
+        return ServiceQueue.LDK.background {
+            runCatching {
+                node.bolt11Payment().sendProbesUsingAmount(invoice, amountMsat, null)
+                Result.success(Unit)
+            }.getOrElse {
+                Result.failure(if (it is NodeException) LdkError(it) else it)
+            }
+        }
+    }
+    // endregion
+
     // region utxo selection
     suspend fun listSpendableOutputs(): Result<List<SpendableUtxo>> {
         val node = this.node ?: throw ServiceError.NodeNotSetup()

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

@@ -69,6 +69,7 @@ import to.bitkit.ui.screens.scanner.SCAN_REQUEST_KEY
 import to.bitkit.ui.screens.settings.DevSettingsScreen
 import to.bitkit.ui.screens.settings.FeeSettingsScreen
 import to.bitkit.ui.screens.settings.LdkDebugScreen
+import to.bitkit.ui.screens.settings.ProbingToolScreen
 import to.bitkit.ui.screens.shop.ShopIntroScreen
 import to.bitkit.ui.screens.shop.shopDiscover.ShopDiscoverScreen
 import to.bitkit.ui.screens.shop.shopWebView.ShopWebViewScreen
@@ -890,6 +891,9 @@ private fun NavGraphBuilder.settings(
     composableWithDefaultTransitions<Routes.LdkDebug> {
         LdkDebugScreen(navController)
     }
+    composableWithDefaultTransitions<Routes.ProbingTool> {
+        ProbingToolScreen(navController)
+    }
     composableWithDefaultTransitions<Routes.FeeSettings> {
         FeeSettingsScreen(navController)
     }
@@ -1836,6 +1840,9 @@ sealed interface Routes {
     @Serializable
     data object LdkDebug : Routes
 
+    @Serializable
+    data object ProbingTool : Routes
+
     @Serializable
     data object FeeSettings : Routes
 

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

@@ -52,6 +52,7 @@ fun DevSettingsScreen(
             SettingsButtonRow("Fee Settings") { navController.navigate(Routes.FeeSettings) }
             SettingsButtonRow("Channel Orders") { navController.navigate(Routes.ChannelOrdersSettings) }
             SettingsButtonRow("LDK Debug") { navController.navigate(Routes.LdkDebug) }
+            SettingsButtonRow("Probing Tool") { navController.navigate(Routes.ProbingTool) }
 
             SectionHeader("LOGS")
             SettingsButtonRow("Logs") { navController.navigate(Routes.Logs) }