chore: replace direct decode calls with CoreService decode method

Author: jvsena42

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

@@ -8,7 +8,6 @@ import com.synonym.bitkitcore.PreActivityMetadata
 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
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope
@@ -552,7 +551,7 @@ class LightningRepo @Inject constructor(
         return runCatching {
             // TODO use bitkit-core getLnurlInvoice if it works with callbackUrl
             val bolt11 = lnurlService.fetchLnurlInvoice(callbackUrl, amountSats, comment).getOrThrow().pr
-            val decoded = (decode(bolt11) as Scanner.Lightning).invoice
+            val decoded = (coreService.decode(bolt11) as Scanner.Lightning).invoice
             return@runCatching decoded
         }.onFailure {
             Logger.error(

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

@@ -3,7 +3,6 @@ package to.bitkit.repositories
 import com.synonym.bitkitcore.AddressType
 import com.synonym.bitkitcore.PreActivityMetadata
 import com.synonym.bitkitcore.Scanner
-import com.synonym.bitkitcore.decode
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Job
@@ -137,7 +136,7 @@ class WalletRepo @Inject constructor(
     ) {
         val onChainAddress = getOnchainAddress()
         val paymentHash = runCatching {
-            when (val decoded = decode(bip21Url)) {
+            when (val decoded = coreService.decode(bip21Url)) {
                 is Scanner.Lightning -> decoded.invoice.paymentHash.toHex()
                 is Scanner.OnChain -> decoded.extractLightningHash()
                 else -> null
@@ -418,7 +417,7 @@ class WalletRepo @Inject constructor(
         if (bolt11.isEmpty()) return@withContext null
 
         runCatching {
-            when (val decoded = decode(bolt11)) {
+            when (val decoded = coreService.decode(bolt11)) {
                 is Scanner.Lightning -> decoded.invoice.paymentHash.toHex()
                 else -> null
             }
@@ -544,7 +543,7 @@ class WalletRepo @Inject constructor(
     private suspend fun Scanner.OnChain.extractLightningHash(): String? {
         val lightningInvoice: String = this.invoice.params?.get("lightning") ?: return null
 
-        return when (val decoded = decode(lightningInvoice)) {
+        return when (val decoded = coreService.decode(lightningInvoice)) {
             is Scanner.Lightning -> decoded.invoice.paymentHash.toHex()
             else -> null
         }

app/src/main/java/to/bitkit/ui/utils/AutoReadClipboardHandler.kt

@@ -16,14 +16,14 @@ import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleEventObserver
 import androidx.lifecycle.compose.LocalLifecycleOwner
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import com.synonym.bitkitcore.decode
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import to.bitkit.R
 import to.bitkit.ext.getClipboardText
 import to.bitkit.ui.appViewModel
 import to.bitkit.ui.scaffold.AppAlertDialog
 import to.bitkit.ui.settingsViewModel
+import to.bitkit.viewmodels.AppViewModel
 
 @Composable
 fun AutoReadClipboardHandler() {
@@ -43,7 +43,7 @@ fun AutoReadClipboardHandler() {
     // Check clipboard on app startup - only after authentication
     LaunchedEffect(isAuthenticated, isAutoReadClipboardEnabled) {
         if (isAuthenticated && isAutoReadClipboardEnabled && !hasCheckedOnStartup) {
-            showClipboardDialog = context.hasScanDataInClipboard()
+            showClipboardDialog = hasScanDataInClipboard(context, appViewModel)
             hasCheckedOnStartup = true
         }
     }
@@ -60,7 +60,7 @@ fun AutoReadClipboardHandler() {
             if (event == Lifecycle.Event.ON_RESUME && isAuthenticated) {
                 if (hasCheckedOnStartup && isAutoReadClipboardEnabled) {
                     scope.launch {
-                        showClipboardDialog = context.hasScanDataInClipboard()
+                        showClipboardDialog = hasScanDataInClipboard(context, appViewModel)
                     }
                 }
             }
@@ -86,12 +86,11 @@ fun AutoReadClipboardHandler() {
     }
 }
 
-private suspend fun Context.hasScanDataInClipboard(): Boolean {
+private suspend fun hasScanDataInClipboard(context: Context, appViewModel: AppViewModel): Boolean {
     delay(1000) // delay needed for Android clipboard accessibility on start
 
-    val clipText = this.getClipboardText()
+    val clipText = context.getClipboardText()
     if (clipText.isNullOrBlank()) return false
 
-    val scanResult = runCatching { decode(clipText) }
-    return scanResult.isSuccess
+    return appViewModel.canDecodeClipboard(clipText)
 }

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

@@ -22,7 +22,6 @@ import com.synonym.bitkitcore.LnurlWithdrawData
 import com.synonym.bitkitcore.OnChainInvoice
 import com.synonym.bitkitcore.PaymentType
 import com.synonym.bitkitcore.Scanner
-import com.synonym.bitkitcore.decode
 import com.synonym.bitkitcore.validateBitcoinAddress
 import dagger.hilt.android.lifecycle.HiltViewModel
 import dagger.hilt.android.qualifiers.ApplicationContext
@@ -101,6 +100,7 @@ import to.bitkit.repositories.SweepRepo
 import to.bitkit.repositories.TransferRepo
 import to.bitkit.repositories.WalletRepo
 import to.bitkit.services.AppUpdaterService
+import to.bitkit.services.CoreService
 import to.bitkit.services.MigrationService
 import to.bitkit.ui.Routes
 import to.bitkit.ui.components.Sheet
@@ -149,6 +149,7 @@ class AppViewModel @Inject constructor(
     private val transferRepo: TransferRepo,
     private val migrationService: MigrationService,
     private val sweepRepo: SweepRepo,
+    private val coreService: CoreService,
     private val appUpdateSheet: AppUpdateTimedSheet,
     private val backupSheet: BackupTimedSheet,
     private val notificationsSheet: NotificationsTimedSheet,
@@ -715,7 +716,7 @@ class AppViewModel @Inject constructor(
             return@withContext
         }
 
-        val scanResult = runCatching { decode(input) }
+        val scanResult = runCatching { coreService.decode(input) }
 
         if (scanResult.isFailure) {
             showAddressValidationError(
@@ -819,7 +820,7 @@ class AppViewModel @Inject constructor(
 
     private suspend fun extractViableLightningInvoice(params: Map<String, String>?): LightningInvoice? =
         params?.get("lightning")?.let { bolt11 ->
-            runCatching { decode(bolt11) }.getOrNull()
+            runCatching { coreService.decode(bolt11) }.getOrNull()
                 ?.let { it as? Scanner.Lightning }
                 ?.invoice
                 ?.takeIf { lnInv ->
@@ -1043,8 +1044,7 @@ class AppViewModel @Inject constructor(
             return@withContext
         }
 
-        @Suppress("ForbiddenComment") // TODO: wrap `decode` from bindings in a `CoreService` method and call that one
-        val scan = runCatching { decode(result) }
+        val scan = runCatching { coreService.decode(result) }
             .onFailure { Logger.error("Failed to decode scan data: '$result'", it, context = TAG) }
             .onSuccess { Logger.info("Handling decoded scan data: $it", context = TAG) }
             .getOrNull()
@@ -2111,6 +2111,10 @@ class AppViewModel @Inject constructor(
     }
     // endregion
 
+    suspend fun canDecodeClipboard(text: String): Boolean = withContext(bgDispatcher) {
+        runCatching { coreService.decode(text) }.isSuccess
+    }
+
     fun onClipboardAutoRead(data: String) {
         viewModelScope.launch {
             mainScreenEffect(MainScreenEffect.ProcessClipboardAutoRead(data))