mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-12-19 07:22:06 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #14162 from nextcloud/bugfix/upload-current-file-index

Browse source 
BugFix - Upload Current File Index
This commit is contained in:
Tobias Kaminsky 2024-12-16 09:36:14 +01:00 committed by GitHub
commit 907cd130e0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/src/main/java/com/nextcloud/client/jobs/upload/FileUploadWorker.kt
View file

@ -90,6 +90,7 @@ class FileUploadWorker(
} }
} }
private var currentUploadIndex: Int = 1
private var lastPercent = 0 private var lastPercent = 0
private val notificationManager = UploadNotificationManager(context, viewThemeUtils) private val notificationManager = UploadNotificationManager(context, viewThemeUtils)
private val intents = FileUploaderIntents(context) private val intents = FileUploaderIntents(context)
@ -167,7 +168,7 @@ class FileUploadWorker(
setWorkerState(user.get(), uploadsPerPage) setWorkerState(user.get(), uploadsPerPage)
run uploads@{ run uploads@{
uploadsPerPage.forEachIndexed { currentUploadIndex, upload -> uploadsPerPage.forEach { upload ->
if (isStopped) { if (isStopped) {
return@uploads return@uploads
} }
@ -181,12 +182,16 @@ class FileUploadWorker(
uploadFileOperation, uploadFileOperation,
cancelPendingIntent = intents.startIntent(uploadFileOperation), cancelPendingIntent = intents.startIntent(uploadFileOperation),
startIntent = intents.notificationStartIntent(uploadFileOperation), startIntent = intents.notificationStartIntent(uploadFileOperation),
currentUploadIndex = currentUploadIndex + 1, currentUploadIndex = currentUploadIndex,
totalUploadSize = totalUploadSize totalUploadSize = totalUploadSize
) )
val result = upload(uploadFileOperation, user.get()) val result = upload(uploadFileOperation, user.get())
if (result.isSuccess) {
currentUploadIndex += 1
}
currentUploadFileOperation = null currentUploadFileOperation = null
fileUploaderDelegate.sendBroadcastUploadFinished( fileUploaderDelegate.sendBroadcastUploadFinished(