perf: simplify

Signed-off-by: alperozturk <[email protected]>

Author: alperozturk96

app/src/main/java/com/nextcloud/client/jobs/gallery/GalleryImageGenerationJob.kt

@@ -32,10 +32,7 @@ import kotlinx.coroutines.sync.Semaphore
 import kotlinx.coroutines.sync.withPermit
 import kotlinx.coroutines.withContext
 
-class GalleryImageGenerationJob(
-    private val user: User,
-    private val storageManager: FileDataStorageManager
-) {
+class GalleryImageGenerationJob(private val user: User, private val storageManager: FileDataStorageManager) {
     companion object {
         private const val TAG = "GalleryImageGenerationJob"
         private val semaphore = Semaphore(
@@ -80,11 +77,7 @@ class GalleryImageGenerationJob(
         }
     }
 
-    private fun getPlaceholder(
-        file: OCFile,
-        width: Int,
-        viewThemeUtils: ViewThemeUtils
-    ): BitmapDrawable {
+    private fun getPlaceholder(file: OCFile, width: Int, viewThemeUtils: ViewThemeUtils): BitmapDrawable {
         val context = MainApp.getAppContext()
 
         val placeholder = MimeTypeUtil.getFileTypeIcon(
@@ -111,35 +104,34 @@ class GalleryImageGenerationJob(
         width: Int,
         viewThemeUtils: ViewThemeUtils,
         onThumbnailGeneration: () -> Unit
-    ): Bitmap? =
-        withContext(Dispatchers.IO) {
-            if (file.remoteId == null && !file.isPreviewAvailable) {
-                Log_OC.w(TAG, "file has no remoteId and no preview")
-                return@withContext null
-            }
+    ): Bitmap? = withContext(Dispatchers.IO) {
+        if (file.remoteId == null && !file.isPreviewAvailable) {
+            Log_OC.w(TAG, "file has no remoteId and no preview")
+            return@withContext null
+        }
 
-            val key = file.remoteId
-            val cachedThumbnail = ThumbnailsCacheManager.getBitmapFromDiskCache(
-                ThumbnailsCacheManager.PREFIX_RESIZED_IMAGE + file.remoteId
-            )
-            if (cachedThumbnail != null && !file.isUpdateThumbnailNeeded) {
-                Log_OC.d(TAG, "cached thumbnail is used for: ${file.fileName}")
-                return@withContext getThumbnailFromCache(file, cachedThumbnail, key)
-            }
+        val key = file.remoteId
+        val cachedThumbnail = ThumbnailsCacheManager.getBitmapFromDiskCache(
+            ThumbnailsCacheManager.PREFIX_RESIZED_IMAGE + file.remoteId
+        )
+        if (cachedThumbnail != null && !file.isUpdateThumbnailNeeded) {
+            Log_OC.d(TAG, "cached thumbnail is used for: ${file.fileName}")
+            return@withContext getThumbnailFromCache(file, cachedThumbnail, key)
+        }
 
-            Log_OC.d(TAG, "generating new thumbnail for: ${file.fileName}")
+        Log_OC.d(TAG, "generating new thumbnail for: ${file.fileName}")
 
-            // only add placeholder if new thumbnail will be generated because cached image will appear so quickly
-            withContext(Dispatchers.Main) {
-                val placeholderDrawable = getPlaceholder(file, width, viewThemeUtils)
-                imageView.setImageDrawable(placeholderDrawable)
-            }
+        // only add placeholder if new thumbnail will be generated because cached image will appear so quickly
+        withContext(Dispatchers.Main) {
+            val placeholderDrawable = getPlaceholder(file, width, viewThemeUtils)
+            imageView.setImageDrawable(placeholderDrawable)
+        }
 
-            onThumbnailGeneration()
-            semaphore.withPermit {
-                return@withContext getThumbnailFromServerAndAddToCache(file, cachedThumbnail)
-            }
+        onThumbnailGeneration()
+        semaphore.withPermit {
+            return@withContext getThumbnailFromServerAndAddToCache(file, cachedThumbnail)
         }
+    }
 
     private suspend fun setThumbnail(
         bitmap: Bitmap,

app/src/main/java/com/owncloud/android/ui/adapter/GalleryRowHolder.kt

@@ -26,7 +26,6 @@ import com.owncloud.android.databinding.GalleryRowBinding
 import com.owncloud.android.datamodel.FileDataStorageManager
 import com.owncloud.android.datamodel.GalleryRow
 import com.owncloud.android.datamodel.OCFile
-import com.owncloud.android.datamodel.ThumbnailsCacheManager
 import com.owncloud.android.lib.resources.files.model.ImageDimension
 import com.owncloud.android.utils.BitmapUtils
 import com.owncloud.android.utils.DisplayUtils