android/app/src/main/java/com/fabledsword/inkwell/SyncSchedule.kt

@@ -9,6 +9,7 @@ import androidx.work.NetworkType
 import androidx.work.OneTimeWorkRequestBuilder
 import androidx.work.PeriodicWorkRequestBuilder
 import androidx.work.WorkManager
+import androidx.work.WorkRequest
 import java.util.concurrent.TimeUnit
 
 /**
@@ -38,8 +39,7 @@ object SyncSchedule {
     fun enable(context: Context) {
         val request =
             PeriodicWorkRequestBuilder<SyncWorker>(PERIOD_MINUTES, TimeUnit.MINUTES)
-                .setConstraints(networkRequired())
-                .setBackoffCriteria(BackoffPolicy.EXPONENTIAL, BACKOFF_SECONDS, TimeUnit.SECONDS)
+                .online()
                 .build()
 
         // UPDATE, not KEEP: this is called on every launch, and KEEP would ignore
@@ -68,8 +68,7 @@ object SyncSchedule {
     fun pushSoon(context: Context) {
         val request =
             OneTimeWorkRequestBuilder<SyncWorker>()
-                .setConstraints(networkRequired())
-                .setBackoffCriteria(BackoffPolicy.EXPONENTIAL, BACKOFF_SECONDS, TimeUnit.SECONDS)
+                .online()
                 .build()
 
         // REPLACE rather than KEEP: if an earlier attempt is sitting in a long
@@ -79,11 +78,14 @@ object SyncSchedule {
             .enqueueUniqueWork(PUSH, ExistingWorkPolicy.REPLACE, request)
     }
 
-    private fun networkRequired(): Constraints =
-        Constraints
-            .Builder()
-            .setRequiredNetworkType(NetworkType.CONNECTED)
-            .build()
+    /** What both requests share: a network to run on, and the same backoff. */
+    private fun <B : WorkRequest.Builder<B, *>> B.online(): B =
+        setConstraints(
+            Constraints
+                .Builder()
+                .setRequiredNetworkType(NetworkType.CONNECTED)
+                .build(),
+        ).setBackoffCriteria(BackoffPolicy.EXPONENTIAL, BACKOFF_SECONDS, TimeUnit.SECONDS)
 
     private const val PERIODIC = "inkwell-periodic-sync"
     private const val PUSH = "inkwell-push-pending"