Rename NetworkStatus.Online/Offline to Connected/Disconnected so they're not easily mistaken with internet connectivity instead

Author: jmartinesp

appnav/src/main/kotlin/io/element/android/appnav/di/DefaultSyncOrchestrator.kt

@@ -99,7 +99,7 @@ class DefaultSyncOrchestrator @AssistedInject constructor(
                 appForegroundStateService.isSyncingNotificationEvent,
             ) { syncState, networkState, isInForeground, isInCall, isSyncingNotificationEvent ->
                 val isAppActive = isInForeground || isInCall || isSyncingNotificationEvent
-                val isNetworkAvailable = networkState == NetworkStatus.Online
+                val isNetworkAvailable = networkState == NetworkStatus.Connected
 
                 Timber.tag(tag).d("isAppActive=$isAppActive, isNetworkAvailable=$isNetworkAvailable")
                 if (syncState == SyncState.Running && !isAppActive) {

appnav/src/main/kotlin/io/element/android/appnav/loggedin/SendQueues.kt

@@ -32,7 +32,7 @@ class SendQueues @Inject constructor(
 ) {
     /**
      * Launches the send queues retry mechanism in the given [coroutineScope].
-     * Makes sure to re-enable all send queues when the network status is [NetworkStatus.Online].
+     * Makes sure to re-enable all send queues when the network status is [NetworkStatus.Connected].
      */
     @OptIn(FlowPreview::class)
     fun launchIn(coroutineScope: CoroutineScope) {

appnav/src/test/kotlin/io/element/android/appnav/DefaultSyncOrchestratorTest.kt

@@ -39,7 +39,7 @@ class DefaultSyncOrchestratorTest {
         val syncService = FakeSyncService(initialSyncState = SyncState.Idle).apply {
             startSyncLambda = startSyncRecorder
         }
-        val networkMonitor = FakeNetworkMonitor(initialStatus = NetworkStatus.Offline)
+        val networkMonitor = FakeNetworkMonitor(initialStatus = NetworkStatus.Disconnected)
         val syncOrchestrator = createSyncOrchestrator(syncService, networkMonitor)
 
         // We start observing
@@ -61,7 +61,7 @@ class DefaultSyncOrchestratorTest {
         val syncService = FakeSyncService(initialSyncState = SyncState.Running).apply {
             stopSyncLambda = stopSyncRecorder
         }
-        val networkMonitor = FakeNetworkMonitor(initialStatus = NetworkStatus.Online)
+        val networkMonitor = FakeNetworkMonitor(initialStatus = NetworkStatus.Connected)
         val appForegroundStateService = FakeAppForegroundStateService(initialForegroundValue = true)
         val syncOrchestrator = createSyncOrchestrator(syncService, networkMonitor, appForegroundStateService)
 
@@ -94,7 +94,7 @@ class DefaultSyncOrchestratorTest {
             startSyncLambda = startSyncRecorder
             stopSyncLambda = stopSyncRecorder
         }
-        val networkMonitor = FakeNetworkMonitor(initialStatus = NetworkStatus.Online)
+        val networkMonitor = FakeNetworkMonitor(initialStatus = NetworkStatus.Connected)
         val appForegroundStateService = FakeAppForegroundStateService(
             initialForegroundValue = false,
             initialIsSyncingNotificationEventValue = false,
@@ -141,7 +141,7 @@ class DefaultSyncOrchestratorTest {
             startSyncLambda = startSyncRecorder
             stopSyncLambda = stopSyncRecorder
         }
-        val networkMonitor = FakeNetworkMonitor(initialStatus = NetworkStatus.Online)
+        val networkMonitor = FakeNetworkMonitor(initialStatus = NetworkStatus.Connected)
         val appForegroundStateService = FakeAppForegroundStateService(
             initialForegroundValue = false,
             initialIsSyncingNotificationEventValue = false,
@@ -188,7 +188,7 @@ class DefaultSyncOrchestratorTest {
             startSyncLambda = startSyncRecorder
             stopSyncLambda = stopSyncRecorder
         }
-        val networkMonitor = FakeNetworkMonitor(initialStatus = NetworkStatus.Online)
+        val networkMonitor = FakeNetworkMonitor(initialStatus = NetworkStatus.Connected)
         val appForegroundStateService = FakeAppForegroundStateService(
             initialForegroundValue = true,
             initialIsSyncingNotificationEventValue = true,
@@ -230,7 +230,7 @@ class DefaultSyncOrchestratorTest {
         val syncService = FakeSyncService(initialSyncState = SyncState.Running).apply {
             stopSyncLambda = stopSyncRecorder
         }
-        val networkMonitor = FakeNetworkMonitor(initialStatus = NetworkStatus.Online)
+        val networkMonitor = FakeNetworkMonitor(initialStatus = NetworkStatus.Connected)
         val appForegroundStateService = FakeAppForegroundStateService(
             initialForegroundValue = true,
             initialIsSyncingNotificationEventValue = true,
@@ -263,7 +263,7 @@ class DefaultSyncOrchestratorTest {
         val syncService = FakeSyncService(initialSyncState = SyncState.Running).apply {
             startSyncLambda = startSyncRecorder
         }
-        val networkMonitor = FakeNetworkMonitor(initialStatus = NetworkStatus.Offline)
+        val networkMonitor = FakeNetworkMonitor(initialStatus = NetworkStatus.Disconnected)
         val syncOrchestrator = createSyncOrchestrator(syncService, networkMonitor)
 
         // We start observing, we skip the initial sync attempt since the state is running

features/networkmonitor/api/src/main/kotlin/io/element/android/features/networkmonitor/api/NetworkStatus.kt

@@ -7,7 +7,19 @@
 
 package io.element.android.features.networkmonitor.api
 
+/**
+ * Network connectivity status of the device.
+ *
+ * **Note:** this is *network* connectivity status, not *internet* connectivity status.
+ */
 enum class NetworkStatus {
-    Online,
-    Offline
+    /**
+     * The device is connected to a network.
+     */
+    Connected,
+
+    /**
+     * The device is not connected to any networks.
+     */
+    Disconnected
 }

features/networkmonitor/impl/src/main/kotlin/io/element/android/features/networkmonitor/impl/DefaultNetworkMonitor.kt

@@ -54,13 +54,13 @@ class DefaultNetworkMonitor @Inject constructor(
 
             override fun onLost(network: Network) {
                 if (activeNetworksCount.decrementAndGet() == 0) {
-                    trySendBlocking(NetworkStatus.Offline)
+                    trySendBlocking(NetworkStatus.Disconnected)
                 }
             }
 
             override fun onAvailable(network: Network) {
                 if (activeNetworksCount.incrementAndGet() > 0) {
-                    trySendBlocking(NetworkStatus.Online)
+                    trySendBlocking(NetworkStatus.Connected)
                 }
             }
         }
@@ -82,6 +82,6 @@ class DefaultNetworkMonitor @Inject constructor(
         .stateIn(appCoroutineScope, SharingStarted.WhileSubscribed(), connectivityManager.activeNetworkStatus())
 
     private fun ConnectivityManager.activeNetworkStatus(): NetworkStatus {
-        return if (activeNetwork != null) NetworkStatus.Online else NetworkStatus.Offline
+        return if (activeNetwork != null) NetworkStatus.Connected else NetworkStatus.Disconnected
     }
 }

features/networkmonitor/test/src/main/kotlin/io/element/android/features/networkmonitor/test/FakeNetworkMonitor.kt

@@ -11,6 +11,6 @@ import io.element.android.features.networkmonitor.api.NetworkMonitor
 import io.element.android.features.networkmonitor.api.NetworkStatus
 import kotlinx.coroutines.flow.MutableStateFlow
 
-class FakeNetworkMonitor(initialStatus: NetworkStatus = NetworkStatus.Online) : NetworkMonitor {
+class FakeNetworkMonitor(initialStatus: NetworkStatus = NetworkStatus.Connected) : NetworkMonitor {
     override val connectivity = MutableStateFlow(initialStatus)
 }