minimum progress

Author: thomasvo

android/src/main/java/com/vydia/RNUploader/Notification.kt

@@ -58,9 +58,13 @@ object UploadNotification {
 
   // builds the notification required to enable Foreground mode
   fun build(context: Context): Notification {
-    // since all workers share the same notification ID,
-    // get the active upload so we don't overwrite the notification when multiple uploads are running
-    val wifiOnly = getActiveUpload()?.wifiOnly ?: false
+    // Determine wifiOnly preference for connectivity check:
+    // - If an upload is actively running, use its preference
+    // - Otherwise, check the queue: if ANY upload can proceed with just mobile data (wifiOnly=false),
+    //   we only need internet to make progress. If ALL uploads need WiFi, we need WiFi.
+    //   This ensures the notification ("Waiting for internet" vs "Waiting for WiFi") reflects
+    //   the minimum connectivity required to make progress.
+    val wifiOnly = getActiveUpload()?.wifiOnly ?: !UploadProgress.hasNonWifiOnlyUploads()
     val channel = channel
     val progress = UploadProgress.total()
     val progress2Decimals = "%.2f".format(progress)

android/src/main/java/com/vydia/RNUploader/UploadProgress.kt

@@ -8,6 +8,7 @@ object UploadProgress {
   private data class Progress(
     var bytesUploaded: Long,
     val size: Long,
+    val wifiOnly: Boolean,
     var complete: Boolean = false
   ) {
     fun complete() {
@@ -19,8 +20,8 @@ object UploadProgress {
   private val map = mutableMapOf<String, Progress>()
 
   @Synchronized
-  fun add(id: String, size: Long) {
-    map[id] = Progress(bytesUploaded = 0L, size = size)
+  fun add(id: String, size: Long, wifiOnly: Boolean) {
+    map[id] = Progress(bytesUploaded = 0L, size = size, wifiOnly = wifiOnly)
   }
 
   @Synchronized
@@ -55,4 +56,16 @@ object UploadProgress {
   private fun clearIfCompleted() {
     if (map.values.all { it.complete }) map.clear()
   }
+
+  /**
+   * Returns true if any incomplete upload can proceed without WiFi (wifiOnly=false).
+   * Used to determine notification text when no upload is actively running:
+   * - If true: at least one upload only needs mobile data, so show "Waiting for internet"
+   * - If false: all uploads need WiFi, so show "Waiting for WiFi"
+   * This ensures the notification reflects the minimum connectivity needed to make progress.
+   */
+  @Synchronized
+  fun hasNonWifiOnlyUploads(): Boolean {
+    return map.values.any { !it.complete && !it.wifiOnly }
+  }
 }