From ecf949a79cca940500727510c29adc619ce6a253 Mon Sep 17 00:00:00 2001 From: Madhuram Jajoo Date: Thu, 23 Jan 2025 17:51:14 +0530 Subject: [PATCH 1/2] Make existing work policy configurable in sync apis (#2765) --- engine/src/main/java/com/google/android/fhir/sync/Sync.kt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/engine/src/main/java/com/google/android/fhir/sync/Sync.kt b/engine/src/main/java/com/google/android/fhir/sync/Sync.kt index e4a3615605..c54a39685a 100644 --- a/engine/src/main/java/com/google/android/fhir/sync/Sync.kt +++ b/engine/src/main/java/com/google/android/fhir/sync/Sync.kt @@ -1,5 +1,5 @@ /* - * Copyright 2023-2024 Google LLC + * Copyright 2023-2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -67,6 +67,7 @@ object Sync { inline fun oneTimeSync( context: Context, retryConfiguration: RetryConfiguration? = defaultRetryConfiguration, + existingWorkPolicy: ExistingWorkPolicy = ExistingWorkPolicy.KEEP, ): Flow { val uniqueWorkName = "${W::class.java.name}-oneTimeSync" val flow = getWorkerInfo(context, uniqueWorkName) @@ -75,7 +76,7 @@ object Sync { WorkManager.getInstance(context) .enqueueUniqueWork( uniqueWorkName, - ExistingWorkPolicy.KEEP, + existingWorkPolicy, oneTimeWorkRequest, ) return combineSyncStateForOneTimeSync(context, uniqueWorkName, flow) @@ -95,6 +96,7 @@ object Sync { inline fun periodicSync( context: Context, periodicSyncConfiguration: PeriodicSyncConfiguration, + existingPeriodicWorkPolicy: ExistingPeriodicWorkPolicy = ExistingPeriodicWorkPolicy.KEEP, ): Flow { val uniqueWorkName = "${W::class.java.name}-periodicSync" val flow = getWorkerInfo(context, uniqueWorkName) @@ -103,7 +105,7 @@ object Sync { WorkManager.getInstance(context) .enqueueUniquePeriodicWork( uniqueWorkName, - ExistingPeriodicWorkPolicy.KEEP, + existingPeriodicWorkPolicy, periodicWorkRequest, ) return combineSyncStateForPeriodicSync(context, uniqueWorkName, flow) From b483ed05023912312ca3b4ea0fcc9d82b25a9acd Mon Sep 17 00:00:00 2001 From: Madhuram Jajoo Date: Wed, 29 Jan 2025 09:45:54 +0530 Subject: [PATCH 2/2] Bump the engine version to 1.2.0 (#2776) * Bump the engine version to 1.2.0 * spotless apply --- buildSrc/src/main/kotlin/Releases.kt | 4 ++-- docs/use/api.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/buildSrc/src/main/kotlin/Releases.kt b/buildSrc/src/main/kotlin/Releases.kt index 4a5a54d064..c11dadf00c 100644 --- a/buildSrc/src/main/kotlin/Releases.kt +++ b/buildSrc/src/main/kotlin/Releases.kt @@ -1,5 +1,5 @@ /* - * Copyright 2023-2024 Google LLC + * Copyright 2023-2025 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -48,7 +48,7 @@ object Releases { object Engine : LibraryArtifact { override val artifactId = "engine" - override val version = "1.1.0" + override val version = "1.2.0" override val name = "Android FHIR Engine Library" } diff --git a/docs/use/api.md b/docs/use/api.md index 84f73cc8d8..3e0087476b 100644 --- a/docs/use/api.md +++ b/docs/use/api.md @@ -1,6 +1,6 @@ # API -* [Engine](api/engine/1.1.0/index.html) +* [Engine](api/engine/1.2.0/index.html) * [Data Capture](api/data-capture/1.2.0/index.html) * [Workflow](api/workflow/0.1.0-beta01/index.html) * [Knowledge](api/knowledge/0.1.0-beta01/index.html)