From 281d511402c273c08e65342c971d8c119f083f77 Mon Sep 17 00:00:00 2001 From: Jean-Luc Makiola Date: Sat, 14 Nov 2026 12:55:49 +0100 Subject: [PATCH] fix(#516): WorkManager's JobScheduler ids kept below the change watch's --- app/src/main/AndroidManifest.xml | 12 ++++++++++++ .../java/de/jeanlucmakiola/calendula/CalendulaApp.kt | 8 +++++++- .../calendula/data/backup/BackupChangeJob.kt | 4 ++-- 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 175dab02..fbf7b9d0 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -485,6 +485,18 @@ + + + + + diff --git a/app/src/main/java/de/jeanlucmakiola/calendula/CalendulaApp.kt b/app/src/main/java/de/jeanlucmakiola/calendula/CalendulaApp.kt index 6404f97b..0661c415 100644 --- a/app/src/main/java/de/jeanlucmakiola/calendula/CalendulaApp.kt +++ b/app/src/main/java/de/jeanlucmakiola/calendula/CalendulaApp.kt @@ -1,8 +1,10 @@ package de.jeanlucmakiola.calendula import android.app.Application +import androidx.work.Configuration import dagger.hilt.android.EntryPointAccessors import dagger.hilt.android.HiltAndroidApp +import de.jeanlucmakiola.calendula.data.backup.BackupChangeJob import de.jeanlucmakiola.calendula.data.backup.BackupScheduler import de.jeanlucmakiola.calendula.data.calendar.CalendarVisibilityReconciler import de.jeanlucmakiola.calendula.data.backup.BackupWorker @@ -27,7 +29,11 @@ import kotlinx.coroutines.launch * in AndroidManifest.xml. Hilt initializes its component graph here. */ @HiltAndroidApp -class CalendulaApp : Application() { +class CalendulaApp : Application(), Configuration.Provider { + + /** Keeps WorkManager's JobScheduler ids clear of [BackupChangeJob]'s. */ + override val workManagerConfiguration: Configuration = + Configuration.Builder().setJobSchedulerJobIdRange(0, BackupChangeJob.JOB_ID - 1).build() override fun onCreate() { super.onCreate() diff --git a/app/src/main/java/de/jeanlucmakiola/calendula/data/backup/BackupChangeJob.kt b/app/src/main/java/de/jeanlucmakiola/calendula/data/backup/BackupChangeJob.kt index a2dbe12b..cb99ff00 100644 --- a/app/src/main/java/de/jeanlucmakiola/calendula/data/backup/BackupChangeJob.kt +++ b/app/src/main/java/de/jeanlucmakiola/calendula/data/backup/BackupChangeJob.kt @@ -51,8 +51,8 @@ class BackupChangeJob : JobService() { } companion object { - /** Clear of WorkManager's ids, which count up from 0. */ - private const val JOB_ID = 0x0516_0001 + /** Above the range WorkManager is given (see CalendulaApp). */ + const val JOB_ID = 0x0516_0001 private const val SETTLE_MINUTES = 2L private const val MAX_WAIT_MINUTES = 15L private const val TAG = "BackupChangeJob"