Merge pull request #6971 from grzesiek2010/COLLECT-6937

Use NetworkRequest transport types for auto-send constraints

Author: seadowg

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

@@ -1,5 +1,7 @@
 package org.odk.collect.async
 
+import android.net.NetworkCapabilities
+import android.net.NetworkRequest
 import androidx.work.Constraints
 import androidx.work.Data
 import androidx.work.ExistingPeriodicWorkPolicy
@@ -57,14 +59,25 @@ class CoroutineAndWorkManagerScheduler(
         inputData: Map<String, String>,
         networkConstraint: Scheduler.NetworkType?
     ) {
-        val constraintNetworkType = when (networkConstraint) {
+        val networkRequest = NetworkRequest.Builder().apply {
+            addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
+
+            when (networkConstraint) {
+                Scheduler.NetworkType.WIFI -> addTransportType(NetworkCapabilities.TRANSPORT_WIFI)
+                Scheduler.NetworkType.CELLULAR -> addTransportType(NetworkCapabilities.TRANSPORT_CELLULAR)
+                else -> Unit
+            }
+        }.build()
+
+        val networkType = when (networkConstraint) {
             Scheduler.NetworkType.WIFI -> NetworkType.UNMETERED
             Scheduler.NetworkType.CELLULAR -> NetworkType.METERED
             else -> NetworkType.CONNECTED
         }
 
-        val constraints = Constraints.Builder()
-            .setRequiredNetworkType(constraintNetworkType)
+        val constraints = Constraints
+            .Builder()
+            .setRequiredNetworkRequest(networkRequest, networkType)
             .build()
 
         val workManagerInputData = Data.Builder()