Skip to content

fix(conflict-resolve-activity): threading #16776

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
alperozturk96 merged 1 commit into from
Mar 31, 2026
+51 −40
Merged

fix(conflict-resolve-activity): threading #16776

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
91 changes: 51 additions & 40 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 @@ -47,7 +47,7 @@ import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
import javax.inject.Inject

@Suppress("TooManyFunctions")
@Suppress("TooManyFunctions", "ReturnCount")
class ConflictsResolveActivity :
FileActivity(),
OnConflictDecisionMadeListener {
Expand Down Expand Up @@ -120,27 +120,31 @@ class ConflictsResolveActivity :
return@OnConflictDecisionMadeListener
}

val offlineOperation = offlineOperationPath?.let {
fileDataStorageManager.offlineOperationDao.getByPath(it)
}
lifecycleScope.launch(Dispatchers.IO) {
val offlineOperation = offlineOperationPath?.let {
fileDataStorageManager.offlineOperationDao.getByPath(it)
}

when (decision) {
Decision.KEEP_LOCAL -> handleFile(file, upload, optionalUser.get(), NameCollisionPolicy.OVERWRITE)
Decision.KEEP_BOTH -> handleFile(file, upload, optionalUser.get(), NameCollisionPolicy.RENAME)
Decision.KEEP_SERVER -> keepServer(file, upload, optionalUser.get())
Decision.KEEP_OFFLINE_FOLDER -> keepOfflineFolder(file, offlineOperation)
Decision.KEEP_SERVER_FOLDER -> keepServerFile(offlineOperation)
Decision.KEEP_BOTH_FOLDER -> keepBothFolder(offlineOperation, file)
else -> Unit
}
when (decision) {
Decision.KEEP_LOCAL -> handleFile(file, upload, optionalUser.get(), NameCollisionPolicy.OVERWRITE)
Decision.KEEP_BOTH -> handleFile(file, upload, optionalUser.get(), NameCollisionPolicy.RENAME)
Decision.KEEP_SERVER -> keepServer(file, upload, optionalUser.get())
Decision.KEEP_OFFLINE_FOLDER -> keepOfflineFolder(file, offlineOperation)
Decision.KEEP_SERVER_FOLDER -> keepServerFile(offlineOperation)
Decision.KEEP_BOTH_FOLDER -> keepBothFolder(offlineOperation, file)
else -> Unit
}

upload?.remotePath?.let { path ->
val oldFile = storageManager.getFileByDecryptedRemotePath(path)
updateThumbnailIfNeeded(decision, file, oldFile)
}
upload?.remotePath?.let { path ->
val oldFile = storageManager.getFileByDecryptedRemotePath(path)
updateThumbnailIfNeeded(decision, file, oldFile)
}

dismissConflictResolveNotification()
finish()
withContext(Dispatchers.Main) {
dismissConflictResolveNotification()
finish()
}
}
}
}

Expand All @@ -149,7 +153,7 @@ class ConflictsResolveActivity :
uploadHelper.uploadUpdatedFile(user, arrayOf(file), localBehaviour, policy)
}

private fun keepServer(file: OCFile?, upload: OCUpload?, user: User) {
private suspend fun keepServer(file: OCFile?, upload: OCUpload?, user: User) {
if (!shouldDeleteLocal()) {
file?.let {
downloadHelper.downloadFile(
Expand All @@ -163,41 +167,48 @@ class ConflictsResolveActivity :
upload?.let {
uploadHelper.removeFileUpload(it.remotePath, it.accountName)
val id = it.uploadId.toInt()
UploadNotificationManager(applicationContext, viewThemeUtils, id).dismissNotification(id)

withContext(Dispatchers.Main) {
UploadNotificationManager(applicationContext, viewThemeUtils, id).dismissNotification(id)
}
}
}

private fun keepBothFolder(offlineOperation: OfflineOperationEntity?, serverFile: OCFile?) {
private suspend fun keepBothFolder(offlineOperation: OfflineOperationEntity?, serverFile: OCFile?) {
offlineOperation ?: return
fileDataStorageManager.keepOfflineOperationAndServerFile(offlineOperation, serverFile)
backgroundJobManager.startOfflineOperations()
offlineOperationNotificationManager.dismissNotification(offlineOperation.id)
withContext(Dispatchers.Main) {
offlineOperationNotificationManager.dismissNotification(offlineOperation.id)
}
}

private fun keepServerFile(offlineOperation: OfflineOperationEntity?) {
private suspend fun keepServerFile(offlineOperation: OfflineOperationEntity?) {
offlineOperation ?: return
fileDataStorageManager.offlineOperationDao.delete(offlineOperation)
offlineOperation.id?.let { offlineOperationNotificationManager.dismissNotification(it) }
offlineOperation.id?.let {
withContext(Dispatchers.Main) {
offlineOperationNotificationManager.dismissNotification(it)
}
}
}

private fun keepOfflineFolder(serverFile: OCFile?, offlineOperation: OfflineOperationEntity?) {
private suspend fun keepOfflineFolder(serverFile: OCFile?, offlineOperation: OfflineOperationEntity?) {
serverFile ?: return
offlineOperation ?: return

lifecycleScope.launch(Dispatchers.IO) {
val client = clientRepository.getOwncloudClient() ?: return@launch
val isSuccess = fileOperationHelper.removeFile(
serverFile,
onlyLocalCopy = false,
inBackground = false,
client = client
)

if (isSuccess) {
backgroundJobManager.startOfflineOperations()
withContext(Dispatchers.Main) {
offlineOperationNotificationManager.dismissNotification(offlineOperation.id)
}
val client = clientRepository.getOwncloudClient() ?: return
val isSuccess = fileOperationHelper.removeFile(
serverFile,
onlyLocalCopy = false,
inBackground = false,
client = client
)

if (isSuccess) {
backgroundJobManager.startOfflineOperations()
withContext(Dispatchers.Main) {
offlineOperationNotificationManager.dismissNotification(offlineOperation.id)
}
}
}
Expand Down
Loading