Improved current implementation

app/src/main/java/fr/free/nrw/commons/contributions/ContributionDao.java

@@ -47,17 +47,17 @@ public abstract class ContributionDao {
     @Delete
     public abstract void deleteSynchronous(Contribution contribution);
 
-    @Delete
+    @Query("DELETE FROM contribution WHERE state IN (:states)")
-    public abstract void deleteContributionsSynchronous(List<Contribution> contributions);
+    public abstract void deleteContributionsWithStatesSynchronous(List<Integer> states) throws SQLiteException;
 
     public Completable delete(final Contribution contribution) {
         return Completable
             .fromAction(() -> deleteSynchronous(contribution));
     }
 
-    public Completable deleteContributions(final List<Contribution> contributions) {
+    public Completable deleteContributionsWithStates(List<Integer> states) {
         return Completable
-            .fromAction(() -> deleteContributionsSynchronous(contributions));
+            .fromAction(() -> deleteContributionsWithStatesSynchronous(states));
     }
 
     @Query("SELECT * from contribution WHERE media_filename=:fileName")

app/src/main/java/fr/free/nrw/commons/contributions/ContributionsLocalDataSource.java

@@ -64,8 +64,8 @@ class ContributionsLocalDataSource {
         return contributionDao.delete(contribution);
     }
 
-    public Completable deleteContributions(final List<Contribution> contributions) {
+    public Completable deleteContributionsWithStates(List<Integer> states) {
-        return contributionDao.deleteContributions(contributions);
+        return contributionDao.deleteContributionsWithStates(states);
     }
 
     public Factory<Integer, Contribution> getContributions() {

app/src/main/java/fr/free/nrw/commons/contributions/ContributionsRepository.java

@@ -36,8 +36,8 @@ public class ContributionsRepository {
         return localDataSource.deleteContribution(contribution);
     }
 
-    public Completable deleteContributionsFromDB(List<Contribution> contributions) {
+    public Completable deleteContributionsFromDBWithStates(List<Integer> states) {
-        return localDataSource.deleteContributions(contributions);
+        return localDataSource.deleteContributionsWithStates(states);
     }
 
     /**

app/src/main/java/fr/free/nrw/commons/upload/FailedUploadsFragment.kt

@@ -197,7 +197,7 @@ class FailedUploadsFragment : CommonsDaggerSupportFragment(), PendingUploadsCont
                     ViewUtil.showShortToast(context, R.string.cancelling_upload)
                     uploadProgressActivity.hidePendingIcons()
                     pendingUploadsPresenter.deleteUploads(
-                        contributionsList,
+                        listOf(Contribution.STATE_FAILED),
                         this.requireContext().applicationContext
                     )
                 },

app/src/main/java/fr/free/nrw/commons/upload/PendingUploadsAdapter.kt

@@ -86,7 +86,6 @@ class PendingUploadsAdapter(private val callback: Callback) :
         }
 
         fun bindState(state: Int) {
-            Timber.tag("PRINT").e("State is: "+state)
             if (state == Contribution.STATE_QUEUED || state == Contribution.STATE_PAUSED) {
                 errorTextView.text = "Queued"
                 errorTextView.visibility = View.VISIBLE
@@ -98,7 +97,6 @@ class PendingUploadsAdapter(private val callback: Callback) :
         }
 
         fun bindProgress(transferred: Long, total: Long, state: Int) {
-            Timber.tag("PRINT").e("State is2: "+state)
             if (transferred == 0L) {
                 errorTextView.text = "Queued"
                 errorTextView.visibility = View.VISIBLE

app/src/main/java/fr/free/nrw/commons/upload/PendingUploadsFragment.kt

@@ -220,7 +220,7 @@ class PendingUploadsFragment : CommonsDaggerSupportFragment(), PendingUploadsCon
                     ViewUtil.showShortToast(context, R.string.cancelling_upload)
                     uploadProgressActivity.hidePendingIcons()
                     pendingUploadsPresenter.deleteUploads(
-                        contributionsList,
+                        listOf(Contribution.STATE_QUEUED, Contribution.STATE_IN_PROGRESS, Contribution.STATE_PAUSED),
                         this.requireContext().applicationContext
                     )
                 },

app/src/main/java/fr/free/nrw/commons/upload/PendingUploadsPresenter.java

@@ -136,9 +136,9 @@ public class PendingUploadsPresenter implements UserActionListener {
             ));
     }
 
-    public void deleteUploads(List<Contribution> contributionList, Context context) {
+    public void deleteUploads(List<Integer> states, Context context) {
         compositeDisposable.add(repository
-            .deleteContributionsFromDB(contributionList)
+            .deleteContributionsFromDBWithStates(states)
             .subscribeOn(ioThreadScheduler)
             .subscribe(() ->
                 WorkRequestHelper.Companion.makeOneTimeWorkRequest(

app/src/main/java/fr/free/nrw/commons/upload/worker/UploadWorker.kt

@@ -177,6 +177,8 @@ class UploadWorker(var appContext: Context, workerParams: WorkerParameters) :
             CommonsApplication.NOTIFICATION_CHANNEL_ID_ALL
         )!!
         withContext(Dispatchers.IO) {
+
+            //TODO: Implement Worker Flags
             /*
                 queuedContributions receives the results from a one-shot query.
                 This means that once the list has been fetched from the database,
@@ -187,6 +189,9 @@ class UploadWorker(var appContext: Context, workerParams: WorkerParameters) :
                 https://github.com/commons-app/apps-android-commons/issues/5136
                 https://github.com/commons-app/apps-android-commons/issues/5346
              */
+            while (contributionDao.getContribution(statesToProcess)
+                    .blockingGet().size > 0
+            ) {
                 val queuedContributions = contributionDao.getContribution(statesToProcess)
                     .blockingGet()
                 //Showing initial notification for the number of uploads being processed
@@ -205,7 +210,8 @@ class UploadWorker(var appContext: Context, workerParams: WorkerParameters) :
                     processingUploads.build()
                 )
 
-            val sortedQueuedContributionsList: List<Contribution> = queuedContributions.sortedBy { it.dateUploadStartedInMillis() }
+                val sortedQueuedContributionsList: List<Contribution> =
+                    queuedContributions.sortedBy { it.dateUploadStartedInMillis() }
 
                 /**
                  * To avoid race condition when multiple of these workers are working, assign this state
@@ -226,7 +232,7 @@ class UploadWorker(var appContext: Context, workerParams: WorkerParameters) :
                     countUpload++
                     uploadContribution(contribution = contribution)
                 }
-
+            }
             //Dismiss the global notification
             notificationManager?.cancel(
                 PROCESSING_UPLOADS_NOTIFICATION_TAG,