From 88ea0fb082dc92601f8fb001bce9e7750f7b23de Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 18 Dec 2024 11:23:53 +0100
Subject: [PATCH] Fix ordering of media.

---
 .../impl/gallery/MediaItemsPostProcessor.kt   |  4 +-
 .../gallery/MediaItemsPostProcessorTest.kt    | 48 +++++++++----------
 2 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaItemsPostProcessor.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaItemsPostProcessor.kt
index 229f547c3b..dfaa39ae10 100644
--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaItemsPostProcessor.kt
+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaItemsPostProcessor.kt
@@ -54,12 +54,12 @@ class MediaItemsPostProcessor @Inject constructor() {
                     when (item) {
                         is MediaItem.Image,
                         is MediaItem.Video -> {
-                            imageAndVideoItemsSubList.add(0, item)
+                            imageAndVideoItemsSubList.add(item)
                         }
                         is MediaItem.Audio,
                         is MediaItem.Voice,
                         is MediaItem.File -> {
-                            fileItemsSublist.add(0, item)
+                            fileItemsSublist.add(item)
                         }
                     }
                 }
diff --git a/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaItemsPostProcessorTest.kt b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaItemsPostProcessorTest.kt
index 9621413da6..934ed860af 100644
--- a/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaItemsPostProcessorTest.kt
+++ b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaItemsPostProcessorTest.kt
@@ -85,10 +85,10 @@ class MediaItemsPostProcessorTest {
             expectedImageAndVideoItems = emptyList(),
             expectedFileItems = listOf(
                 date1,
-                file1,
-                file2,
-                file3,
                 audio1,
+                file3,
+                file2,
+                file1,
             ),
         )
     }
@@ -104,9 +104,9 @@ class MediaItemsPostProcessorTest {
             ),
             expectedImageAndVideoItems = listOf(
                 date1,
-                image1,
-                image2,
                 image3,
+                image2,
+                image1,
             ),
             expectedFileItems = emptyList(),
         )
@@ -124,13 +124,13 @@ class MediaItemsPostProcessorTest {
             ),
             expectedImageAndVideoItems = listOf(
                 date1,
-                video1,
                 image1,
+                video1,
             ),
             expectedFileItems = listOf(
                 date1,
-                file1,
                 audio1,
+                file1,
             ),
         )
     }
@@ -167,6 +167,11 @@ class MediaItemsPostProcessorTest {
     fun `process will handle complex case`() {
         test(
             mediaItems = listOf(
+                file3,
+                date3,
+                video3,
+                video2,
+                date2,
                 voice3,
                 voice2,
                 voice1,
@@ -177,33 +182,28 @@ class MediaItemsPostProcessorTest {
                 image1,
                 video1,
                 date1,
-                file3,
-                date3,
-                video3,
-                video2,
-                date2,
                 loading1,
             ),
             expectedImageAndVideoItems = listOf(
-                date1,
-                video1,
-                image1,
                 date2,
-                video2,
                 video3,
+                video2,
+                date1,
+                image1,
+                video1,
                 loading1,
             ),
             expectedFileItems = listOf(
-                date1,
-                file1,
-                audio1,
-                audio2,
-                audio3,
-                voice1,
-                voice2,
-                voice3,
                 date3,
                 file3,
+                date1,
+                voice3,
+                voice2,
+                voice1,
+                audio3,
+                audio2,
+                audio1,
+                file1,
                 loading1,
             ),
         )