Fix issue with chosen titles sometimes reverting

julieminer · Aug 8, 2024 · 5f8db60 · 5f8db60
1 parent cc42e88
commit 5f8db60
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/app/src/main/java/com/melonhead/mangadexfollower/extensions/DbMappingExtensions.kt b/app/src/main/java/com/melonhead/mangadexfollower/extensions/DbMappingExtensions.kt
@@ -17,12 +17,12 @@ fun ChapterEntity.Companion.from(chapter: Chapter): ChapterEntity {
     )
 }
 
-fun MangaEntity.Companion.from(manga: Manga): MangaEntity {
+fun MangaEntity.Companion.from(manga: Manga, chosenTitle: String?): MangaEntity {
     val titles = manga.attributes.getEnglishTitles()
     return MangaEntity(
         id = manga.id,
         mangaTitles = titles,
-        chosenTitle = titles.last(),
+        chosenTitle = chosenTitle ?: titles.last(),
         mangaCoverId = manga.fileName,
         status = manga.attributes.status,
         tags = manga.attributes.tags.mapNotNull {

diff --git a/app/src/main/java/com/melonhead/mangadexfollower/repositories/MangaRepository.kt b/app/src/main/java/com/melonhead/mangadexfollower/repositories/MangaRepository.kt
@@ -126,10 +126,10 @@ class MangaRepository(
 
             if (mangaIds.isNotEmpty()) {
                 val mangaSeries = mangaService.getManga(token, mangaIds.toList())
-                val manga = mangaSeries.map { MangaEntity.from(it) }
-
-                // grab the chosen title from the DB
-                manga.map { it.copy(chosenTitle = mangaDb.getMangaById(it.id).first()?.chosenTitle) }
+                val manga = mangaSeries.map {
+                    // grab the chosen title from the DB
+                    MangaEntity.from(it, mangaDb.getMangaById(it.id).first()?.chosenTitle)
+                }
 
                 // insert new series into local db
                 mangaDb.insertAll(*manga.toTypedArray())