Chain custom worker to fhir sync worker and clean up sync view.

Signed-off-by: Lentumunai-Mark <[email protected]>

android/engine/src/main/java/org/smartregister/fhircore/engine/sync/SyncBroadcaster.kt

@@ -17,19 +17,16 @@
 package org.smartregister.fhircore.engine.sync
 
 import android.content.Context
-import androidx.work.BackoffPolicy
 import androidx.work.Constraints
 import androidx.work.NetworkType
 import androidx.work.OneTimeWorkRequestBuilder
 import androidx.work.WorkManager
 import com.google.android.fhir.FhirEngine
-import com.google.android.fhir.sync.BackoffCriteria
 import com.google.android.fhir.sync.CurrentSyncJobStatus
 import com.google.android.fhir.sync.LastSyncJobStatus
 import com.google.android.fhir.sync.PeriodicSyncConfiguration
 import com.google.android.fhir.sync.PeriodicSyncJobStatus
 import com.google.android.fhir.sync.RepeatInterval
-import com.google.android.fhir.sync.RetryConfiguration
 import com.google.android.fhir.sync.Sync
 import com.google.android.fhir.sync.SyncJobStatus
 import com.google.android.fhir.sync.download.ResourceParamsBasedDownloadWorkManager
@@ -80,11 +77,6 @@ constructor(
         .setConstraints(
           Constraints.Builder().setRequiredNetworkType(NetworkType.CONNECTED).build(),
         )
-        .setBackoffCriteria(
-          BackoffPolicy.LINEAR,
-          10,
-          TimeUnit.SECONDS,
-        )
         .build(),
     )
   }
@@ -103,16 +95,6 @@ constructor(
             syncConstraints =
               Constraints.Builder().setRequiredNetworkType(NetworkType.CONNECTED).build(),
             repeat = RepeatInterval(interval = interval, timeUnit = TimeUnit.MINUTES),
-            retryConfiguration =
-              RetryConfiguration(
-                backoffCriteria =
-                  BackoffCriteria(
-                    backoffDelay = 10,
-                    timeUnit = TimeUnit.SECONDS,
-                    backoffPolicy = BackoffPolicy.EXPONENTIAL,
-                  ),
-                maxRetries = 3,
-              ),
           ),
       )
       .handlePeriodicSyncJobStatus(this)
@@ -121,14 +103,34 @@ constructor(
   private fun Flow<PeriodicSyncJobStatus>.handlePeriodicSyncJobStatus(
     coroutineScope: CoroutineScope,
   ) {
-    this.onEach {
+    this.onEach { status ->
         syncListenerManager.onSyncListeners.forEach { onSyncListener ->
-          onSyncListener.onSync(
-            if (it.lastSyncJobStatus as? LastSyncJobStatus.Succeeded != null) {
-              CurrentSyncJobStatus.Succeeded((it.lastSyncJobStatus as LastSyncJobStatus).timestamp)
+          Timber.d("fhir sync worker...")
+
+          // Check if lastSyncJobStatus is not null and is of type Succeeded
+          val syncStatus =
+            if (status.lastSyncJobStatus as? LastSyncJobStatus.Succeeded != null) {
+              CurrentSyncJobStatus.Succeeded(
+                (status.lastSyncJobStatus as LastSyncJobStatus.Succeeded).timestamp,
+              )
             } else {
-              it.currentSyncJobStatus
-            },
+              status.currentSyncJobStatus
+            }
+
+          onSyncListener.onSync(syncStatus)
+        }
+
+        if (
+          status.currentSyncJobStatus is CurrentSyncJobStatus.Succeeded ||
+            status.lastSyncJobStatus is LastSyncJobStatus.Succeeded
+        ) {
+          Timber.d("Periodic sync succeeded. Triggering CustomSyncWorker...")
+          workManager.enqueue(
+            OneTimeWorkRequestBuilder<CustomSyncWorker>()
+              .setConstraints(
+                Constraints.Builder().setRequiredNetworkType(NetworkType.CONNECTED).build(),
+              )
+              .build(),
           )
         }
       }

android/quest/src/main/java/org/smartregister/fhircore/quest/ui/main/AppMainViewModel.kt

@@ -63,7 +63,6 @@ import org.smartregister.fhircore.engine.data.local.register.RegisterRepository
 import org.smartregister.fhircore.engine.domain.model.LauncherType
 import org.smartregister.fhircore.engine.domain.model.MultiSelectViewAction
 import org.smartregister.fhircore.engine.sync.CustomSyncState
-import org.smartregister.fhircore.engine.sync.CustomSyncWorker
 import org.smartregister.fhircore.engine.sync.CustomWorkerState
 import org.smartregister.fhircore.engine.sync.SyncBroadcaster
 import org.smartregister.fhircore.engine.task.FhirCarePlanGenerator
@@ -503,12 +502,6 @@ constructor(
         initialDelay = INITIAL_DELAY,
       )
 
-      schedulePeriodically<CustomSyncWorker>(
-        workId = CustomSyncWorker.WORK_ID,
-        repeatInterval = applicationConfiguration.syncInterval,
-        initialDelay = 0,
-      )
-
       measureReportConfigurations.forEach { measureReportConfig ->
         measureReportConfig.scheduledGenerationDuration?.let { scheduledGenerationDuration ->
           schedulePeriodically<MeasureReportMonthPeriodWorker>(

android/quest/src/main/java/org/smartregister/fhircore/quest/ui/shared/components/SyncStatusView.kt

@@ -339,57 +339,39 @@ fun SyncStatusView(
         }
       }
     }
-    if (isFailed && !minimized) {
-      Text(
-        text = stringResource(org.smartregister.fhircore.engine.R.string.retry),
-        modifier = Modifier.padding(start = 16.dp).clickable { onRetry() },
-        color = MaterialTheme.colors.primary,
-        fontWeight = FontWeight.SemiBold,
-      )
-    } else if (currentSyncJobStatus is CurrentSyncJobStatus.Running && !minimized) {
-      Text(
-        text = stringResource(org.smartregister.fhircore.engine.R.string.cancel),
-        modifier = Modifier.padding(start = 16.dp).clickable { onCancel() },
-        color = MaterialTheme.colors.primary,
-        fontWeight = FontWeight.SemiBold,
-      )
 
-      Row(
-        verticalAlignment = Alignment.CenterVertically,
-        modifier = Modifier.padding(start = 16.dp),
-      ) {
-        if (currentSyncJobStatus is CurrentSyncJobStatus.Running) {
-          LineSpinFadeLoaderProgressIndicator(
-            color = Color.White,
-            lineLength = 8f,
-            innerRadius = 12f,
-          )
-        }
-        if (
-          (currentSyncJobStatus is CurrentSyncJobStatus.Failed ||
-            currentSyncJobStatus is CurrentSyncJobStatus.Running) && !minimized
-        ) {
-          Text(
-            text =
-              stringResource(
-                if (currentSyncJobStatus is CurrentSyncJobStatus.Failed) {
-                  org.smartregister.fhircore.engine.R.string.retry
-                } else {
-                  org.smartregister.fhircore.engine.R.string.cancel
-                },
-              ),
-            modifier =
-              Modifier.padding(start = 16.dp).clickable {
-                if (currentSyncJobStatus is CurrentSyncJobStatus.Failed) {
-                  onRetry()
-                } else {
-                  onCancel()
-                }
+    Row(
+      verticalAlignment = Alignment.CenterVertically,
+      modifier = Modifier.padding(start = 16.dp),
+    ) {
+      if (currentSyncJobStatus is CurrentSyncJobStatus.Running) {
+        LineSpinFadeLoaderProgressIndicator(
+          color = Color.White,
+          lineLength = 8f,
+          innerRadius = 12f,
+        )
+      }
+      if ((isFailed || currentSyncJobStatus is CurrentSyncJobStatus.Running) && !minimized) {
+        Text(
+          text =
+            stringResource(
+              if (currentSyncJobStatus is CurrentSyncJobStatus.Failed) {
+                org.smartregister.fhircore.engine.R.string.retry
+              } else {
+                org.smartregister.fhircore.engine.R.string.cancel
               },
-            color = MaterialTheme.colors.primary,
-            fontWeight = FontWeight.SemiBold,
-          )
-        }
+            ),
+          modifier =
+            Modifier.padding(start = 16.dp).clickable {
+              if (currentSyncJobStatus is CurrentSyncJobStatus.Failed) {
+                onRetry()
+              } else {
+                onCancel()
+              }
+            },
+          color = MaterialTheme.colors.primary,
+          fontWeight = FontWeight.SemiBold,
+        )
       }
     }
   }
@@ -419,6 +401,7 @@ fun SyncStatusSucceededPreview() {
       SyncStatusView(
         isSyncUpload = false,
         currentSyncJobStatus = CurrentSyncJobStatus.Succeeded(OffsetDateTime.now()),
+        customSyncState = CustomSyncState.Success,
       )
     }
   }