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

better worker impl

Browse source 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
This commit is contained in:
alperozturk 2024-09-06 14:09:58 +02:00
parent fd01a10f28
commit 8e89a46c4c
No known key found for this signature in database
GPG key ID: 4E577DC593B59BDF
1 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
app/src/main/java/com/nextcloud/client/jobs/offlineOperations/OfflineOperationsWorker.kt
View file

@ -27,7 +27,7 @@ import com.owncloud.android.lib.resources.files.UploadFileRemoteOperation
import com.owncloud.android.operations.CreateFolderOperation
import com.owncloud.android.utils.theme.ViewThemeUtils
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.coroutineScope
import kotlinx.coroutines.NonCancellable
import kotlinx.coroutines.withContext
import kotlin.coroutines.resume
import kotlin.coroutines.suspendCoroutine
@ -51,8 +51,7 @@ class OfflineOperationsWorker(
private var repository = OfflineOperationsRepository(fileDataStorageManager)
@Suppress("TooGenericExceptionCaught")
override suspend fun doWork(): Result = coroutineScope {
// fileDataStorageManager.offlineOperationDao.clearTable()
override suspend fun doWork(): Result = withContext(Dispatchers.IO) {
val jobName = inputData.getString(JOB_NAME)
Log_OC.d(
TAG,
@ -63,7 +62,7 @@ class OfflineOperationsWorker(
if (!isNetworkAndServerAvailable()) {
Log_OC.d(TAG, "OfflineOperationsWorker cancelled, no internet connection")
return@coroutineScope Result.retry()
return@withContext Result.retry()
}
val client = clientFactory.create(user)
@ -73,7 +72,7 @@ class OfflineOperationsWorker(
val totalOperations = operations.size
var currentSuccessfulOperationIndex = 0
return@coroutineScope try {
return@withContext try {
while (operations.isNotEmpty()) {
val operation = operations.first()
val result = executeOperation(operation, client)
@ -113,10 +112,10 @@ class OfflineOperationsWorker(
private suspend fun executeOperation(
operation: OfflineOperationEntity,
client: OwnCloudClient
): Pair<RemoteOperationResult<*>?, RemoteOperation<*>?>? {
return when (operation.type) {
): Pair<RemoteOperationResult<*>?, RemoteOperation<*>?>? = withContext(Dispatchers.IO) {
return@withContext when (operation.type) {
is OfflineOperationType.CreateFolder -> {
val createFolderOperation = withContext(Dispatchers.IO) {
val createFolderOperation = withContext(NonCancellable) {
val operationType = (operation.type as OfflineOperationType.CreateFolder)
CreateFolderOperation(
operationType.path,
@ -129,7 +128,7 @@ class OfflineOperationsWorker(
}
is OfflineOperationType.CreateFile -> {
val createFileOperation = withContext(Dispatchers.IO) {
val createFileOperation = withContext(NonCancellable) {
val operationType = (operation.type as OfflineOperationType.CreateFile)
UploadFileRemoteOperation(
operationType.localPath,