Small refactor and TODO

google · Nov 27, 2024 · ee7ca26 · ee7ca26
1 parent 356e022
commit ee7ca26
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/ground/src/main/java/com/google/android/ground/persistence/sync/MediaUploadWorker.kt b/ground/src/main/java/com/google/android/ground/persistence/sync/MediaUploadWorker.kt
@@ -56,8 +56,7 @@ constructor(
 
   override suspend fun doWork(): Result =
     withContext(Dispatchers.IO) {
-      val mutations =
-        mutationRepository.getIncompleteMediaUploads().mapNotNull { it.submissionMutation }
+      val mutations = mutationRepository.getIncompleteMediaUploads()
       Timber.d("Uploading photos for ${mutations.size} submission mutations")
       val results = mutations.map { uploadAllMedia(it) }
       if (results.all { it }) success() else retry()

diff --git a/ground/src/main/java/com/google/android/ground/repository/MutationRepository.kt b/ground/src/main/java/com/google/android/ground/repository/MutationRepository.kt
@@ -78,11 +78,16 @@ constructor(
    * Return the set of photo/media upload queue entries not yet marked as completed, sorted in
    * chronological order (FIFO).
    */
-  suspend fun getIncompleteMediaUploads(): List<UploadQueueEntry> =
-    getUploadQueueFlow().first().filter {
-      setOf(MEDIA_UPLOAD_PENDING, MEDIA_UPLOAD_IN_PROGRESS, MEDIA_UPLOAD_AWAITING_RETRY)
-        .contains(it.uploadStatus)
-    }
+  suspend fun getIncompleteMediaUploads(): List<SubmissionMutation> =
+    getUploadQueueFlow()
+      .first()
+      .filter {
+        setOf(MEDIA_UPLOAD_PENDING, MEDIA_UPLOAD_IN_PROGRESS, MEDIA_UPLOAD_AWAITING_RETRY)
+          .contains(it.uploadStatus)
+      }
+      // TODO(https://github.com/google/ground-android/issues/2120):
+      //  Return [MediaMutations] instead once introduced.
+      .mapNotNull { it.submissionMutation }
 
   /**
    * Returns a [Flow] which emits the upload queue once and on each change, sorted in chronological