mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-27 09:39:25 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fix sync icon for downloads in queue

Browse source 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
This commit is contained in:
alperozturk 2024-01-08 13:06:33 +01:00 committed by Alper Öztürk
parent dbf8ca9394
commit b5a57fc55b
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/com/nextcloud/client/files/downloader/FileDownloadHelper.kt
View file

@ -60,7 +60,7 @@ class FileDownloadHelper {
return false
}
return FileDownloadWorker.isDownloading(user, file) ||
return FileDownloadWorker.isFileInQueue(file) ||
(file.isFolder && backgroundJobManager.isStartFileDownloadJobScheduled(user, file))
}

11
app/src/main/java/com/nextcloud/client/files/downloader/FileDownloadWorker.kt
View file

@ -66,6 +66,7 @@ class FileDownloadWorker(
private val TAG = FileDownloadWorker::class.java.simpleName
private var currentDownload: DownloadFileOperation? = null
private var pendingDownloadFileIds: ArrayList<Long> = arrayListOf()
private val lock = Any()
const val FILES_SEPARATOR = ","
@ -84,10 +85,8 @@ class FileDownloadWorker(
const val EXTRA_LINKED_TO_PATH = "EXTRA_LINKED_TO_PATH"
const val EXTRA_ACCOUNT_NAME = "EXTRA_ACCOUNT_NAME"
fun isDownloading(user: User, file: OCFile): Boolean {
synchronized(lock) {
return currentDownload?.isActive(user, file) ?: false
}
fun isFileInQueue(file: OCFile): Boolean {
return pendingDownloadFileIds.contains(file.fileId)
}
fun cancelCurrentDownload(user: User, file: OCFile) {
@ -144,6 +143,7 @@ class FileDownloadWorker(
} catch (t: Throwable) {
notificationManager.showCompleteNotification(context.getString(R.string.downloader_unexpected_error))
Log_OC.e(TAG, "Error caught at FilesDownloadWorker(): " + t.localizedMessage)
setIdleWorkerState()
Result.failure()
}
}
@ -166,6 +166,7 @@ class FileDownloadWorker(
private fun setIdleWorkerState() {
failedFileNames.clear()
pendingDownloads.all.clear()
pendingDownloadFileIds.clear()
currentDownload = null
WorkerStateLiveData.instance().setWorkState(WorkerState.Idle)
}
@ -234,6 +235,7 @@ class FileDownloadWorker(
file.remotePath,
operation
)
pendingDownloadFileIds.add(file.fileId)
if (downloadKey != null) {
requestedDownloads.add(downloadKey)
@ -382,6 +384,7 @@ class FileDownloadWorker(
currentDownload?.user?.accountName,
currentDownload?.remotePath
)
pendingDownloadFileIds.remove(currentDownload?.file?.fileId)
val downloadResult = result ?: RemoteOperationResult<Any?>(RuntimeException("Error downloading…"))