VladPolskiy/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2025-08-15 22:51:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix

Browse Source 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
This commit is contained in:
alperozturk
2025-07-18 16:39:36 +02:00
parent d4c3934cce
commit ff38a26345
2 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/main/java/com/nextcloud/client/jobs/operation/FileOperationHelper.kt
View File

@ -9,10 +9,10 @@ package com.nextcloud.client.jobs.operation
import android.content.Context import android.content.Context
import com.nextcloud.client.account.User import com.nextcloud.client.account.User
import com.nextcloud.client.network.ClientFactoryImpl
import com.nextcloud.utils.extensions.getErrorMessage import com.nextcloud.utils.extensions.getErrorMessage
import com.owncloud.android.datamodel.FileDataStorageManager import com.owncloud.android.datamodel.FileDataStorageManager
import com.owncloud.android.datamodel.OCFile import com.owncloud.android.datamodel.OCFile
import com.owncloud.android.lib.common.OwnCloudClient
import com.owncloud.android.lib.common.utils.Log_OC import com.owncloud.android.lib.common.utils.Log_OC
import com.owncloud.android.operations.RemoveFileOperation import com.owncloud.android.operations.RemoveFileOperation
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
@ -24,16 +24,17 @@ class FileOperationHelper(
private val context: Context, private val context: Context,
private val fileDataStorageManager: FileDataStorageManager private val fileDataStorageManager: FileDataStorageManager
) { ) {
companion object { companion object {
private val TAG = FileOperationHelper::class.java.simpleName private val TAG = FileOperationHelper::class.java.simpleName
} }
private val clientFactory = ClientFactoryImpl(context)
private val client = clientFactory.create(user)
@Suppress("TooGenericExceptionCaught", "Deprecation") @Suppress("TooGenericExceptionCaught", "Deprecation")
suspend fun removeFile(file: OCFile, onlyLocalCopy: Boolean, inBackground: Boolean): Boolean { suspend fun removeFile(
file: OCFile,
onlyLocalCopy: Boolean,
inBackground: Boolean,
client: OwnCloudClient
): Boolean {
return withContext(Dispatchers.IO) { return withContext(Dispatchers.IO) {
try { try {
val operation = async { val operation = async {

13
app/src/main/java/com/owncloud/android/ui/activity/ConflictsResolveActivity.kt
View File

@ -45,6 +45,7 @@ import com.owncloud.android.ui.notifications.NotificationUtils
import com.owncloud.android.utils.FileStorageUtils import com.owncloud.android.utils.FileStorageUtils
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
import javax.inject.Inject import javax.inject.Inject
/** /**
@ -174,11 +175,17 @@ class ConflictsResolveActivity :
offlineOperation ?: return offlineOperation ?: return
lifecycleScope.launch(Dispatchers.IO) { lifecycleScope.launch(Dispatchers.IO) {
val isSuccess = fileOperationHelper.removeFile(serverFile, false, false) val client = clientRepository.getOwncloudClient() ?: return@launch
val isSuccess = fileOperationHelper.removeFile(
serverFile,
onlyLocalCopy = false,
inBackground = false,
client = client
)
if (isSuccess) { if (isSuccess) {
backgroundJobManager.startOfflineOperations() backgroundJobManager.startOfflineOperations()
withContext(Dispatchers.Main) {
launch(Dispatchers.Main) {
offlineOperationNotificationManager.dismissNotification(offlineOperation.id) offlineOperationNotificationManager.dismissNotification(offlineOperation.id)
} }
} }