Skip to content

[MS-1112] Always attempt showing foreground notifications for workers #1322

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alex-vt merged 3 commits into from
Aug 20, 2025
Merged

[MS-1112] Always attempt showing foreground notifications for workers #1322

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
23be676
MS-1112 Always attempt showing foreground notifications for backgroun…
alex-vt Aug 19, 2025
09af811
MS-1112 Always attempt showing foreground notifications for workers -…
alex-vt Aug 20, 2025
b3d319e
Merge branch 'main' into feature/foreground-notif-workers-always
alex-vt Aug 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 0 additions & 12 deletions infra/core/src/main/java/com/simprints/core/tools/utils/BatteryOptimizationUtils.kt
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions infra/core/src/main/java/com/simprints/core/workers/SimCoroutineWorker.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ import androidx.work.Data
import androidx.work.ForegroundInfo
import androidx.work.WorkerParameters
import com.simprints.core.ExcludedFromGeneratedTestCoverageReports
import com.simprints.core.tools.utils.BatteryOptimizationUtils
import com.simprints.infra.logging.Simber
import com.simprints.infra.network.exceptions.NetworkConnectionException
import com.simprints.infra.resources.R
Expand Down Expand Up @@ -59,9 +58,6 @@ abstract class SimCoroutineWorker(

protected suspend fun showProgressNotification() {
try {
if (BatteryOptimizationUtils.isFollowingBatteryOptimizations(context)) {
return
}
setForeground(getForegroundInfo())
} catch (setForegroundException: Throwable) {
// Setting foreground (showing the notification) may be restricted by the system
Expand Down
33 changes: 18 additions & 15 deletions ...sync/src/test/java/com/simprints/infra/eventsync/sync/master/EventSyncMasterWorkerTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,22 +146,25 @@ internal class EventSyncMasterWorkerTest {
every { projectConfiguration.synchronization } returns synchronizationConfiguration
coEvery { configManager.getProjectConfiguration() } returns projectConfiguration

masterWorker = EventSyncMasterWorker(
appContext = ctx,
params = mockk(relaxed = true) {
every { tags } returns setOf(MASTER_SYNC_SCHEDULER_PERIODIC_TIME)
},
simprintsDownSyncWorkerBuilder = simprintsDownSyncWorkerBuilder,
commCareDownSyncWorkerBuilder = commCareDownSyncWorkerBuilder,
upSyncWorkerBuilder = upSyncWorkerBuilder,
configManager = configManager,
eventSyncCache = eventSyncCache,
eventSyncSubMasterWorkersBuilder = eventSyncSubMasterWorkersBuilder,
timeHelper = timeHelper,
dispatcher = testCoroutineRule.testCoroutineDispatcher,
securityManager = securityManager,
eventRepository = eventRepository,
masterWorker = spyk(
EventSyncMasterWorker(
appContext = ctx,
params = mockk(relaxed = true) {
every { tags } returns setOf(MASTER_SYNC_SCHEDULER_PERIODIC_TIME)
},
simprintsDownSyncWorkerBuilder = simprintsDownSyncWorkerBuilder,
commCareDownSyncWorkerBuilder = commCareDownSyncWorkerBuilder,
upSyncWorkerBuilder = upSyncWorkerBuilder,
configManager = configManager,
eventSyncCache = eventSyncCache,
eventSyncSubMasterWorkersBuilder = eventSyncSubMasterWorkersBuilder,
timeHelper = timeHelper,
dispatcher = testCoroutineRule.testCoroutineDispatcher,
securityManager = securityManager,
eventRepository = eventRepository,
)
)
coEvery { masterWorker["showProgressNotification"]() } returns Unit
}

@Test
Expand Down