wip

Signed-off-by: alperozturk96 <alper_ozturk@proton.me>

Author: alperozturk96

app/src/main/java/com/owncloud/android/ui/activity/UploadListActivity.kt

@@ -36,6 +36,7 @@ import com.owncloud.android.db.OCUpload
 import com.owncloud.android.lib.common.operations.RemoteOperation
 import com.owncloud.android.lib.common.operations.RemoteOperationResult
 import com.owncloud.android.lib.common.utils.Log_OC
+import com.owncloud.android.lib.resources.files.ExistenceCheckRemoteOperation
 import com.owncloud.android.operations.CheckCurrentCredentialsOperation
 import com.owncloud.android.operations.factory.UploadFileOperationFactory
 import com.owncloud.android.ui.adapter.uploadList.UploadListAdapter
@@ -291,47 +292,65 @@ class UploadListActivity :
 
             withContext(Dispatchers.Main) {
                 when (result) {
-                    is ConflictHandlingResult.ConflictNotExists -> {
-                        showConflictNotExists(upload)
+                    is ConflictHandlingResult.ConflictNotExistsRemoteFileNotFound -> {
+                        showConflictSnackbar(R.string.upload_sync_conflict_not_exists)
+                        retryUpload(upload)
                     }
 
                     is ConflictHandlingResult.CannotCheckConflict -> {
-                        showConflictError()
+                        showConflictSnackbar(R.string.upload_sync_conflict_check_error)
                     }
 
                     is ConflictHandlingResult.ShowConflictResolveDialog -> {
                         conflictSnackbar?.dismiss()
                         adapterHelper.openConflictActivity(result.file, result.upload)
                     }
+
+                    is ConflictHandlingResult.ConflictNotExistsSameFile -> {
+                        showConflictSnackbar(R.string.upload_sync_conflict_same_file)
+                    }
                 }
             }
         }
     }
 
-    private fun showConflictNotExists(upload: OCUpload) {
-        conflictSnackbar?.apply {
-            setText(R.string.upload_sync_conflict_not_exists)
-            setDuration(Snackbar.LENGTH_LONG)
-            setAction(R.string.retry) {
-                lifecycleScope.launch(Dispatchers.IO) {
-                    val client = clientRepository.getOwncloudClient()
-                    val operation = uploadFileOperationFactory.create(upload).execute(client)
-                    if (operation.isSuccess) {
-                        withContext(Dispatchers.Main) {
-                            uploadListAdapter.loadUploadItemsFromDb()
-                        }
-                    }
+    private fun retryUpload(upload: OCUpload) {
+        lifecycleScope.launch(Dispatchers.IO) {
+            val client = clientRepository.getOwncloudClient()
+
+            // Check parent folder exists
+            val parentPath = storageManager
+                .getFileByPath(upload.remotePath)
+                .parentRemotePath
+
+            val checkOp = ExistenceCheckRemoteOperation(parentPath, false)
+            val checkResult = checkOp.execute(client)
+
+            if (!checkResult.isSuccess &&
+                checkResult.code == RemoteOperationResult.ResultCode.FILE_NOT_FOUND
+            ) {
+                withContext(Dispatchers.Main) {
+                    showConflictSnackbar(R.string.uploader_file_not_found_message)
+                }
+                return@launch
+            }
+
+            val result = uploadFileOperationFactory
+                .create(upload)
+                .execute(client)
+
+            if (result.isSuccess) {
+                withContext(Dispatchers.Main) {
+                    uploadListAdapter.loadUploadItemsFromDb()
                 }
             }
-            show()
         }
     }
 
-    private fun showConflictError() {
+    private fun showConflictSnackbar(messageId: Int) {
         conflictSnackbar?.apply {
-            setText(R.string.upload_sync_conflict_check_error)
+            setText(messageId)
             setDuration(Snackbar.LENGTH_LONG)
-            setAction(null, null)
             show()
         }
     }

app/src/main/java/com/owncloud/android/ui/adapter/uploadList/helper/ConflictHandlingResult.kt

@@ -12,6 +12,7 @@ import com.owncloud.android.db.OCUpload
 
 sealed class ConflictHandlingResult {
     data object CannotCheckConflict : ConflictHandlingResult()
-    data object ConflictNotExists : ConflictHandlingResult()
+    data object ConflictNotExistsSameFile : ConflictHandlingResult()
+    data object ConflictNotExistsRemoteFileNotFound : ConflictHandlingResult()
     data class ShowConflictResolveDialog(val file: OCFile, val upload: OCUpload) : ConflictHandlingResult()
 }

app/src/main/java/com/owncloud/android/ui/adapter/uploadList/helper/UploadListAdapterActionHandler.kt

@@ -35,7 +35,8 @@ class UploadListAdapterActionHandler : UploadListAdapterAction {
         if (!operationResult.isSuccess) {
             return@withContext when (operationResult.code) {
                 RemoteOperationResult.ResultCode.FILE_NOT_FOUND -> {
-                    onConflictNotExists(upload, storageManager)
+                    updateStatus(upload, storageManager, success = false)
+                    ConflictHandlingResult.ConflictNotExistsRemoteFileNotFound
                 }
 
                 else -> {
@@ -54,18 +55,15 @@ class UploadListAdapterActionHandler : UploadListAdapterAction {
         val ocFile = FileStorageUtils.fillOCFile(remoteFile)
 
         if (remoteFile.isSame(ocFile.storagePath)) {
-            onConflictNotExists(upload, storageManager)
+            updateStatus(upload, storageManager, success = true)
+            ConflictHandlingResult.ConflictNotExistsSameFile
         } else {
             ConflictHandlingResult.ShowConflictResolveDialog(ocFile, upload)
         }
     }
 
-    private fun onConflictNotExists(
-        upload: OCUpload,
-        storageManager: UploadsStorageManager
-    ): ConflictHandlingResult.ConflictNotExists {
+    private fun updateStatus(upload: OCUpload, storageManager: UploadsStorageManager, success: Boolean) {
         val entity = storageManager.uploadDao.getUploadById(upload.uploadId, upload.accountName)
-        storageManager.updateStatus(entity, UploadsStorageManager.UploadStatus.UPLOAD_FAILED)
-        return ConflictHandlingResult.ConflictNotExists
+        storageManager.updateStatus(entity, success)
     }
 }

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

@@ -1096,6 +1096,7 @@
     <string name="upload_old_android">Encryption is only possible with &gt;= Android 5.0</string>
     <string name="upload_sync_conflict_checking">Checking for upload conflicts…</string>
     <string name="upload_sync_conflict_not_exists">Conflict resolved.</string>
+    <string name="upload_sync_conflict_same_file">No conflict detected. Same file.</string>
     <string name="upload_sync_conflict_check_error">Could not check for upload conflicts. Please try again.</string>
     <string name="upload_sync_conflict_check">There might be a conflict from your last upload. Tap to check.</string>
     <string name="upload_cannot_create_file">Cannot create local file</string>
@@ -1190,6 +1191,7 @@
     <string name="failed_to_start_editor">Failed to start editor</string>
     <string name="create_rich_workspace">Add folder description</string>
     <string name="uploader_file_not_found_on_server_message">We couldnt locate the file on server. Another user may have deleted the file</string>
+    <string name="uploader_file_not_found_message">File not found. Are you sure that this file exists or has a previous conflict not been resolved?</string>
     <string name="uploader_upload_failed_sync_conflict_error">File upload conflict</string>
     <string name="uploader_upload_failed_sync_conflict_error_content">Pick which version to keep of %1$s</string>
     <string name="upload_list_resolve_conflict">Resolve conflict</string>