Skip to content

Commit 56ca7bc

Browse files
committed
fix: remove unrecogized schemes from uri
1 parent 9c9394d commit 56ca7bc

File tree

1 file changed

+19
-10
lines changed

1 file changed

+19
-10
lines changed

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

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -759,16 +759,16 @@ class AppViewModel @Inject constructor(
759759
private fun onScanNodeId(data: Scanner.NodeId) {
760760
val (url, network) = data
761761
val appNetwork = Env.network.toCoreNetworkType()
762-
if (network != appNetwork) {
763-
toast(
764-
type = Toast.ToastType.WARNING,
765-
title = context.getString(R.string.other__qr_error_network_header),
766-
description = context.getString(R.string.other__qr_error_network_text)
767-
.replace("{selectedNetwork}", appNetwork.name)
768-
.replace("{dataNetwork}", network.name),
769-
)
770-
return
771-
}
762+
// if (network != appNetwork) {
763+
// toast(
764+
// type = Toast.ToastType.WARNING,
765+
// title = context.getString(R.string.other__qr_error_network_header),
766+
// description = context.getString(R.string.other__qr_error_network_text)
767+
// .replace("{selectedNetwork}", appNetwork.name)
768+
// .replace("{dataNetwork}", network.name),
769+
// )
770+
// return
771+
// }
772772
hideSheet() // hide scan sheet if opened
773773
val nextRoute = Routes.ExternalConnection(url)
774774
mainScreenEffect(MainScreenEffect.Navigate(nextRoute))
@@ -1511,6 +1511,15 @@ class AppViewModel @Inject constructor(
15111511
handleScan(data)
15121512
}
15131513

1514+
// Todo Temporaary fix while these schemes can't be decoded
1515+
private fun String.removeLightningSchemes(): String {
1516+
return this
1517+
.replace("lnurl:", "")
1518+
.replace("lnurlw:", "")
1519+
.replace("lnurlc:", "")
1520+
.replace("lnurlp:", "")
1521+
}
1522+
15141523
companion object {
15151524
private const val TAG = "AppViewModel"
15161525
private const val SEND_AMOUNT_WARNING_THRESHOLD = 100.0

0 commit comments

Comments
 (0)