Simplify checking for air-gapped status: remove it from EnterpriseService, check in DefaultNetworkMonitor if the build is enterprise before updating the value.

Author: jmartinesp

features/enterprise/api/src/main/kotlin/io/element/android/features/enterprise/api/EnterpriseService.kt

@@ -40,12 +40,6 @@ interface EnterpriseService {
      */
     fun getNoisyNotificationChannelId(sessionId: SessionId): String?
 
-    /**
-     * Checks if the app is running in an air-gapped environment. An air-gapped environment is an environment that is not connected to the internet,
-     * and where the app can only communicate with a limited set of servers.
-     */
-    fun isInAirGappedEnvironment(): Flow<Boolean>
-
     companion object {
         const val ANY_ACCOUNT_PROVIDER = "*"
     }

features/enterprise/impl-foss/src/main/kotlin/io/element/android/features/enterprise/impl/DefaultEnterpriseService.kt

@@ -45,7 +45,4 @@ class DefaultEnterpriseService : EnterpriseService {
     }
 
     override fun getNoisyNotificationChannelId(sessionId: SessionId): String? = null
-
-    // Act as no-op
-    override fun isInAirGappedEnvironment(): Flow<Boolean> = flowOf(false)
 }

features/enterprise/test/src/main/kotlin/io/element/android/features/enterprise/test/FakeEnterpriseService.kt

@@ -30,7 +30,6 @@ class FakeEnterpriseService(
     private val firebasePushGatewayResult: () -> String? = { lambdaError() },
     private val unifiedPushDefaultPushGatewayResult: () -> String? = { lambdaError() },
     private val getNoisyNotificationChannelIdResult: (SessionId?) -> String? = { lambdaError() },
-    private val isInAirGappedEnvironmentResult: () -> Flow<Boolean> = { lambdaError() },
 ) : EnterpriseService {
     private val brandColorState = MutableStateFlow(initialBrandColor)
     private val semanticColorsState = MutableStateFlow(initialSemanticColors)
@@ -75,8 +74,4 @@ class FakeEnterpriseService(
     override fun getNoisyNotificationChannelId(sessionId: SessionId): String? {
         return getNoisyNotificationChannelIdResult(sessionId)
     }
-
-    override fun isInAirGappedEnvironment(): Flow<Boolean> {
-        return isInAirGappedEnvironmentResult()
-    }
 }

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

@@ -20,6 +20,7 @@ import dev.zacsweers.metro.ContributesBinding
 import dev.zacsweers.metro.SingleIn
 import io.element.android.features.networkmonitor.api.NetworkMonitor
 import io.element.android.features.networkmonitor.api.NetworkStatus
+import io.element.android.libraries.core.meta.BuildMeta
 import io.element.android.libraries.di.annotations.AppCoroutineScope
 import io.element.android.libraries.di.annotations.ApplicationContext
 import kotlinx.coroutines.CoroutineScope
@@ -42,6 +43,7 @@ import java.util.concurrent.atomic.AtomicInteger
 class DefaultNetworkMonitor(
     @ApplicationContext context: Context,
     @AppCoroutineScope appCoroutineScope: CoroutineScope,
+    private val buildMeta: BuildMeta,
 ) : NetworkMonitor {
     private val connectivityManager: ConnectivityManager = context.getSystemService(ConnectivityManager::class.java)
 
@@ -73,6 +75,11 @@ class DefaultNetworkMonitor(
             }
 
             override fun onCapabilitiesChanged(network: Network, networkCapabilities: NetworkCapabilities) {
+                if (!buildMeta.isEnterpriseBuild) {
+                    // The air-gapped environment detection is only relevant for the enterprise build.
+                    return
+                }
+
                 if (network.networkHandle == connectivityManager.activeNetwork?.networkHandle) {
                     // If the network doesn't have the NET_CAPABILITY_VALIDATED capability, it means that the network is not able to reach the internet
                     // (according to Google), which is a common case in air-gapped environments.

libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/workmanager/SyncPendingNotificationsRequestBuilder.kt

@@ -22,7 +22,7 @@ import dev.zacsweers.metro.Assisted
 import dev.zacsweers.metro.AssistedFactory
 import dev.zacsweers.metro.AssistedInject
 import dev.zacsweers.metro.ContributesBinding
-import io.element.android.features.enterprise.api.EnterpriseService
+import io.element.android.features.networkmonitor.api.NetworkMonitor
 import io.element.android.libraries.featureflag.api.FeatureFlagService
 import io.element.android.libraries.featureflag.api.FeatureFlags
 import io.element.android.libraries.matrix.api.core.SessionId
@@ -50,7 +50,7 @@ interface SyncPendingNotificationsRequestBuilder : WorkManagerRequestBuilder {
 class DefaultSyncPendingNotificationsRequestBuilder(
     @Assisted private val sessionId: SessionId,
     private val buildVersionSdkIntProvider: BuildVersionSdkIntProvider,
-    private val enterpriseService: EnterpriseService,
+    private val networkMonitor: NetworkMonitor,
     private val featureFlagService: FeatureFlagService,
 ) : SyncPendingNotificationsRequestBuilder {
     @AssistedFactory
@@ -77,7 +77,7 @@ class DefaultSyncPendingNotificationsRequestBuilder(
 
         // If we're in an air-gapped environment, we shouldn't validate internet connectivity, as the checker will fail and the worker won't run at all.
         // Note this will always be false for FOSS, since the feature is only enabled in Element Pro.
-        if (enterpriseService.isInAirGappedEnvironment().first()) {
+        if (networkMonitor.isInAirGappedEnvironment.first()) {
             Timber.d("In an air-gapped environment, not adding NET_CAPABILITY_VALIDATED to the network request")
             networkRequestBuilder.removeCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED)
         } else if (featureFlagService.isFeatureEnabled(FeatureFlags.ValidateNetworkWhenSchedulingNotificationFetching)) {