Pass isCancelled to sendInstances instead of making it suspend

Author: grzesiek2010

collect_app/src/main/java/org/odk/collect/android/instancemanagement/InstancesDataService.kt

@@ -1,8 +1,6 @@
 package org.odk.collect.android.instancemanagement
 
-import kotlinx.coroutines.currentCoroutineContext
 import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.isActive
 import org.odk.collect.analytics.Analytics
 import org.odk.collect.android.analytics.AnalyticsEvents
 import org.odk.collect.android.analytics.AnalyticsUtils
@@ -218,19 +216,19 @@ class InstancesDataService(
         }
     }
 
-    suspend fun sendInstances(
+    fun sendInstances(
         projectId: String,
         instances: List<Instance>,
         referrer: String,
         overrideURL: String?,
         externalDeleteAfterUpload: Boolean?,
         defaultSuccessMessage: String,
+        isCancelled: () -> Boolean = { false },
         onProgress: (current: Int, total: Int) -> Unit = { _, _ -> }
     ): List<InstanceUploadResult> {
         val projectDependencyModule = projectDependencyModuleFactory.create(projectId)
-        val coroutineContext = currentCoroutineContext()
 
-        return projectDependencyModule.instancesLock.withLockSuspend { acquiredLock: Boolean ->
+        return projectDependencyModule.instancesLock.withLock { acquiredLock: Boolean ->
             if (acquiredLock) {
                 val result = instanceSubmitter.submitInstances(
                     projectId,
@@ -240,7 +238,7 @@ class InstancesDataService(
                     cancelAfterAuthException = true,
                     externalDeleteAfterUpload = externalDeleteAfterUpload,
                     defaultSuccessMessage = defaultSuccessMessage,
-                    isCancelled = { !coroutineContext.isActive },
+                    isCancelled = isCancelled,
                     onProgress = onProgress
                 )
 

collect_app/src/main/java/org/odk/collect/android/instancemanagement/send/InstanceUploaderViewModel.kt

@@ -6,6 +6,7 @@ import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import kotlinx.coroutines.Job
+import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
 import org.odk.collect.android.instancemanagement.InstancesDataService
 import org.odk.collect.android.utilities.WebCredentialsUtils
@@ -53,6 +54,7 @@ class InstanceUploadViewModel(
                 externalUrl,
                 externalDeleteAfterUpload,
                 defaultSuccessMessage,
+                isCancelled = { !isActive },
             ) { current, total ->
                 _state.postValue(UploadState.Progress(current, total))
             }

collect_app/src/test/java/org/odk/collect/android/instancemanagement/send/InstanceUploadViewModelTest.kt

@@ -115,7 +115,7 @@ class InstanceUploadViewModelTest {
             "Waiting"
         )
         viewModel.upload(listOf(instance.dbId))
-        dispatcherProvider.runBackground()
+        dispatcherProvider.flush()
 
         assertThat(submittedInstances.isEmpty(), equalTo(true))
     }

shared/src/main/java/org/odk/collect/shared/locks/ChangeLock.kt

@@ -20,18 +20,6 @@ interface ChangeLock {
         }
     }
 
-    suspend fun <T> withLockSuspend(function: suspend (Boolean) -> T): T {
-        val acquired = tryLock(DEFAULT_TOKEN)
-
-        return try {
-            function(acquired)
-        } finally {
-            if (acquired) {
-                unlock(DEFAULT_TOKEN)
-            }
-        }
-    }
-
     fun tryLock(token: Any): Boolean
 
     fun unlock(token: Any)