Merge pull request #6900 from seadowg/error-notification

Don't retry tasks when running in foreground

Author: grzesiek2010

async/src/main/java/org/odk/collect/async/TaskSpecWorker.kt

@@ -61,12 +61,12 @@ class TaskSpecWorker(
 
         try {
             val completed =
-                taskSpec.getTask(applicationContext, stringInputData, isLastUniqueExecution(taskSpec)) { isStopped }.get()
+                taskSpec.getTask(applicationContext, stringInputData, foreground || isLastUniqueExecution(taskSpec)) { isStopped }.get()
             val maxRetries = taskSpec.maxRetries
 
             return if (completed) {
                 Result.success()
-            } else if (maxRetries == null || runAttemptCount < maxRetries) {
+            } else if (!foreground && (maxRetries == null || runAttemptCount < maxRetries)) {
                 Result.retry()
             } else {
                 Result.failure()

collect_app/src/main/java/org/odk/collect/android/formlists/blankformlist/BlankFormListViewModel.kt

@@ -211,7 +211,7 @@ class BlankFormListViewModel(
         private const val SYNC_NOTIFICATION_CHANNEL = "form_updates"
         private const val SYNC_NOTIFICATION_CHANNEL_NAME = "Form updates"
 
-        private const val SYNC_NOTIFICATION_ID = 1
+        private const val SYNC_NOTIFICATION_ID = 3
 
         private fun getSyncTag(projectId: String): String {
             return "match_exactly_foreground:$projectId"