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

Fix cancel

Browse source 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
This commit is contained in:
alperozturk 2024-01-09 11:16:10 +01:00 committed by Alper Öztürk
parent f9d330575f
commit 7a0c591926
2 changed files with 7 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -21,8 +21,6 @@
package com.nextcloud.client.files.downloader
import android.content.Intent
import androidx.localbroadcastmanager.content.LocalBroadcastManager
import com.nextcloud.client.account.User
import com.nextcloud.client.jobs.BackgroundJobManager
import com.owncloud.android.MainApp
@ -69,8 +67,7 @@ class FileDownloadHelper {
fun cancelPendingOrCurrentDownloads(user: User?, file: OCFile?) {
if (user == null || file == null) return
FileDownloadWorker.pauseWork()
sendCancelEvent(user, file)
FileDownloadWorker.cancelOperation(user.accountName, file.fileId)
backgroundJobManager.cancelFilesDownloadJob(user, file.fileId)
}
@ -85,18 +82,10 @@ class FileDownloadHelper {
}
currentDownload.cancel()
sendCancelEvent(currentUser, currentFile)
FileDownloadWorker.cancelOperation(currentUser.accountName, currentFile.fileId)
backgroundJobManager.cancelFilesDownloadJob(currentUser, currentFile.fileId)
}
private fun sendCancelEvent(user: User, file: OCFile) {
val intent = Intent(FileDownloadWorker.CANCEL_EVENT).apply {
putExtra(FileDownloadWorker.EVENT_ACCOUNT_NAME, user.accountName)
putExtra(FileDownloadWorker.EVENT_FILE_ID, file.fileId)
}
LocalBroadcastManager.getInstance(MainApp.getAppContext()).sendBroadcast(intent)
}
fun saveFile(
file: OCFile,
currentDownload: DownloadFileOperation?,

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

@ -25,10 +25,7 @@ import android.accounts.Account
import android.accounts.AccountManager
import android.accounts.OnAccountsUpdateListener
import android.app.PendingIntent
import android.content.BroadcastReceiver
import android.content.Context
import android.content.Intent
import android.content.IntentFilter
import androidx.core.util.component1
import androidx.core.util.component2
import androidx.localbroadcastmanager.content.LocalBroadcastManager
@ -55,7 +52,6 @@ import com.owncloud.android.utils.theme.ViewThemeUtils
import java.security.SecureRandom
import java.util.AbstractList
import java.util.Vector
import java.util.concurrent.atomic.AtomicBoolean
@Suppress("LongParameterList", "TooManyFunctions")
class FileDownloadWorker(
@ -69,20 +65,14 @@ class FileDownloadWorker(
companion object {
private val TAG = FileDownloadWorker::class.java.simpleName
private val shouldContinueExecution = AtomicBoolean(true)
private val pendingDownloads = IndexedForest<DownloadFileOperation>()
fun pauseWork() {
shouldContinueExecution.set(false)
fun cancelOperation(accountName: String, fileId: Long) {
pendingDownloads.all.forEach {
it.value.payload?.cancelMatchingOperation(accountName, fileId)
}
}
fun resumeWork() {
shouldContinueExecution.set(true)
}
const val CANCEL_EVENT = "CANCEL_EVENT"
const val EVENT_ACCOUNT_NAME = "EVENT_ACCOUNT_NAME"
const val EVENT_FILE_ID = "EVENT_FILE_ID"
const val FILES_SEPARATOR = ","
const val FOLDER_REMOTE_PATH = "FOLDER_REMOTE_PATH"
const val FILE_REMOTE_PATH = "FILE_REMOTE_PATH"
@ -109,7 +99,6 @@ class FileDownloadWorker(
}
private var currentDownload: DownloadFileOperation? = null
private val pendingDownloads = IndexedForest<DownloadFileOperation>()
private var conflictUploadId: Long? = null
private var lastPercent = 0
@ -132,13 +121,8 @@ class FileDownloadWorker(
val requestDownloads = getRequestDownloads()
addAccountUpdateListener()
registerCancelEvent()
requestDownloads.forEach {
if (!shouldContinueExecution.get()) {
return@forEach
}
downloadFile(it)
}
@ -173,38 +157,9 @@ class FileDownloadWorker(
private fun setIdleWorkerState() {
currentDownload = null
LocalBroadcastManager.getInstance(context).unregisterReceiver(cancelEventReceiver)
WorkerStateLiveData.instance().setWorkState(WorkerState.Idle)
}
private fun getEventPair(intent: Intent): Pair<String, Long>? {
val fileId = intent.getLongExtra(EVENT_FILE_ID, -1L)
val accountName = intent.getStringExtra(EVENT_ACCOUNT_NAME)
return if (fileId != -1L && accountName != null) {
Pair(accountName, fileId)
} else {
null
}
}
private fun registerCancelEvent() {
val filter = IntentFilter(CANCEL_EVENT)
LocalBroadcastManager.getInstance(context).registerReceiver(cancelEventReceiver, filter)
}
private val cancelEventReceiver: BroadcastReceiver = object : BroadcastReceiver() {
override fun onReceive(context: Context, intent: Intent) {
val (accountName, fileId) = getEventPair(intent) ?: return
pendingDownloads.all.forEach {
it.value.payload?.cancelMatchingOperation(accountName, fileId)
}
resumeWork()
}
}
private fun cancelAllDownloads() {
pendingDownloads.all.forEach {
it.value.payload?.cancel()
@ -229,7 +184,6 @@ class FileDownloadWorker(
}
private fun getRequestDownloads(): AbstractList<String> {
shouldContinueExecution.set(true)
setUser()
setFolder()
val files = getFiles()