Skip to content

fix(auto-upload): start auto upload right after resuming global upload pause #17806

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ToteMeiSter wants to merge 2 commits into
base: master
Choose a base branch
from
+14 −1
Open

fix(auto-upload): start auto upload right after resuming global upload pause #17806

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
60a2c23
fix(auto-upload): start auto upload right after resuming global uploa…
ToteMeiSter Oct 12, 2026
3941570
test(auto-upload): remove UploadListMenuProvider unit test
ToteMeiSter Nov 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion app/src/main/java/com/owncloud/android/ui/fragment/uploadList/UploadListFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,9 @@ class UploadListFragment :
activity,
preferences,
userAccountManager,
uploadsStorageManager
uploadsStorageManager,
syncedFolderProvider,
backgroundJobManager
) { uploadListAdapter.notifyDataSetChanged() }

activity.addMenuProvider(menuProvider, viewLifecycleOwner, Lifecycle.State.RESUMED)
Expand Down
11 changes: 11 additions & 0 deletions app/src/main/java/com/owncloud/android/ui/fragment/uploadList/UploadListMenuProvider.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,23 @@ import android.view.MenuInflater
import android.view.MenuItem
import androidx.core.view.MenuProvider
import com.nextcloud.client.account.UserAccountManager
import com.nextcloud.client.jobs.BackgroundJobManager
import com.nextcloud.client.jobs.upload.AlbumFileUploadWorker
import com.nextcloud.client.jobs.upload.FileUploadHelper
import com.nextcloud.client.jobs.upload.FileUploadWorker
import com.nextcloud.client.preferences.AppPreferences
import com.owncloud.android.R
import com.owncloud.android.datamodel.SyncedFolderProvider
import com.owncloud.android.datamodel.UploadsStorageManager
import com.owncloud.android.utils.FilesSyncHelper

class UploadListMenuProvider(
private val context: Context,
private val preferences: AppPreferences,
private val userAccountManager: UserAccountManager,
private val uploadsStorageManager: UploadsStorageManager,
private val syncedFolderProvider: SyncedFolderProvider,
private val backgroundJobManager: BackgroundJobManager,
private val onGlobalPauseToggled: () -> Unit
) : MenuProvider {

Expand Down Expand Up @@ -61,6 +66,12 @@ class UploadListMenuProvider(
if (paused) {
FileUploadWorker.pauseActiveUploads()
AlbumFileUploadWorker.pauseActiveUploads()
} else {
FilesSyncHelper.startAutoUploadForEnabledSyncedFolders(
syncedFolderProvider,
backgroundJobManager,
overridePowerSaving = false
)
}

val uploadHelper = FileUploadHelper.instance()
Expand Down
Loading