Merge pull request #289 from synonymdev/feat/update-core-lnurl

Update bitkit-core and use its new lnurl apis

Author: ovitrif

app/detekt-baseline.xml

@@ -4,6 +4,7 @@ import com.google.firebase.messaging.FirebaseMessaging
 import com.synonym.bitkitcore.FeeRates
 import com.synonym.bitkitcore.LightningInvoice
 import com.synonym.bitkitcore.Scanner
+import com.synonym.bitkitcore.createChannelRequestUrl
 import com.synonym.bitkitcore.createWithdrawCallbackUrl
 import com.synonym.bitkitcore.decode
 import com.synonym.bitkitcore.lnurlAuth
@@ -447,8 +448,14 @@ class LightningRepo @Inject constructor(
         callback: String,
         nodeId: String,
     ): Result<LnurlChannelResponse> = executeWhenNodeRunning("requestLnurlChannel") {
-        // TODO use bitkit-core createChannelRequestUrl after it is fixed to prevent k1 duplicating
-        lnurlService.requestLnurlChannel(k1 = k1, callback = callback, nodeId = nodeId)
+        val url = createChannelRequestUrl(
+            k1 = k1,
+            callback = callback,
+            localNodeId = nodeId,
+            isPrivate = true,
+            cancel = false,
+        )
+        lnurlService.requestLnurlChannel(url)
     }
 
     suspend fun requestLnurlAuth(

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

@@ -77,19 +77,11 @@ class LnurlService @Inject constructor(
     }
 
     suspend fun requestLnurlChannel(
-        k1: String,
-        callback: String,
-        nodeId: String,
+        url: String,
     ): Result<LnurlChannelResponse> = runCatching {
-        Logger.debug("Requesting LNURL channel request via: '$callback'")
+        Logger.debug("Requesting LNURL channel request via: '$url'")
 
-        val response = client.get(callback) {
-            url {
-                parameters["k1"] = k1
-                parameters["remoteid"] = nodeId
-                parameters["private"] = "1" // Private channel
-            }
-        }
+        val response: HttpResponse = client.get(url)
         Logger.debug("Http call: $response")
 
         if (!response.status.isSuccess()) throw Exception("HTTP error: ${response.status}")

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

@@ -137,6 +137,7 @@ import to.bitkit.ui.sheets.BackupSheet
 import to.bitkit.ui.sheets.LnurlAuthSheet
 import to.bitkit.ui.sheets.PinSheet
 import to.bitkit.ui.sheets.SendSheet
+import to.bitkit.ui.theme.TRANSITION_SHEET_MS
 import to.bitkit.ui.utils.AutoReadClipboardHandler
 import to.bitkit.ui.utils.composableWithDefaultTransitions
 import to.bitkit.ui.utils.screenSlideIn
@@ -961,7 +962,7 @@ private fun NavGraphBuilder.qrScanner(
         QrScanningScreen(navController = navController) { qrCode ->
             appViewModel.onScanResult(
                 data = qrCode,
-                delayMs = 650 // slight delay for nav transition before showing send sheet
+                delayMs = TRANSITION_SHEET_MS,
             )
         }
     }

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

@@ -127,6 +127,7 @@ object AppSwitchDefaults {
 }
 
 val ScreenTransitionMs = AnimationConstants.DefaultDurationMillis.milliseconds // 300ms
+const val TRANSITION_SHEET_MS = 650L
 
 object Insets {
     val Top: Dp

app/src/main/java/to/bitkit/ui/theme/Defaults.kt

@@ -5,7 +5,6 @@ import androidx.annotation.StringRes
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
-import androidx.core.net.toUri
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.synonym.bitkitcore.ActivityFilter
@@ -83,6 +82,7 @@ import to.bitkit.ui.Routes
 import to.bitkit.ui.components.Sheet
 import to.bitkit.ui.shared.toast.ToastEventBus
 import to.bitkit.ui.sheets.SendRoute
+import to.bitkit.ui.theme.ScreenTransitionMs
 import to.bitkit.utils.Logger
 import java.math.BigDecimal
 import javax.inject.Inject
@@ -378,6 +378,7 @@ class AppViewModel @Inject constructor(
                     val newSatsPerVByte = state.feeRates?.getSatsPerVByteFor(speed)
                     currentSatsPerVByte != newSatsPerVByte
                 }
+
                 else -> false
             }
             val fee = when (speed is TransactionSpeed.Custom) {
@@ -695,17 +696,17 @@ class AppViewModel @Inject constructor(
         }
     }
 
-    private fun onScanLnurlAuth(data: LnurlAuthData, lnurl: String) {
+    private suspend fun onScanLnurlAuth(data: LnurlAuthData, lnurl: String) {
         Logger.debug("LNURL: $data", context = TAG)
-
-        val domain = runCatching { data.uri.toUri().host }.getOrDefault(data.uri).orEmpty().trim()
-
-        showSheet(Sheet.LnurlAuth(domain = domain, lnurl = lnurl, k1 = data.k1))
+        if (!isMainScanner) {
+            hideSheet()
+            delay(ScreenTransitionMs)
+        }
+        showSheet(Sheet.LnurlAuth(domain = data.domain, lnurl = lnurl, k1 = data.k1))
     }
 
     fun requestLnurlAuth(callback: String, k1: String, domain: String) {
         viewModelScope.launch {
-            // TODO pass callback and domain from bitkit-core when updated to accept decoded callback and return domain
             lightningRepo.requestLnurlAuth(
                 callback = callback,
                 k1 = k1,

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

@@ -46,8 +46,8 @@ activity-compose = { module = "androidx.activity:activity-compose", version.ref
 appcompat = { module = "androidx.appcompat:appcompat", version.ref = "appcompat" }
 barcode-scanning = { module = "com.google.mlkit:barcode-scanning", version.ref = "barcodeScanning" }
 biometric = { module = "androidx.biometric:biometric", version.ref = "biometric" }
-#bitkitcore = { module = "com.synonym:bitkit-core-android", version = "0.1.3" } # mavenLocal
-bitkitcore = { module = "com.github.synonymdev:bitkit-core", version = "v0.1.8" } # jitpack
+#bitkitcore = { module = "com.synonym:bitkit-core-android", version = "0.1.9" } # mavenLocal
+bitkitcore = { module = "com.github.synonymdev:bitkit-core", version = "v0.1.9" } # jitpack
 bouncycastle-provider-jdk = { module = "org.bouncycastle:bcprov-jdk18on", version.ref = "bouncyCastle" }
 camera-camera2 = { module = "androidx.camera:camera-camera2", version.ref = "camera" }
 camera-lifecycle = { module = "androidx.camera:camera-lifecycle", version.ref = "camera" }