wip

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

Author: alperozturk96

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

@@ -11,7 +11,8 @@ import android.graphics.drawable.BitmapDrawable
 import androidx.core.content.ContextCompat
 import androidx.core.graphics.drawable.toBitmap
 import androidx.core.graphics.drawable.toDrawable
-import androidx.exifinterface.media.ExifInterface
+import com.nextcloud.utils.extensions.getBitmapSize
+import com.nextcloud.utils.extensions.getExifSize
 import com.owncloud.android.MainApp
 import com.owncloud.android.R
 import com.owncloud.android.datamodel.OCFile
@@ -41,8 +42,8 @@ object OCFileUtils {
             // Local file
             val path = ocFile.storagePath
             if (!path.isNullOrEmpty() && ocFile.exists()) {
-                getExifSize(path)?.let { return it }
-                getBitmapSize(path)?.let { return it }
+                path.getExifSize()?.let { return it }
+                path.getBitmapSize()?.let { return it }
             }
 
             // 3 Fallback
@@ -55,41 +56,6 @@ object OCFileUtils {
         return fallbackPair
     }
 
-    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)
-
-        val orientation = exif.getAttributeInt(
-            ExifInterface.TAG_ORIENTATION,
-            ExifInterface.ORIENTATION_NORMAL
-        )
-        if (orientation == ExifInterface.ORIENTATION_ROTATE_90 ||
-            orientation == ExifInterface.ORIENTATION_ROTATE_270
-        ) {
-            val tmp = w
-            w = h
-            h = tmp
-        }
-
-        Log_OC.d(TAG, "Using exif imageDimension: $w x $h")
-        if (w > 0 && h > 0) w to h else null
-    } catch (_: Exception) {
-        null
-    }
-
-    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
-        val h = options.outHeight
-
-        Log_OC.d(TAG, "Using bitmap factory imageDimension: $w x $h")
-        if (w > 0 && h > 0) w to h else null
-    } catch (_: Exception) {
-        null
-    }
-
     fun getMediaPlaceholder(file: OCFile, imageDimension: Pair<Int, Int>): BitmapDrawable {
         val context = MainApp.getAppContext()
 

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

@@ -7,6 +7,7 @@
 
 package com.nextcloud.utils.extensions
 
+import androidx.exifinterface.media.ExifInterface
 import com.owncloud.android.datamodel.OCFile
 import com.owncloud.android.lib.common.utils.Log_OC
 import com.owncloud.android.utils.DisplayUtils
@@ -50,3 +51,38 @@ fun String.toFile(): File? {
 
     return file
 }
+
+fun String.getExifSize(): Pair<Int, Int>? = try {
+    val exif = ExifInterface(this)
+    var w = exif.getAttributeInt(ExifInterface.TAG_IMAGE_WIDTH, 0)
+    var h = exif.getAttributeInt(ExifInterface.TAG_IMAGE_LENGTH, 0)
+
+    val orientation = exif.getAttributeInt(
+        ExifInterface.TAG_ORIENTATION,
+        ExifInterface.ORIENTATION_NORMAL
+    )
+    if (orientation == ExifInterface.ORIENTATION_ROTATE_90 ||
+        orientation == ExifInterface.ORIENTATION_ROTATE_270
+    ) {
+        val tmp = w
+        w = h
+        h = tmp
+    }
+
+    Log_OC.d(TAG, "Using exif imageDimension: $w x $h")
+    if (w > 0 && h > 0) w to h else null
+} catch (_: Exception) {
+    null
+}
+
+fun String.getBitmapSize(): Pair<Int, Int>? = try {
+    val options = android.graphics.BitmapFactory.Options().apply { inJustDecodeBounds = true }
+    android.graphics.BitmapFactory.decodeFile(this, options)
+    val w = options.outWidth
+    val h = options.outHeight
+
+    Log_OC.d(TAG, "Using bitmap factory imageDimension: $w x $h")
+    if (w > 0 && h > 0) w to h else null
+} catch (_: Exception) {
+    null
+}

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

@@ -7,7 +7,6 @@
 
 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
@@ -35,7 +34,7 @@ private fun RemoteFile.areImageDimensionsSame(path: String): Boolean {
         return true
     }
 
-    val localFileImageDimension = OCFileUtils.getExifSize(path) ?: OCFileUtils.getBitmapSize(path)
+    val localFileImageDimension = path.getExifSize() ?: path.getBitmapSize()
     if (localFileImageDimension == null) {
         // can't compare local file image dimension is not determined
         return true