Skip to content
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

Jump to bottom

Improve retry failed uploads function #12911

Merged
merged 6 commits into from
May 2, 2024
Merged

Improve retry failed uploads function #12911

Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
57e11f8
Make retry filed uploads not restart worker for every file
JonasMayerDev Apr 18, 2024
77a1ead
Simplify function and remove nested loop
JonasMayerDev Apr 18, 2024
b724f75
Merge branch 'master' into improve-retry-failed-uploads-function
JonasMayerDev Apr 22, 2024
f8b5ac0
Merge branch 'master' into improve-retry-failed-uploads-function
JonasMayerDev Apr 22, 2024
62ef463
Merge branch 'master' into improve-retry-failed-uploads-function
JonasMayerDev Apr 30, 2024
b2b6a29
fix spotless
JonasMayerDev Apr 30, 2024
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
14 changes: 9 additions & 5 deletions app/src/main/java/com/nextcloud/client/jobs/upload/FileUploadHelper.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,11 +123,9 @@ class FileUploadHelper {
val isPowerSaving = powerManagementService.isPowerSavingEnabled
var uploadUser = Optional.empty<User>()


for (failedUpload in failedUploads) {
// 1. extract failed upload owner account and cache it between loops (expensive query)
if (!uploadUser.isPresent || !uploadUser.get().nameEquals(failedUpload.accountName)) {
uploadUser = accountManager.getUser(failedUpload.accountName)
}

val isDeleted = !File(failedUpload.localPath).exists()
if (isDeleted) {
showNotExistMessage = true
Expand All @@ -141,10 +139,16 @@ class FileUploadHelper {
canUploadBeRetried(failedUpload, gotWifi, charging) && !connectivityService.isInternetWalled
) {
// 2B. for existing local files, try restarting it if possible
retryUpload(failedUpload, uploadUser.get())
failedUpload.uploadStatus = UploadStatus.UPLOAD_IN_PROGRESS
uploadsStorageManager.updateUpload(failedUpload)
}
}

accountManager.accounts.forEach {
val user = accountManager.getUser(it.name)
if (user.isPresent) backgroundJobManager.startFilesUploadJob(user.get())
}

return showNotExistMessage
}

Expand Down
Loading