fix(gallery-fragment): oome

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

Author: alperozturk96

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

@@ -58,21 +58,22 @@ fun OCFile?.getDepth(): OCFileDepth? {
 fun List<OCFile>.toGalleryItems(columns: Int, defaultSize: Int): List<GalleryItems> {
     if (isEmpty()) return emptyList()
 
-    return groupBy { firstOfMonth(it.modificationTimestamp) }
+    val calendar = Calendar.getInstance()
+    return groupBy {
+        calendar.timeInMillis = it.modificationTimestamp
+        calendar.set(Calendar.DAY_OF_MONTH, 1)
+        calendar.set(Calendar.HOUR_OF_DAY, 0)
+        calendar.set(Calendar.MINUTE, 0)
+        calendar.set(Calendar.SECOND, 0)
+        calendar.set(Calendar.MILLISECOND, 0)
+        calendar.timeInMillis
+    }
         .map { (date, filesList) ->
             GalleryItems(date, transformToRows(filesList, columns, defaultSize))
         }
         .sortedByDescending { it.date }
 }
 
-private fun firstOfMonth(timestamp: Long): Long = Calendar.getInstance().apply {
-    time = Date(timestamp)
-    set(Calendar.DAY_OF_MONTH, getActualMinimum(Calendar.DAY_OF_MONTH))
-    set(Calendar.HOUR_OF_DAY, 0)
-    set(Calendar.MINUTE, 0)
-    set(Calendar.SECOND, 0)
-}.timeInMillis
-
 private fun transformToRows(list: List<OCFile>, columns: Int, defaultSize: Int): List<GalleryRow> {
     if (list.isEmpty()) return emptyList()
 

app/src/main/java/com/owncloud/android/ui/fragment/GalleryFragment.kt

@@ -382,32 +382,25 @@ class GalleryFragment :
         val mediaState = bottomSheet?.currMediaState ?: return
 
         showGalleryJob?.cancel()
-        showGalleryJob = lifecycleScope.launch(Dispatchers.IO) {
+        showGalleryJob = lifecycleScope.launch(Dispatchers.Default) {
             val remotePath = preferences.getLastSelectedMediaFolder()
             val items = mContainerActivity.storageManager.getAllGalleryItemsSuspended()
 
-            val predicate: (OCFile) -> Boolean = {
-                when (mediaState) {
-                    MediaState.MEDIA_STATE_PHOTOS_ONLY -> {
-                        it.remotePath.startsWith(remotePath) && MimeTypeUtil.isImage(it.mimeType)
-                    }
-
-                    MediaState.MEDIA_STATE_VIDEOS_ONLY -> {
-                        it.remotePath.startsWith(remotePath) && MimeTypeUtil.isVideo(it.mimeType)
-                    }
+            val isPhotosOnly = mediaState == MediaState.MEDIA_STATE_PHOTOS_ONLY
+            val isVideosOnly = mediaState == MediaState.MEDIA_STATE_VIDEOS_ONLY
 
-                    else -> {
-                        it.remotePath.startsWith(remotePath)
-                    }
-                }
+            val filteredItems = items.filter {
+                if (!it.remotePath.startsWith(remotePath)) return@filter false
+                if (isPhotosOnly) return@filter MimeTypeUtil.isImage(it.mimeType)
+                if (isVideosOnly) return@filter MimeTypeUtil.isVideo(it.mimeType)
+                true
             }
 
-            val filteredItems = items.filter(predicate)
             val galleryItems =
                 filteredItems.toGalleryItems(columnsCount, ThumbnailsCacheManager.getThumbnailDimension())
 
             withContext(Dispatchers.Main) {
-                if (filteredItems.isEmpty()) {
+                if (galleryItems.isEmpty()) {
                     setEmptyListMessage(SearchType.GALLERY_SEARCH)
                 }
                 adapter?.updateList(galleryItems)