Add a feature flag to disable the problematic part of the added constraints:

Requesting the OS to have internet connectivity before starting a fetch notifications worker.

This feature flag is enabled by default, but can be disabled in case it's problematic.

Author: jmartinesp

libraries/featureflag/api/src/main/kotlin/io/element/android/libraries/featureflag/api/FeatureFlags.kt

@@ -147,4 +147,12 @@ enum class FeatureFlags(
         defaultValue = { false },
         isFinished = false,
     ),
+    ValidateNetworkWhenSchedulingNotificationFetching(
+        key = "feature.validate_network_when_scheduling_notification_fetching",
+        title = "validate internet connectivity when scheduling notification fetching",
+        description = "Only fetch events for push notifications when the device has internet connectivity. " +
+            "Enabling this can be problematic in air-gapped environments.",
+        defaultValue = { true },
+        isFinished = false,
+    ),
 }

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

@@ -23,6 +23,8 @@ 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.libraries.featureflag.api.FeatureFlagService
+import io.element.android.libraries.featureflag.api.FeatureFlags
 import io.element.android.libraries.matrix.api.core.SessionId
 import io.element.android.libraries.push.impl.workmanager.SyncPendingNotificationsRequestBuilder.Companion.SESSION_ID
 import io.element.android.libraries.workmanager.api.WorkManagerRequestBuilder
@@ -49,6 +51,7 @@ class DefaultSyncPendingNotificationsRequestBuilder(
     @Assisted private val sessionId: SessionId,
     private val buildVersionSdkIntProvider: BuildVersionSdkIntProvider,
     private val enterpriseService: EnterpriseService,
+    private val featureFlagService: FeatureFlagService,
 ) : SyncPendingNotificationsRequestBuilder {
     @AssistedFactory
     @ContributesBinding(AppScope::class)
@@ -77,7 +80,7 @@ class DefaultSyncPendingNotificationsRequestBuilder(
         if (enterpriseService.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 {
+        } else if (featureFlagService.isFeatureEnabled(FeatureFlags.ValidateNetworkWhenSchedulingNotificationFetching)) {
             Timber.d("Not in an air-gapped environment, adding NET_CAPABILITY_VALIDATED to the network request")
             networkRequestBuilder.addCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED)
         }

libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/workmanager/DefaultSyncPendingNotificationsRequestBuilderTest.kt

@@ -14,6 +14,8 @@ import androidx.work.OneTimeWorkRequest
 import androidx.work.hasKeyWithValueOfType
 import com.google.common.truth.Truth.assertThat
 import io.element.android.features.enterprise.test.FakeEnterpriseService
+import io.element.android.libraries.featureflag.api.FeatureFlags
+import io.element.android.libraries.featureflag.test.FakeFeatureFlagService
 import io.element.android.libraries.matrix.api.core.SessionId
 import io.element.android.libraries.matrix.test.A_SESSION_ID
 import io.element.android.libraries.workmanager.api.WorkManagerRequestType
@@ -111,14 +113,39 @@ class DefaultSyncPendingNotificationsRequestBuilderTest {
             }
         }
     }
+
+    @Test
+    fun `build - does not have NET_CAPABILITY_VALIDATED constraint if feature flag is disabled`() = runTest {
+        val request = createSyncPendingNotificationsRequestBuilder(
+            sessionId = A_SESSION_ID,
+            sdkVersion = 33,
+            isInAirGapEnvironment = false,
+            featureFlagService = FakeFeatureFlagService(initialState = mapOf(
+                FeatureFlags.ValidateNetworkWhenSchedulingNotificationFetching.key to false
+            )),
+        )
+
+        val results = request.build()
+        assertThat(results.isSuccess).isTrue()
+        results.getOrNull()!!.first().let { result ->
+            result.request.run {
+                assertThat(workSpec.hasConstraints()).isTrue()
+                val networkRequest = workSpec.constraints.requiredNetworkRequest
+                assertThat(networkRequest).isNotNull()
+                assertThat(networkRequest!!.capabilities.contains(NetworkCapabilities.NET_CAPABILITY_VALIDATED)).isFalse()
+            }
+        }
+    }
 }
 
 private fun createSyncPendingNotificationsRequestBuilder(
     sessionId: SessionId,
     sdkVersion: Int = 33,
     isInAirGapEnvironment: Boolean = false,
+    featureFlagService: FakeFeatureFlagService = FakeFeatureFlagService(),
 ) = DefaultSyncPendingNotificationsRequestBuilder(
     sessionId = sessionId,
     buildVersionSdkIntProvider = FakeBuildVersionSdkIntProvider(sdkVersion),
     enterpriseService = FakeEnterpriseService(isInAirGappedEnvironmentResult = { flowOf(isInAirGapEnvironment) }),
+    featureFlagService = featureFlagService,
 )