fixes

Signed-off-by: alperozturk <[email protected]>

Author: alperozturk96

app/src/main/java/com/nextcloud/client/database/entity/OfflineOperationEntity.kt

@@ -7,10 +7,12 @@
 
 package com.nextcloud.client.database.entity
 
+import android.content.Context
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
 import com.nextcloud.model.OfflineOperationType
+import com.owncloud.android.R
 import com.owncloud.android.db.ProviderMeta.ProviderTableMeta
 
 @Entity(tableName = ProviderTableMeta.OFFLINE_OPERATION_TABLE_NAME)
@@ -41,7 +43,15 @@ data class OfflineOperationEntity(
         return (type is OfflineOperationType.RenameFile || type is OfflineOperationType.RemoveFile)
     }
 
-    fun isCreate(): Boolean {
-        return (type is OfflineOperationType.CreateFile || type is OfflineOperationType.CreateFolder)
+    fun getConflictText(context: Context): String {
+        return if (type is OfflineOperationType.RemoveFile) {
+            context.getString(R.string.offline_operations_worker_notification_remove_conflict_text, filename)
+        } else if (type is OfflineOperationType.RenameFile) {
+            context.getString(R.string.offline_operations_worker_notification_rename_conflict_text, filename)
+        } else if (type is OfflineOperationType.CreateFile) {
+            context.getString(R.string.offline_operations_worker_notification_create_file_conflict_text, filename)
+        } else {
+            context.getString(R.string.offline_operations_worker_notification_create_folder_conflict_text, filename)
+        }
     }
 }

app/src/main/java/com/nextcloud/client/jobs/offlineOperations/OfflineOperationsNotificationManager.kt

@@ -77,6 +77,23 @@ class OfflineOperationsNotificationManager(private val context: Context, viewThe
         }
     }
 
+    fun showConflictNotificationForDeleteOrRemoveOperation(entity: OfflineOperationEntity?) {
+        val id = entity?.id
+        if (id == null) {
+            return
+        }
+
+        val title = entity.getConflictText(context)
+
+        notificationBuilder
+            .setProgress(0, 0, false)
+            .setOngoing(false)
+            .clearActions()
+            .setContentTitle(title)
+
+        notificationManager.notify(id, notificationBuilder.build())
+    }
+
     fun showConflictResolveNotification(file: OCFile, entity: OfflineOperationEntity?) {
         val path = entity?.path
         val id = entity?.id
@@ -87,10 +104,7 @@ class OfflineOperationsNotificationManager(private val context: Context, viewThe
 
         val resolveConflictAction = getResolveConflictAction(file, id, path)
 
-        val title = context.getString(
-            R.string.offline_operations_worker_notification_conflict_text,
-            file.fileName
-        )
+        val title = entity.getConflictText(context)
 
         notificationBuilder
             .setProgress(0, 0, false)

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

@@ -18,7 +18,6 @@ import com.nextcloud.client.network.ConnectivityService
 import com.nextcloud.model.OfflineOperationType
 import com.nextcloud.model.WorkerState
 import com.nextcloud.model.WorkerStateLiveData
-import com.nextcloud.utils.extensions.toOCFile
 import com.owncloud.android.datamodel.FileDataStorageManager
 import com.owncloud.android.datamodel.OCFile
 import com.owncloud.android.lib.common.OwnCloudClient
@@ -31,6 +30,7 @@ import com.owncloud.android.lib.resources.files.UploadFileRemoteOperation
 import com.owncloud.android.operations.CreateFolderOperation
 import com.owncloud.android.operations.RemoveFileOperation
 import com.owncloud.android.operations.RenameFileOperation
+import com.owncloud.android.utils.MimeTypeUtil
 import com.owncloud.android.utils.theme.ViewThemeUtils
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.NonCancellable
@@ -120,29 +120,30 @@ class OfflineOperationsWorker(
         client: OwnCloudClient
     ): OfflineOperationResult? = withContext(Dispatchers.IO) {
         val ocFile = fileDataStorageManager.getFileByDecryptedRemotePath(operation.path)
+        val path = (operation.path)
 
-        if (isCreateConflict(operation, ocFile)) {
-            Log_OC.w(TAG, "Offline operation skipped, file already exists: $operation")
-            notificationManager.showConflictResolveNotification(ocFile!!, operation)
+        if (path == null) {
+            Log_OC.w(TAG, "Offline operation skipped, file path is null: $operation")
             return@withContext null
         }
 
-        if (isNonExistentFileForRenameOrRemove(operation, ocFile)) {
-            Log_OC.w(TAG, "Offline operation skipped, same file name used for create operation: $operation")
-            fileDataStorageManager.offlineOperationDao.delete(operation)
-            return@withContext null
-        }
+        if (isRemoteFileExists(path)) {
+            Log_OC.w(TAG, "Offline operation skipped, file already exists: $operation")
+
+            if (operation.isRenameOrRemove()) {
+                fileDataStorageManager.offlineOperationDao.delete(operation)
+                notificationManager.showConflictNotificationForDeleteOrRemoveOperation(operation)
+            } else {
+                notificationManager.showConflictResolveNotification(ocFile!!, operation)
+            }
 
-        if (isFileChangedForRenameOrRemove(operation, ocFile)) {
-            Log_OC.w(TAG, "Offline operation skipped, file changed: $operation")
-            notificationManager.showConflictResolveNotification(ocFile!!, operation)
             return@withContext null
         }
 
         return@withContext when (val type = operation.type) {
             is OfflineOperationType.CreateFolder -> createFolder(operation, client)
             is OfflineOperationType.CreateFile -> createFile(operation, client)
-            is OfflineOperationType.RenameFile -> ocFile?.let { renameFile(operation, it, client) }
+            is OfflineOperationType.RenameFile -> renameFile(operation, client)
             is OfflineOperationType.RemoveFile -> ocFile?.let { removeFile(it, client) }
             else -> {
                 Log_OC.d(TAG, "Unsupported operation type: $type")
@@ -151,19 +152,6 @@ class OfflineOperationsWorker(
         }
     }
 
-    private fun isCreateConflict(operation: OfflineOperationEntity, ocFile: OCFile?): Boolean {
-        return ocFile != null && ocFile.remoteId != null && (operation.filename == ocFile.fileName)
-            && operation.isCreate()
-    }
-
-    private fun isNonExistentFileForRenameOrRemove(operation: OfflineOperationEntity, ocFile: OCFile?): Boolean {
-        return operation.isRenameOrRemove() && (ocFile == null || ocFile.remoteId == null)
-    }
-
-    private fun isFileChangedForRenameOrRemove(operation: OfflineOperationEntity, ocFile: OCFile?): Boolean {
-        return operation.isRenameOrRemove() && ocFile?.remoteId != null && isFileChanged(ocFile)
-    }
-
     @Suppress("DEPRECATION")
     private suspend fun createFolder(
         operation: OfflineOperationEntity,
@@ -199,20 +187,10 @@ class OfflineOperationsWorker(
     }
 
     @Suppress("DEPRECATION")
-    private suspend fun renameFile(
-        operation: OfflineOperationEntity,
-        ocFile: OCFile,
-        client: OwnCloudClient
-    ): OfflineOperationResult {
-        val ocFileRemotePath = ocFile.remotePath
-        if (ocFileRemotePath == null) {
-            Log_OC.w(TAG, "Rename offline operation is cancelled, remote path is null")
-            return null
-        }
-
+    private suspend fun renameFile(operation: OfflineOperationEntity, client: OwnCloudClient): OfflineOperationResult {
         val renameFileOperation = withContext(NonCancellable) {
             val operationType = (operation.type as OfflineOperationType.RenameFile)
-            RenameFileOperation(ocFileRemotePath, operationType.newName, fileDataStorageManager)
+            RenameFileOperation(operation.path, operationType.newName, fileDataStorageManager)
         }
 
         return renameFileOperation.execute(client) to renameFileOperation
@@ -281,15 +259,16 @@ class OfflineOperationsWorker(
     }
 
     @Suppress("DEPRECATION")
-    private fun isFileChanged(file: OCFile): Boolean {
+    private fun isRemoteFileExists(remotePath: String): Boolean {
+        val mimeType = MimeTypeUtil.getMimeTypeFromPath(remotePath)
+        val isFolder = MimeTypeUtil.isFolder(mimeType)
         val client = ClientFactoryImpl(context).create(user)
-        val remoteFile = if (file.isFolder) {
-            ReadFolderRemoteOperation(file.remotePath).execute(client)
+        val remoteFile = if (isFolder) {
+            ReadFolderRemoteOperation(remotePath).execute(client)
         } else {
-            ReadFileRemoteOperation(file.remotePath).execute(client)
+            ReadFileRemoteOperation(remotePath).execute(client)
         }
 
-        val remoteETag = remoteFile.toOCFile()?.get(0)?.etag
-        return file.etag != remoteETag
+        return remoteFile.isSuccess
     }
 }

app/src/main/res/values/strings.xml

@@ -43,7 +43,12 @@
     <string name="app_config_proxy_port_title">Proxy Port</string>
     <string name="app_config_enforce_protection_title">Enforce Protection</string>
     <string name="offline_operations_file_does_not_exists_yet">File does not exists, yet. Please upload the file first.</string>
-    <string name="offline_operations_worker_notification_conflict_text">Conflicting folder: %s</string>
+
+    <string name="offline_operations_worker_notification_remove_conflict_text">Offline operation cancelled. Could not delete %s file exists on server.</string>
+    <string name="offline_operations_worker_notification_rename_conflict_text">Offline operation cancelled. Could not rename %s file exists on server.</string>
+    <string name="offline_operations_worker_notification_create_file_conflict_text">Cannot create file: %s already exists on server.</string>
+    <string name="offline_operations_worker_notification_create_folder_conflict_text">Cannot create folder: %s already exists on server.</string>
+
     <string name="offline_operations_worker_notification_start_text">Starting offline operations</string>
     <string name="offline_operations_worker_notification_error_text">The offline operation cannot be completed. %s</string>
     <string name="offline_operations_worker_notification_manager_ticker">Offline Operations</string>