set work request as expedited

commons-app · Jul 16, 2023 · 6b9e5ab · 6b9e5ab
1 parent 2dd2be1
commit 6b9e5ab
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 3 deletions.
diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsPresenter.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsPresenter.java
@@ -2,6 +2,7 @@
 
 import androidx.work.ExistingWorkPolicy;
 import androidx.work.OneTimeWorkRequest;
+import androidx.work.OutOfQuotaPolicy;
 import androidx.work.WorkManager;
 import fr.free.nrw.commons.MediaDataExtractor;
 import fr.free.nrw.commons.contributions.ContributionsContract.UserActionListener;
@@ -77,10 +78,14 @@ public void saveContribution(Contribution contribution) {
             .save(contribution)
             .subscribeOn(ioThreadScheduler)
             .subscribe(() -> {
+                OneTimeWorkRequest updatedUploadRequest = new OneTimeWorkRequest
+                    .Builder(UploadWorker.class)
+                    .setExpedited(OutOfQuotaPolicy.RUN_AS_NON_EXPEDITED_WORK_REQUEST)
+                    .build();
                 WorkManager.getInstance(view.getContext().getApplicationContext())
                     .enqueueUniqueWork(
                         UploadWorker.class.getSimpleName(),
-                        ExistingWorkPolicy.KEEP, OneTimeWorkRequest.from(UploadWorker.class));
+                        ExistingWorkPolicy.KEEP, updatedUploadRequest);
             }));
     }
 }
diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/MainActivity.java b/app/src/main/java/fr/free/nrw/commons/contributions/MainActivity.java
@@ -20,6 +20,7 @@
 import androidx.fragment.app.FragmentManager;
 import androidx.work.ExistingWorkPolicy;
 import androidx.work.OneTimeWorkRequest;
+import androidx.work.OutOfQuotaPolicy;
 import androidx.work.WorkManager;
 import butterknife.BindView;
 import butterknife.ButterKnife;
@@ -389,9 +390,13 @@ public void toggleLimitedConnectionMode() {
             viewUtilWrapper
                 .showShortToast(getBaseContext(), getString(R.string.limited_connection_enabled));
         } else {
+            OneTimeWorkRequest restartUploadsRequest = new OneTimeWorkRequest
+                                .Builder(UploadWorker.class)
+                                .setExpedited(OutOfQuotaPolicy.RUN_AS_NON_EXPEDITED_WORK_REQUEST)
+                                .build();
             WorkManager.getInstance(getApplicationContext()).enqueueUniqueWork(
                 UploadWorker.class.getSimpleName(),
-                ExistingWorkPolicy.APPEND_OR_REPLACE, OneTimeWorkRequest.from(UploadWorker.class));
+                ExistingWorkPolicy.APPEND_OR_REPLACE, restartUploadsRequest);
 
             viewUtilWrapper
                 .showShortToast(getBaseContext(), getString(R.string.limited_connection_disabled));

diff --git a/app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.java b/app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.java
@@ -26,6 +26,7 @@
 import androidx.viewpager.widget.ViewPager;
 import androidx.work.ExistingWorkPolicy;
 import androidx.work.OneTimeWorkRequest;
+import androidx.work.OutOfQuotaPolicy;
 import androidx.work.WorkManager;
 import butterknife.BindView;
 import butterknife.ButterKnife;
@@ -317,9 +318,13 @@ public void updateTopCardTitle() {
 
     @Override
     public void makeUploadRequest() {
+        OneTimeWorkRequest uploadRequest = new OneTimeWorkRequest
+            .Builder(UploadWorker.class)
+            .setExpedited(OutOfQuotaPolicy.RUN_AS_NON_EXPEDITED_WORK_REQUEST)
+            .build();
         WorkManager.getInstance(getApplicationContext()).enqueueUniqueWork(
             UploadWorker.class.getSimpleName(),
-            ExistingWorkPolicy.APPEND_OR_REPLACE, OneTimeWorkRequest.from(UploadWorker.class));
+            ExistingWorkPolicy.APPEND_OR_REPLACE, uploadRequest);
     }
 
     @Override

diff --git a/app/src/main/java/fr/free/nrw/commons/upload/worker/UploadWorker.kt b/app/src/main/java/fr/free/nrw/commons/upload/worker/UploadWorker.kt
@@ -13,6 +13,7 @@ import androidx.work.CoroutineWorker
 import androidx.work.Data
 import androidx.work.WorkerParameters
 import androidx.multidex.BuildConfig
+import androidx.work.ForegroundInfo
 import dagger.android.ContributesAndroidInjector
 import fr.free.nrw.commons.CommonsApplication
 import fr.free.nrw.commons.Media
@@ -228,6 +229,14 @@ class UploadWorker(var appContext: Context, workerParams: WorkerParameters) :
         return Result.success()
     }
 
+    override suspend fun getForegroundInfo(): ForegroundInfo {
+        // TODO: handle notifications for older Android versions
+        return ForegroundInfo(
+            1,
+            curentNotification.build()
+        )
+    }
+
     /**
      * Returns true is the limited connection mode is enabled
      */