Merge pull request #16341 from nextcloud/backport/16340/stable-3.35

[stable-3.35] handle oc upload construct

Author: alperozturk96

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

@@ -18,6 +18,7 @@ import com.owncloud.android.db.ProviderMeta.ProviderTableMeta
 import com.owncloud.android.db.UploadResult
 import com.owncloud.android.files.services.NameCollisionPolicy
 import com.owncloud.android.lib.resources.status.OCCapability
+import java.lang.IllegalArgumentException
 
 @Entity(tableName = ProviderTableMeta.UPLOADS_TABLE_NAME)
 data class UploadEntity(
@@ -56,13 +57,17 @@ data class UploadEntity(
     val folderUnlockToken: String?
 )
 
-fun UploadEntity.toOCUpload(capability: OCCapability? = null): OCUpload {
+fun UploadEntity.toOCUpload(capability: OCCapability? = null): OCUpload? {
     val localPath = localPath
     var remotePath = remotePath
     if (capability != null && remotePath != null) {
         remotePath = AutoRename.rename(remotePath, capability)
     }
-    val upload = OCUpload(localPath, remotePath, accountName)
+    val upload = try {
+        OCUpload(localPath, remotePath, accountName)
+    } catch (_: IllegalArgumentException) {
+        return null
+    }
 
     fileSize?.let { upload.fileSize = it }
     id?.let { upload.uploadId = it.toLong() }

app/src/main/java/com/nextcloud/client/jobs/autoUpload/AutoUploadWorker.kt

@@ -383,6 +383,7 @@ class AutoUploadWorker(
         uploadsStorageManager.removeUpload(upload)
     }
 
+    @Suppress("ReturnCount")
     private fun createEntityAndUpload(
         user: User,
         localPath: String,
@@ -404,13 +405,14 @@ class AutoUploadWorker(
             return null
         }
 
-        val upload = (
-            uploadEntity?.toOCUpload(null) ?: OCUpload(
-                localPath,
-                remotePath,
-                user.accountName
-            )
-            ).apply {
+        val upload = try {
+            uploadEntity?.toOCUpload(null) ?: OCUpload(localPath, remotePath, user.accountName)
+        } catch (_: IllegalArgumentException) {
+            Log_OC.e(TAG, "cannot construct oc upload")
+            return null
+        }
+
+        upload.apply {
             uploadStatus = UploadsStorageManager.UploadStatus.UPLOAD_IN_PROGRESS
             nameCollisionPolicy = syncedFolder.nameCollisionPolicy
             isUseWifiOnly = needsWifi

app/src/main/java/com/nextcloud/client/jobs/upload/FileUploadHelper.kt

@@ -299,7 +299,7 @@ class FileUploadHelper {
                 dao.getUploadsByAccountNameAndStatus(accountName, status.value, nameCollisionPolicy?.serialize())
             } else {
                 dao.getUploadsByStatus(status.value, nameCollisionPolicy?.serialize())
-            }.map { it.toOCUpload(null) }.toTypedArray()
+            }.mapNotNull { it.toOCUpload(null) }.toTypedArray()
             onCompleted(result)
         }
     }

app/src/main/java/com/owncloud/android/db/OCUpload.java

@@ -130,9 +130,11 @@ public class OCUpload implements Parcelable {
      */
     public OCUpload(String localPath, String remotePath, String accountName) {
         if (localPath == null || !localPath.startsWith(File.separator)) {
+            Log_OC.e(TAG, "oc upload, local path: " + localPath);
             throw new IllegalArgumentException("Local path must be an absolute path in the local file system");
         }
         if (remotePath == null || !remotePath.startsWith(OCFile.PATH_SEPARATOR)) {
+            Log_OC.e(TAG, "oc upload, remote path: " + remotePath);
             throw new IllegalArgumentException("Remote path must be an absolute path in the local file system");
         }
         if (accountName == null || accountName.length() < 1) {