better check

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

Author: alperozturk96

app/src/main/java/com/nextcloud/client/jobs/operation/FileOperationHelper.kt

@@ -10,6 +10,7 @@ package com.nextcloud.client.jobs.operation
 import android.content.Context
 import com.nextcloud.client.account.User
 import com.nextcloud.utils.extensions.getErrorMessage
+import com.nextcloud.utils.extensions.toFile
 import com.owncloud.android.datamodel.FileDataStorageManager
 import com.owncloud.android.datamodel.OCFile
 import com.owncloud.android.db.OCUpload
@@ -24,7 +25,6 @@ import com.owncloud.android.utils.MimeTypeUtil
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.async
 import kotlinx.coroutines.withContext
-import java.io.File
 
 class FileOperationHelper(private val user: User, private val context: Context) {
     companion object {
@@ -45,26 +45,18 @@ class FileOperationHelper(private val user: User, private val context: Context)
     fun isSameRemoteFileAlreadyPresent(upload: OCUpload, storageManager: FileDataStorageManager): Boolean {
         val (lc, uc) = FileUtil.getRemotePathVariants(upload.remotePath)
 
-        val remoteFile = storageManager.getFileByDecryptedRemotePath(lc)
-            ?: storageManager.getFileByDecryptedRemotePath(uc)
+        val remoteFile = storageManager.run {
+            getFileByDecryptedRemotePath(lc) ?: getFileByDecryptedRemotePath(uc)
+        }
 
-        if (remoteFile != null && isSameFileOnRemote(remoteFile, upload)) {
+        if (upload.toFile()?.length() == remoteFile?.fileLength) {
             Log_OC.w(TAG, "Same file already exists due to lowercase/uppercase extension")
             return true
         }
 
         return false
     }
 
-    fun isSameFileOnRemote(remoteFile: OCFile, upload: OCUpload): Boolean {
-        val localFile = File(upload.localPath)
-        if (!localFile.exists()) {
-            return false
-        }
-        val localSize: Long = localFile.length()
-        return remoteFile.fileLength == localSize
-    }
-
     @Suppress("DEPRECATION")
     fun getRemoteFile(remotePath: String, client: OwnCloudClient): RemoteFile? {
         val mimeType = MimeTypeUtil.getMimeTypeFromPath(remotePath)

app/src/main/java/com/nextcloud/utils/extensions/OCUploadExtensions.kt

@@ -8,7 +8,22 @@
 package com.nextcloud.utils.extensions
 
 import com.owncloud.android.db.OCUpload
+import java.io.File
 
 fun List<OCUpload>.getUploadIds(): LongArray = map { it.uploadId }.toLongArray()
 
 fun Array<OCUpload>.getUploadIds(): LongArray = map { it.uploadId }.toLongArray()
+
+@Suppress("ReturnCount")
+fun OCUpload.toFile(): File? {
+    if (localPath.isNullOrEmpty()) {
+        return null
+    }
+
+    val result = File(localPath)
+    if (!result.exists()) {
+        return null
+    }
+
+    return result
+}