fix(upload-list): handle conflict actions

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

Author: alperozturk96

app/src/main/java/com/nextcloud/utils/OCFileUtils.kt

@@ -55,7 +55,7 @@ object OCFileUtils {
         return fallbackPair
     }
 
-    private fun getExifSize(path: String): Pair<Int, Int>? = try {
+    fun getExifSize(path: String): Pair<Int, Int>? = try {
         val exif = ExifInterface(path)
         var w = exif.getAttributeInt(ExifInterface.TAG_IMAGE_WIDTH, 0)
         var h = exif.getAttributeInt(ExifInterface.TAG_IMAGE_LENGTH, 0)
@@ -78,7 +78,7 @@ object OCFileUtils {
         null
     }
 
-    private fun getBitmapSize(path: String): Pair<Int, Int>? = try {
+    fun getBitmapSize(path: String): Pair<Int, Int>? = try {
         val options = android.graphics.BitmapFactory.Options().apply { inJustDecodeBounds = true }
         android.graphics.BitmapFactory.decodeFile(path, options)
         val w = options.outWidth

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

@@ -7,20 +7,40 @@
 
 package com.nextcloud.utils.extensions
 
+import com.nextcloud.utils.OCFileUtils
 import com.nextcloud.utils.TimeConstants
 import com.owncloud.android.lib.resources.files.model.RemoteFile
 import com.owncloud.android.utils.FileUtil
+import com.owncloud.android.utils.MimeTypeUtil
 
 fun RemoteFile.isSame(path: String?): Boolean {
     val localFile = path?.toFile() ?: return false
 
-    // remote file timestamp in milli not micro sec
+    // remote file timestamp in millisecond not microsecond
     val localLastModifiedTimestamp = localFile.lastModified() / TimeConstants.MILLIS_PER_SECOND
     val localCreationTimestamp = FileUtil.getCreationTimestamp(localFile)
     val localSize: Long = localFile.length()
 
     return size == localSize &&
         localCreationTimestamp != null &&
         localCreationTimestamp == creationTimestamp &&
-        modifiedTimestamp == localLastModifiedTimestamp * TimeConstants.MILLIS_PER_SECOND
+        modifiedTimestamp == localLastModifiedTimestamp * TimeConstants.MILLIS_PER_SECOND &&
+        this.areImageDimensionsSame(path)
+}
+
+@Suppress("ReturnCount")
+private fun RemoteFile.areImageDimensionsSame(path: String): Boolean {
+    if (!MimeTypeUtil.isImage(mimeType)) {
+        // can't compare it's not image
+        return true
+    }
+
+    val localFileImageDimension = OCFileUtils.getExifSize(path) ?: OCFileUtils.getBitmapSize(path)
+    if (localFileImageDimension == null) {
+        // can't compare local file image dimension is not determined
+        return true
+    }
+
+    return localFileImageDimension.first.toFloat() == imageDimension?.width &&
+        localFileImageDimension.second.toFloat() == imageDimension?.height
 }