Skip to content

[stable-3.30] BugFix - Upload Current File Index #14328

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

Merged
tobiasKaminsky merged 2 commits into from
Jan 13, 2025
Merged

[stable-3.30] BugFix - Upload Current File Index #14328

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8641163
fix
alperozturk96 Dec 11, 2024
df41951
revert translation changes
alperozturk96 Dec 11, 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
9 changes: 7 additions & 2 deletions app/src/main/java/com/nextcloud/client/jobs/upload/FileUploadWorker.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ class FileUploadWorker(
}
}

private var currentUploadIndex: Int = 1
private var lastPercent = 0
private val notificationManager = UploadNotificationManager(context, viewThemeUtils)
private val intents = FileUploaderIntents(context)
Expand Down Expand Up @@ -164,7 +165,7 @@ class FileUploadWorker(
setWorkerState(user.get(), uploadsPerPage)

run uploads@{
uploadsPerPage.forEachIndexed { currentUploadIndex, upload ->
uploadsPerPage.forEach { upload ->
if (isStopped) {
return@uploads
}
Expand All @@ -178,12 +179,16 @@ class FileUploadWorker(
uploadFileOperation,
cancelPendingIntent = intents.startIntent(uploadFileOperation),
startIntent = intents.notificationStartIntent(uploadFileOperation),
currentUploadIndex = currentUploadIndex + 1,
currentUploadIndex = currentUploadIndex,
totalUploadSize = totalUploadSize
)

val result = upload(uploadFileOperation, user.get())

if (result.isSuccess) {
currentUploadIndex += 1
}

currentUploadFileOperation = null

fileUploaderDelegate.sendBroadcastUploadFinished(
Expand Down
Loading