bugfix/do_not_proceed_bootstrap_when_no_connectivity (#359)

Author: rodvar

androidNode/src/androidMain/kotlin/network/bisq/mobile/android/node/di/AndroidNodeModule.kt

@@ -62,7 +62,7 @@ val androidNodeModule = module {
 
     single { AndroidApplicationService.Provider() }
 
-    single<ApplicationBootstrapFacade> { NodeApplicationBootstrapFacade(get()) }
+    single<ApplicationBootstrapFacade> { NodeApplicationBootstrapFacade(get(), get()) }
 
     single<MarketPriceServiceFacade> { NodeMarketPriceServiceFacade(get()) }
 

androidNode/src/androidMain/kotlin/network/bisq/mobile/android/node/presentation/NodeSplashPresenter.kt

@@ -11,7 +11,7 @@ import network.bisq.mobile.presentation.MainPresenter
 import network.bisq.mobile.presentation.ui.uicases.startup.SplashPresenter
 
 class NodeSplashPresenter(
-    mainPresenter: MainPresenter,
+    private val mainPresenter: MainPresenter,
     applicationBootstrapFacade: ApplicationBootstrapFacade,
     userProfileService: UserProfileServiceFacade,
     userRepository: UserRepository,
@@ -36,7 +36,6 @@ class NodeSplashPresenter(
     }
 
     override suspend fun hasConnectivity(): Boolean {
-        // TODO implement for node
-        return true
+        return mainPresenter.isConnected()
     }
 }

androidNode/src/androidMain/kotlin/network/bisq/mobile/android/node/service/bootstrap/NodeApplicationBootstrapFacade.kt

@@ -3,18 +3,21 @@ package network.bisq.mobile.android.node.service.bootstrap
 import bisq.application.State
 import bisq.common.observable.Observable
 import bisq.common.observable.Pin
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.launch
 import network.bisq.mobile.android.node.AndroidApplicationService
 import network.bisq.mobile.domain.service.bootstrap.ApplicationBootstrapFacade
+import network.bisq.mobile.domain.service.network.ConnectivityService
 import network.bisq.mobile.i18n.i18n
 
 class NodeApplicationBootstrapFacade(
-    private val applicationService: AndroidApplicationService.Provider
+    private val applicationService: AndroidApplicationService.Provider,
+    private val connectivityService: ConnectivityService
 ) : ApplicationBootstrapFacade() {
 
-    // Dependencies
     private val applicationServiceState: Observable<State> by lazy { applicationService.state.get() }
+    private var connectivityJob: Job? = null
 
-    // Misc
     private var applicationServiceStatePin: Pin? = null
 
     override fun activate() {
@@ -53,8 +56,18 @@ class NodeApplicationBootstrapFacade(
                 State.APP_INITIALIZED -> {
                     isActive = true
                     log.i { "Bootstrap activated" }
-                    setState("splash.applicationServiceState.APP_INITIALIZED".i18n())
-                    setProgress(1f)
+                    
+                    // Check connectivity before completing bootstrap
+                    if (connectivityService.isConnected()) {
+                        onInitialized()
+                    } else {
+                        setState("bootstrap.noConnectivity".i18n())
+                        setProgress(0.95f) // Not fully complete
+                        connectivityJob = connectivityService.runWhenConnected {
+                            log.d { "Bootstrap: Connectivity restored, completing initialization" }
+                            onInitialized()
+                        }
+                    }
                 }
 
                 State.FAILED -> {
@@ -65,12 +78,19 @@ class NodeApplicationBootstrapFacade(
         }
     }
 
+    private fun onInitialized() {
+        setState("splash.applicationServiceState.APP_INITIALIZED".i18n())
+        setProgress(1f)
+    }
+
     private fun onInitializeAppState() {
         setState("splash.applicationServiceState.INITIALIZE_APP".i18n())
         setProgress(0f)
     }
 
     override fun deactivate() {
+        connectivityJob?.cancel()
+        connectivityJob = null
         applicationServiceStatePin?.unbind()
         applicationServiceStatePin = null
         isActive = false

androidNode/src/androidMain/kotlin/network/bisq/mobile/android/node/service/network/NodeConnectivityService.kt

@@ -20,7 +20,7 @@ class NodeConnectivityService(private val applicationService: AndroidApplication
 
     override fun isConnected(): Boolean {
         val connections = currentConnections()
-        log.d { "Connected peers = $connections" }
+        log.v { "Connected peers = $connections" }
         return connections > 0
     }
 

shared/domain/src/commonMain/kotlin/network/bisq/mobile/domain/service/network/ConnectivityService.kt

@@ -2,11 +2,14 @@ package network.bisq.mobile.domain.service.network
 
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Job
+import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.TimeoutCancellationException
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
 import kotlinx.coroutines.withTimeout
 import network.bisq.mobile.domain.data.IODispatcher
 import network.bisq.mobile.domain.service.ServiceFacade
@@ -47,27 +50,20 @@ abstract class ConnectivityService : ServiceFacade() {
         CONNECTED
     }
 
-    private val ioScope = CoroutineScope(IODispatcher)
+    private val pendingConnectivityBlocks = mutableListOf<suspend () -> Unit>()
+    private val mutex = Mutex()
+
     private var job: Job? = null
     private val _status = MutableStateFlow(ConnectivityStatus.DISCONNECTED)
     val status: StateFlow<ConnectivityStatus> = _status
 
-
-    override fun activate() {
-        super.activate()
-    }
-
-    override fun deactivate() {
-        super.deactivate()
-    }
-
     /**
      * Starts monitoring connectivity every given period (ms). Default is 10 seconds.
      */
     fun startMonitoring(period: Long = PERIOD) {
         onStart()
         job?.cancel()
-        job = ioScope.launch(IODispatcher) {
+        job = launchIO {
             while (true) {
                 checkConnectivity()
                 delay(period)
@@ -78,16 +74,18 @@ abstract class ConnectivityService : ServiceFacade() {
 
     private suspend fun checkConnectivity() {
         try {
-//            log.d { "Checking connectivity whilst ${_status.value}" }
             withTimeout(TIMEOUT) {
-                val currentStatus = _status.value
-                when {
-                    !isConnected() -> _status.value = ConnectivityStatus.DISCONNECTED
-                    isSlow() -> _status.value = ConnectivityStatus.SLOW
-                    else -> _status.value = ConnectivityStatus.CONNECTED
+                val previousStatus = _status.value
+                _status.value = when {
+                    !isConnected() -> ConnectivityStatus.DISCONNECTED
+                    isSlow() -> ConnectivityStatus.SLOW
+                    else -> ConnectivityStatus.CONNECTED
                 }
-                if (currentStatus != _status.value) {
-                    log.d { "Connectivity transition from $currentStatus to ${_status.value}" }
+                if (previousStatus != _status.value) {
+                    log.d { "Connectivity transition from $previousStatus to ${_status.value}" }
+                    if (previousStatus == ConnectivityStatus.DISCONNECTED) {
+                        runPendingBlocks()
+                    }
                 }
             }
         } catch (e: TimeoutCancellationException) {
@@ -99,6 +97,29 @@ abstract class ConnectivityService : ServiceFacade() {
         }
     }
 
+    private fun runPendingBlocks() {
+        launchIO {
+            mutex.withLock {
+                val blocksToExecute = pendingConnectivityBlocks.let {
+                    val blocks = it.toList()
+                    pendingConnectivityBlocks.clear()
+                    blocks
+                }
+
+                if (blocksToExecute.isNotEmpty()) {
+                    log.d { "Executing ${blocksToExecute.size} pending connectivity blocks" }
+
+                    blocksToExecute.forEach { block ->
+                        // fire&forget: Create a fresh scope for each block
+                        CoroutineScope(IODispatcher + SupervisorJob()).launch {
+                            block()
+                        }
+                    }
+                }
+            }
+        }
+    }
+
     fun stopMonitoring() {
         job?.cancel()
         job = null
@@ -114,7 +135,7 @@ abstract class ConnectivityService : ServiceFacade() {
         // default nth
     }
 
-    protected abstract fun isConnected(): Boolean
+    abstract fun isConnected(): Boolean
 
     /**
      * Default implementation uses round trip average measuring.
@@ -128,4 +149,25 @@ abstract class ConnectivityService : ServiceFacade() {
         }
         return false // assume is not slow on non mature connections
     }
-}
+
+    /**
+     * Executes the given block when connectivity is available.
+     * If connectivity is already available, executes immediately.
+     * Otherwise, schedules execution for when connectivity is restored.
+     * 
+     * @param block The code to execute when connectivity is available
+     * @return A job that can be cancelled if needed
+     */
+    fun runWhenConnected(block: suspend () -> Unit): Job {
+        return serviceScope.launch {
+            if (isConnected()) {
+                launchIO { block() }
+            } else {
+                mutex.withLock {
+                    pendingConnectivityBlocks.add(block)
+                    log.d { "Added block to be run when connectivity restarts" }
+                }
+            }
+        }
+    }
+}

shared/domain/src/commonMain/kotlin/network/bisq/mobile/i18n/GeneratedResourceBundles_cs.kt

@@ -1550,6 +1550,7 @@ object GeneratedResourceBundles_cs {
             "mobile.tradeState.info.buyer.phase2a.reasonForPaymentInfo" to "Use the trade ID {0} for the ''Reason for payment'' field",
             "min" to "Min",
             "bootstrap.connectedToTrustedNode" to "Connected to trusted node",
+            "bootstrap.noConnectivity" to "Žádné připojení: Čekání na připojení pro opakování",
             "confirmation.areYouSure" to "Are you sure?",
             "genericError.headline" to "An error occurred",
             "mobile.reputation.learnMore" to "Learn more about the reputation system at the Bisq Wiki.",

shared/domain/src/commonMain/kotlin/network/bisq/mobile/i18n/GeneratedResourceBundles_de.kt

@@ -632,7 +632,7 @@ object GeneratedResourceBundles_de {
             "bisqEasy.offerbook.dropdownMenu.sortAndFilterMarkets.sortTitle" to "Sortieren nach:",
             "bisqEasy.tradeWizard.review.priceDescription.taker" to "Handelspreis",
             "bisqEasy.takeOffer.review.sendTakeOfferMessageFeedback.subTitle" to "Das Senden der Nachricht zum Akzeptieren des Angebots kann bis zu 2 Minuten dauern",
-            "bisqEasy.walletGuide.receive.headline" to "Bitcoin in deiner Wallet empfangen",
+            "bootstrap.noConnectivity" to "Keine Verbindung: Bitte überprüfen Sie Ihre Internetverbindung und starten Sie neu",
             "bisqEasy.tradeWizard.selectOffer.noMatchingOffers.headline" to "Keine passenden Angebote gefunden",
             "bisqEasy.walletGuide.tabs.headline" to "Wallet-Anleitung",
             "bisqEasy.offerbook.offerList.table.columns.fiatAmount" to "{0} Betrag",
@@ -1548,9 +1548,11 @@ object GeneratedResourceBundles_de {
             "mobile.tradeState.info.buyer.phase2a.reasonForPaymentInfo" to "Use the trade ID {0} for the ''Reason for payment'' field",
             "min" to "Min",
             "bootstrap.connectedToTrustedNode" to "Connected to trusted node",
+            "bootstrap.noConnectivity" to "Keine Verbindung: Warte auf Verbindung für erneuten Versuch",
             "confirmation.areYouSure" to "Are you sure?",
             "genericError.headline" to "An error occurred",
             "mobile.reputation.learnMore" to "Learn more about the reputation system at the Bisq Wiki.",
         ),
     )
 }
+

shared/domain/src/commonMain/kotlin/network/bisq/mobile/i18n/GeneratedResourceBundles_en.kt

@@ -1566,6 +1566,7 @@ object GeneratedResourceBundles_en {
             "max" to "Max",
             "error.exception" to "Exception",
             "genericError.errorMessage" to "Error message:",
+            "bootstrap.noConnectivity" to "No Connectivity: Waiting to retry",
             "mobile.openTrades.inMediation.banner" to "A mediator has joined the trade chat.\nPlease use the trade chat to get assistance from the mediator.",
             "mobile.tradeState.info.buyer.phase2a.reasonForPaymentInfo" to "Use the trade ID {0} for the ''Reason for payment'' field",
             "min" to "Min",

shared/domain/src/commonMain/kotlin/network/bisq/mobile/i18n/GeneratedResourceBundles_es.kt

@@ -659,7 +659,7 @@ object GeneratedResourceBundles_es {
             "bisqEasy.tradeWizard.progress.amountAndPrice.selectOffer" to "Cantidad",
             "bisqEasy.offerDetails.makersTradeTerms" to "Términos comerciales del creador",
             "bisqEasy.openTrades.chat.attach.tooltip" to "Restaurar chat de nuevo en la ventana principal",
-            "bisqEasy.tradeWizard.amount.seller.limitInfo" to "Tu cantidad máxima de venta es {0}.",
+            "bootstrap.noConnectivity" to "Sin conectividad: Por favor, compruebe su conexión a internet y reinicie",
             "bisqEasy.privateChats.table.myUser" to "Mi perfil",
             "bisqEasy.tradeState.info.phase4.exportTrade" to "Exportar datos de la operación",
             "bisqEasy.tradeWizard.selectOffer.subHeadline" to "Se recomienda intercambiar con usuarios con alta reputación.",
@@ -1548,9 +1548,11 @@ object GeneratedResourceBundles_es {
             "mobile.tradeState.info.buyer.phase2a.reasonForPaymentInfo" to "Use the trade ID {0} for the ''Reason for payment'' field",
             "min" to "Min",
             "bootstrap.connectedToTrustedNode" to "Connected to trusted node",
+            "bootstrap.noConnectivity" to "Sin conectividad: Esperando conexión para reintentar",
             "confirmation.areYouSure" to "Are you sure?",
             "genericError.headline" to "An error occurred",
             "mobile.reputation.learnMore" to "Learn more about the reputation system at the Bisq Wiki.",
         ),
     )
 }
+

shared/domain/src/commonMain/kotlin/network/bisq/mobile/i18n/GeneratedResourceBundles_it.kt

@@ -1548,6 +1548,7 @@ object GeneratedResourceBundles_it {
             "mobile.tradeState.info.buyer.phase2a.reasonForPaymentInfo" to "Use the trade ID {0} for the ''Reason for payment'' field",
             "min" to "Min",
             "bootstrap.connectedToTrustedNode" to "Connected to trusted node",
+            "bootstrap.noConnectivity" to "Nessuna connettività: In attesa di connessione per riprovare",
             "confirmation.areYouSure" to "Are you sure?",
             "genericError.headline" to "An error occurred",
             "mobile.reputation.learnMore" to "Learn more about the reputation system at the Bisq Wiki.",

shared/domain/src/commonMain/kotlin/network/bisq/mobile/i18n/GeneratedResourceBundles_pcm.kt

@@ -1533,6 +1533,7 @@ object GeneratedResourceBundles_pcm {
             "mobile.tradeState.info.buyer.phase2a.reasonForPaymentInfo" to "Use the trade ID {0} for the ''Reason for payment'' field",
             "min" to "Min",
             "bootstrap.connectedToTrustedNode" to "Connected to trusted node",
+            "bootstrap.noConnectivity" to "No Connectivity: Dey wait for connection to try again",
             "confirmation.areYouSure" to "Are you sure?",
             "genericError.headline" to "An error occurred",
             "mobile.reputation.learnMore" to "Learn more about the reputation system at the Bisq Wiki.",

shared/domain/src/commonMain/kotlin/network/bisq/mobile/i18n/GeneratedResourceBundles_pt_BR.kt

@@ -1548,6 +1548,7 @@ object GeneratedResourceBundles_pt_BR {
             "mobile.tradeState.info.buyer.phase2a.reasonForPaymentInfo" to "Use the trade ID {0} for the ''Reason for payment'' field",
             "min" to "Min",
             "bootstrap.connectedToTrustedNode" to "Connected to trusted node",
+            "bootstrap.noConnectivity" to "Sem conectividade: Aguardando conectividade para tentar novamente",
             "confirmation.areYouSure" to "Are you sure?",
             "genericError.headline" to "An error occurred",
             "mobile.reputation.learnMore" to "Learn more about the reputation system at the Bisq Wiki.",

shared/domain/src/commonMain/kotlin/network/bisq/mobile/i18n/GeneratedResourceBundles_ru.kt

@@ -1548,6 +1548,7 @@ object GeneratedResourceBundles_ru {
             "mobile.tradeState.info.buyer.phase2a.reasonForPaymentInfo" to "Use the trade ID {0} for the ''Reason for payment'' field",
             "min" to "Min",
             "bootstrap.connectedToTrustedNode" to "Connected to trusted node",
+            "bootstrap.noConnectivity" to "Нет соединения: Ожидание подключения для повторной попытки",
             "confirmation.areYouSure" to "Are you sure?",
             "genericError.headline" to "An error occurred",
             "mobile.reputation.learnMore" to "Learn more about the reputation system at the Bisq Wiki.",

shared/domain/src/commonMain/resources/mobile/default.properties

@@ -57,6 +57,8 @@ data.add=Add
 data.remove=Remove
 data.redacted=Data has been removed for privacy and security reasons
 
+bootstrap.noConnectivity=No connectivity: Waiting to retry
+
 offer.createOffer=Create offer
 offer.takeOffer.buy.button=Buy Bitcoin
 offer.takeOffer.sell.button=Sell Bitcoin

shared/presentation/src/commonMain/kotlin/network/bisq/mobile/presentation/MainPresenter.kt

@@ -127,6 +127,10 @@ open class MainPresenter(
         super.onDestroying()
     }
 
+    fun isConnected(): Boolean {
+        return connectivityService.isConnected()
+    }
+
     open fun reactivateServices() {
         log.d { "Reactivating services default: skip" }
     }

shared/presentation/src/commonMain/kotlin/network/bisq/mobile/presentation/ui/uicases/startup/SplashPresenter.kt

@@ -50,8 +50,11 @@ open class SplashPresenter(
     private fun navigateToNextScreen() {
         log.d { "Navigating to next screen" }
         launchUI {
+            // Check connectivity first
             if (!hasConnectivity()) {
+                log.d { "No connectivity detected, navigating to trusted node setup" }
                 navigateToTrustedNodeSetup()
+                return@launchUI
             }
 
             if (webSocketClientProvider?.get()?.isDemo() == true) {