Skip to content

BugFix - ConflictResolveActivity - keepOfflineFolder - Create Client On MainThread #15200

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tobiasKaminsky merged 1 commit into from
Jul 22, 2025
Merged

BugFix - ConflictResolveActivity - keepOfflineFolder - Create Client On MainThread #15200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions app/src/main/java/com/nextcloud/client/jobs/operation/FileOperationHelper.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ package com.nextcloud.client.jobs.operation

import android.content.Context
import com.nextcloud.client.account.User
import com.nextcloud.client.network.ClientFactoryImpl
import com.nextcloud.utils.extensions.getErrorMessage
import com.owncloud.android.datamodel.FileDataStorageManager
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.operations.RemoveFileOperation
import kotlinx.coroutines.Dispatchers
Expand All @@ -24,16 +24,17 @@ class FileOperationHelper(
private val context: Context,
private val fileDataStorageManager: FileDataStorageManager
) {

companion object {
private val TAG = FileOperationHelper::class.java.simpleName
}

private val clientFactory = ClientFactoryImpl(context)
private val client = clientFactory.create(user)

@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) {
try {
val operation = async {
Expand Down
13 changes: 10 additions & 3 deletions app/src/main/java/com/owncloud/android/ui/activity/ConflictsResolveActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ import com.owncloud.android.ui.notifications.NotificationUtils
import com.owncloud.android.utils.FileStorageUtils
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
import javax.inject.Inject

/**
Expand Down Expand Up @@ -174,11 +175,17 @@ class ConflictsResolveActivity :
offlineOperation ?: return

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) {
backgroundJobManager.startOfflineOperations()

launch(Dispatchers.Main) {
withContext(Dispatchers.Main) {
offlineOperationNotificationManager.dismissNotification(offlineOperation.id)
}
}
Expand Down
Loading