fix(receive): enable LN toggle when having external node even if geoblocked

Author: ovitrif

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

@@ -102,10 +102,9 @@ class WalletRepo @Inject constructor(
     suspend fun refreshBip21(force: Boolean = false): Result<Unit> = withContext(bgDispatcher) {
         Logger.debug("Refreshing bip21 (force: $force)", context = TAG)
 
-        if (coreService.checkGeoBlock().second) {
-            _walletState.update {
-                it.copy(receiveOnSpendingBalance = false)
-            }
+        val shouldBlockLightning = coreService.checkGeoBlock().second
+        _walletState.update {
+            it.copy(receiveOnSpendingBalance = !shouldBlockLightning)
         }
 
         // Reset invoice state

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

@@ -58,7 +58,6 @@ import to.bitkit.async.ServiceQueue
 import to.bitkit.data.CacheStore
 import to.bitkit.env.Env
 import to.bitkit.ext.amountSats
-import to.bitkit.models.LnPeer
 import to.bitkit.models.toCoreNetwork
 import to.bitkit.utils.AppError
 import to.bitkit.utils.Logger
@@ -143,25 +142,14 @@ class CoreService @Inject constructor(
         }
     }
 
-    private suspend fun getLspPeers(): List<LnPeer> {
-        val blocktankPeers = Env.trustedLnPeers
-        // TODO get from blocktank info when lightningService.setup sets trustedPeers0conf using BT API
-        // pseudocode idea:
-        // val blocktankPeers = getInfo(refresh = true)?.nodes?.map { LnPeer(nodeId = it.pubkey, address = "TO_DO") }.orEmpty()
-        return blocktankPeers
-    }
-
-    suspend fun getConnectedPeers(): List<LnPeer> = lightningService.peers.orEmpty()
-
-    suspend fun hasExternalNode() = getConnectedPeers().any { connectedPeer -> connectedPeer !in getLspPeers() }
-
     /**
-     * This method checks if the device is geo blocked and if should block lighting features
-     * @return Pair(isGeoBlocked, shouldBlockLightning)*/
+     * This method checks if the device is in a is geo blocked region and if lightning features should be blocked
+     * @return pair of `isGeoBlocked` to `shouldBlockLightning`
+     * */
     suspend fun checkGeoBlock(): Pair<Boolean, Boolean> {
         val geoBlocked = isGeoBlocked()
         val shouldBlockLightning = when {
-            hasExternalNode() -> false
+            lightningService.hasExternalPeers() -> false
             else -> geoBlocked
         }
 

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

@@ -57,6 +57,7 @@ import java.util.Locale
 import java.util.TimeZone
 import javax.inject.Inject
 import javax.inject.Singleton
+import kotlin.collections.any
 import kotlin.io.path.Path
 import kotlin.time.Duration
 import kotlin.time.Duration.Companion.seconds
@@ -318,6 +319,17 @@ class LightningService @Inject constructor(
             Logger.warn("Peer disconnect error: $peer", LdkError(e))
         }
     }
+
+    private fun getLspPeers(): List<LnPeer> {
+        val lspPeers = Env.trustedLnPeers
+        // TODO get from blocktank info.nodes[] when setup uses it to set trustedPeers0conf
+        // pseudocode idea:
+        // val lspPeers = getInfo(refresh = true)?.nodes?.map { LnPeer(nodeId = it.pubkey, address = "TO_DO") }
+        return lspPeers
+    }
+
+    fun hasExternalPeers() = peers?.any { it !in getLspPeers() } == true
+
     // endregion
 
     // region channels

app/src/test/java/to/bitkit/repositories/WalletRepoTest.kt

@@ -136,7 +136,7 @@ class WalletRepoTest : BaseUnitTest() {
     }
 
     @Test
-    fun `refreshBip21 should set receiveOnSpendingBalance as false if shouldBlockLightning is true`() = test {
+    fun `refreshBip21 should set receiveOnSpendingBalance false when shouldBlockLightning is true`() = test {
         wheneverBlocking { coreService.checkGeoBlock() }.thenReturn(Pair(true, true))
         whenever(lightningRepo.newAddress()).thenReturn(Result.success("newAddress"))
         whenever(addressChecker.getAddressInfo(any())).thenReturn(mock())
@@ -147,6 +147,18 @@ class WalletRepoTest : BaseUnitTest() {
         assertEquals(false, sut.walletState.value.receiveOnSpendingBalance)
     }
 
+    @Test
+    fun `refreshBip21 should set receiveOnSpendingBalance true when shouldBlockLightning is false`() = test {
+        wheneverBlocking { coreService.checkGeoBlock() }.thenReturn(Pair(true, false))
+        whenever(lightningRepo.newAddress()).thenReturn(Result.success("newAddress"))
+        whenever(addressChecker.getAddressInfo(any())).thenReturn(mock())
+
+        val result = sut.refreshBip21()
+
+        assertTrue(result.isSuccess)
+        assertEquals(true, sut.walletState.value.receiveOnSpendingBalance)
+    }
+
     @Test
     fun `refreshBip21 should generate new address when current has transactions`() = test {
         val testAddress = "testAddress"