For mozilla-mobile#26424 - Allow migrated wallpapers to be visible in…

… the wallpaper settings page
Alexandru2909 · Sep 5, 2022 · 722edac · 722edac
1 parent cce7177
commit 722edac
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 0 deletions.
diff --git a/app/src/main/java/org/mozilla/fenix/wallpapers/WallpaperFileManager.kt b/app/src/main/java/org/mozilla/fenix/wallpapers/WallpaperFileManager.kt
@@ -49,6 +49,27 @@ class WallpaperFileManager(
             File(storageRootDirectory, getLocalPath(name, type)).exists()
         }
 
+    /**
+     * Get the list of migrated legacy wallpapers.
+     *
+     * @param remoteAvailableWallpapers List of wallpapers available remote.
+     * @param localAvailableWallpapers List of wallpapers available locally.
+     * @return List of migrated wallpapers.
+     */
+    suspend fun getMigratedWallpapers(
+        remoteAvailableWallpapers: List<Wallpaper>,
+        localAvailableWallpapers: List<Wallpaper>,
+    ) = withContext(Dispatchers.IO) {
+        File(storageRootDirectory, "wallpapers").listFiles()
+            ?.filter { file ->
+                file.isDirectory && !localAvailableWallpapers.map { it.name }
+                    .contains(file.nameWithoutExtension)
+            }
+            ?.map { file ->
+                getWallpaperByName(file.name, remoteAvailableWallpapers)
+            } ?: listOf()
+    }
+
     /**
      * Migrate the legacy wallpapers to the new path and delete the remaining legacy files.
      *

diff --git a/app/src/test/java/org/mozilla/fenix/wallpapers/WallpaperFileManagerTest.kt b/app/src/test/java/org/mozilla/fenix/wallpapers/WallpaperFileManagerTest.kt
@@ -96,6 +96,22 @@ class WallpaperFileManagerTest {
         assertEquals(null, result)
     }
 
+    @Test
+    fun `WHEN looking for migrated wallpapers THEN only the legacy wallpaper is retrieved`() = runTest {
+        val firstWallpaper = "wallpaper1"
+        val secondWallpaper = "wallpaper2"
+        createAllFiles(firstWallpaper)
+        createAllFiles(secondWallpaper)
+
+        val migratedWallpapers = fileManager.getMigratedWallpapers(
+            listOf(),
+            listOf(generateWallpaper(firstWallpaper))
+        )
+
+        assertEquals(1, migratedWallpapers.size)
+        assertEquals(secondWallpaper, migratedWallpapers.single().name)
+    }
+
     @Test
     fun `WHEN legacy wallpapers are migrated AND the migrated file already exists in local wallpapers THEN the legacy wallpaper is not migrated`() = runTest {
         val wallpaperName = "wallpaper"