From 4861ae5171823c94b79ed44dcd1618ef81b7cfec Mon Sep 17 00:00:00 2001
From: Jorge Martin Espinosa <jorgem@element.io>
Date: Wed, 22 Oct 2025 16:55:40 +0200
Subject: [PATCH] Enable `SyncNotificationsWithWorkManager` in nightly and
 debug builds (#5573)

* Enable `SyncNotificationsWithWorkManager` in nightly and debug builds

* Fix tests
---
 .../element/android/libraries/featureflag/api/FeatureFlags.kt  | 3 ++-
 .../android/libraries/push/impl/push/DefaultPushHandlerTest.kt | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/libraries/featureflag/api/src/main/kotlin/io/element/android/libraries/featureflag/api/FeatureFlags.kt b/libraries/featureflag/api/src/main/kotlin/io/element/android/libraries/featureflag/api/FeatureFlags.kt
index 50dfb89eb9..314d4fef7c 100644
--- a/libraries/featureflag/api/src/main/kotlin/io/element/android/libraries/featureflag/api/FeatureFlags.kt
+++ b/libraries/featureflag/api/src/main/kotlin/io/element/android/libraries/featureflag/api/FeatureFlags.kt
@@ -114,7 +114,8 @@ enum class FeatureFlags(
         title = "Sync notifications with WorkManager",
         description = "Use WorkManager to schedule notification sync tasks when a push is received." +
             " This should improve reliability and battery usage.",
-        defaultValue = { false },
+        // Enable by default on nightly and debug builds so we can get feedback before enabling it for everyone.
+        defaultValue = { meta -> meta.buildType != BuildType.RELEASE },
         isFinished = false,
     ),
 }
diff --git a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/push/DefaultPushHandlerTest.kt b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/push/DefaultPushHandlerTest.kt
index 335e44db42..4bfb944202 100644
--- a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/push/DefaultPushHandlerTest.kt
+++ b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/push/DefaultPushHandlerTest.kt
@@ -690,7 +690,7 @@ class DefaultPushHandlerTest {
         notificationChannels: FakeNotificationChannels = FakeNotificationChannels(),
         pushHistoryService: PushHistoryService = FakePushHistoryService(),
         syncOnNotifiableEvent: SyncOnNotifiableEvent = SyncOnNotifiableEvent {},
-        featureFlagService: FakeFeatureFlagService = FakeFeatureFlagService(),
+        featureFlagService: FakeFeatureFlagService = FakeFeatureFlagService(initialState = mapOf(FeatureFlags.SyncNotificationsWithWorkManager.key to false)),
         workManagerScheduler: FakeWorkManagerScheduler = FakeWorkManagerScheduler(),
     ): DefaultPushHandler {
         return DefaultPushHandler(