fix(android): close network monitor startup race

steipete · steipete · commit bf37f31e61aa · 2026-07-06T01:37:11.000-04:00
diff --git a/apps/android/app/src/main/java/ai/openclaw/app/gateway/NetworkMonitor.kt b/apps/android/app/src/main/java/ai/openclaw/app/gateway/NetworkMonitor.kt
@@ -26,7 +26,7 @@ internal class NetworkMonitor(
   // Tracks the last emitted transport state so capability churn (e.g. signal strength
   // changes) does not re-fire the reconnect path. Only a lost->validated transition
   // should signal.
-  private val validatedNetworks = ValidatedNetworkState<Network>(initialValidatedNetworks())
+  private val validatedNetworks = ValidatedNetworkState<Network>()
 
   private val callback =
     object : ConnectivityManager.NetworkCallback() {
@@ -45,7 +45,10 @@ internal class NetworkMonitor(
     }
 
   init {
+    // Register first so a network lost during initial seeding still has an owning callback.
+    // The seed suppresses the initial snapshot when it wins; session guards handle the other race.
     start()
+    seedActiveValidatedNetwork()
   }
 
   private fun start() {
@@ -66,14 +69,16 @@ internal class NetworkMonitor(
     }
   }
 
-  private fun initialValidatedNetworks(): Set<Network> {
-    return try {
-      val cm = connectivity ?: return emptySet()
-      val active = cm.activeNetwork ?: return emptySet()
-      val caps = cm.getNetworkCapabilities(active) ?: return emptySet()
-      if (isTransportValidated(caps)) setOf(active) else emptySet()
+  private fun seedActiveValidatedNetwork() {
+    try {
+      val cm = connectivity ?: return
+      val active = cm.activeNetwork ?: return
+      val caps = cm.getNetworkCapabilities(active) ?: return
+      if (isTransportValidated(caps)) {
+        validatedNetworks.update(active, isValidated = true)
+      }
     } catch (_: Throwable) {
-      emptySet()
+      // Callback delivery remains the source of truth when the initial snapshot races.
     }
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ internal class NetworkMonitor(`
`26`	`26`	`// Tracks the last emitted transport state so capability churn (e.g. signal strength`
`27`	`27`	`// changes) does not re-fire the reconnect path. Only a lost->validated transition`
`28`	`28`	`// should signal.`
`29`		`- private val validatedNetworks = ValidatedNetworkState<Network>(initialValidatedNetworks())`
	`29`	`+ private val validatedNetworks = ValidatedNetworkState<Network>()`
`30`	`30`
`31`	`31`	`private val callback =`
`32`	`32`	`object : ConnectivityManager.NetworkCallback() {`
`@@ -45,7 +45,10 @@ internal class NetworkMonitor(`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`init {`
	`48`	`+ // Register first so a network lost during initial seeding still has an owning callback.`
	`49`	`+ // The seed suppresses the initial snapshot when it wins; session guards handle the other race.`
`48`	`50`	`start()`
	`51`	`+ seedActiveValidatedNetwork()`
`49`	`52`	`}`
`50`	`53`
`51`	`54`	`private fun start() {`
`@@ -66,14 +69,16 @@ internal class NetworkMonitor(`
`66`	`69`	`}`
`67`	`70`	`}`
`68`	`71`
`69`		`- private fun initialValidatedNetworks(): Set<Network> {`
`70`		`- return try {`
`71`		`- val cm = connectivity ?: return emptySet()`
`72`		`- val active = cm.activeNetwork ?: return emptySet()`
`73`		`- val caps = cm.getNetworkCapabilities(active) ?: return emptySet()`
`74`		`- if (isTransportValidated(caps)) setOf(active) else emptySet()`
	`72`	`+ private fun seedActiveValidatedNetwork() {`
	`73`	`+ try {`
	`74`	`+ val cm = connectivity ?: return`
	`75`	`+ val active = cm.activeNetwork ?: return`
	`76`	`+ val caps = cm.getNetworkCapabilities(active) ?: return`
	`77`	`+ if (isTransportValidated(caps)) {`
	`78`	`+ validatedNetworks.update(active, isValidated = true)`
	`79`	`+ }`
`75`	`80`	`} catch (_: Throwable) {`
`76`		`- emptySet()`
	`81`	`+ // Callback delivery remains the source of truth when the initial snapshot races.`
`77`	`82`	`}`
`78`	`83`	`}`
`79`	`84`	`}`