Merge pull request #12516 from nextcloud/only_upload_for_right_account

Bugfix: Change database query to only return uploads for right account
nextcloud · Feb 14, 2024 · f59caa7 · f59caa7
2 parents 90f588d + 610ec1d
commit f59caa7
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/app/src/main/java/com/owncloud/android/datamodel/UploadsStorageManager.java b/app/src/main/java/com/owncloud/android/datamodel/UploadsStorageManager.java
@@ -569,7 +569,7 @@ public OCUpload[] getCurrentAndPendingUploadsForCurrentAccount() {
     }
 
     public OCUpload[] getCurrentAndPendingUploadsForAccount(final @NonNull String accountName) {
-        return getUploads(ProviderTableMeta.UPLOADS_STATUS + "==" + UploadStatus.UPLOAD_IN_PROGRESS.value +
+        return getUploads("( " + ProviderTableMeta.UPLOADS_STATUS + "==" + UploadStatus.UPLOAD_IN_PROGRESS.value +
                               " OR " + ProviderTableMeta.UPLOADS_LAST_RESULT +
                               "==" + UploadResult.DELAYED_FOR_WIFI.getValue() +
                               " OR " + ProviderTableMeta.UPLOADS_LAST_RESULT +
@@ -578,7 +578,7 @@ public OCUpload[] getCurrentAndPendingUploadsForAccount(final @NonNull String ac
                               "==" + UploadResult.DELAYED_FOR_CHARGING.getValue() +
                               " OR " + ProviderTableMeta.UPLOADS_LAST_RESULT +
                               "==" + UploadResult.DELAYED_IN_POWER_SAVE_MODE.getValue() +
-                              " AND " + ProviderTableMeta.UPLOADS_ACCOUNT_NAME + "== ?",
+                              " ) AND " + ProviderTableMeta.UPLOADS_ACCOUNT_NAME + "== ?",
                           accountName);
     }
 
@@ -588,7 +588,7 @@ public OCUpload[] getCurrentAndPendingUploadsForAccount(final @NonNull String ac
      * If <code>afterId</code> is -1, returns the first page
      */
     public List<OCUpload> getCurrentAndPendingUploadsForAccountPageAscById(final long afterId, final @NonNull String accountName) {
-        final String selection = ProviderTableMeta.UPLOADS_STATUS + "==" + UploadStatus.UPLOAD_IN_PROGRESS.value +
+        final String selection = "( " + ProviderTableMeta.UPLOADS_STATUS + "==" + UploadStatus.UPLOAD_IN_PROGRESS.value +
             " OR " + ProviderTableMeta.UPLOADS_LAST_RESULT +
             "==" + UploadResult.DELAYED_FOR_WIFI.getValue() +
             " OR " + ProviderTableMeta.UPLOADS_LAST_RESULT +
@@ -597,7 +597,7 @@ public List<OCUpload> getCurrentAndPendingUploadsForAccountPageAscById(final lon
             "==" + UploadResult.DELAYED_FOR_CHARGING.getValue() +
             " OR " + ProviderTableMeta.UPLOADS_LAST_RESULT +
             "==" + UploadResult.DELAYED_IN_POWER_SAVE_MODE.getValue() +
-            " AND " + ProviderTableMeta.UPLOADS_ACCOUNT_NAME + "== ?";
+            " ) AND " + ProviderTableMeta.UPLOADS_ACCOUNT_NAME + "== ?";
         return getUploadPage(afterId, false, selection, accountName);
     }