diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt index 5402b596d..f21c120f8 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt @@ -44,6 +44,7 @@ import eu.kanade.tachiyomi.util.system.getResourceColor import eu.kanade.tachiyomi.util.system.toast import exh.favorites.FavoritesIntroDialog import exh.favorites.FavoritesSyncStatus +import exh.source.MERGED_SOURCE_ID import exh.source.PERV_EDEN_EN_SOURCE_ID import exh.source.PERV_EDEN_IT_SOURCE_ID import exh.source.isEhBasedManga @@ -545,9 +546,13 @@ class LibraryController( // SY --> R.id.action_migrate -> { val skipPre = preferences.skipPreMigration().get() - val selectedMangaIds = selectedMangas.mapNotNull { it.id } + val selectedMangaIds = selectedMangas.filterNot { it.source == MERGED_SOURCE_ID }.mapNotNull { it.id } destroyActionModeIfNeeded() - PreMigrationController.navigateToMigration(skipPre, router, selectedMangaIds) + if (selectedMangaIds.isNotEmpty()) { + PreMigrationController.navigateToMigration(skipPre, router, selectedMangaIds) + } else { + activity?.toast(R.string.no_valid_manga) + } } R.id.action_clean -> cleanTitles() R.id.action_push_to_mdlist -> pushToMdList() diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt index d41c7b7b7..49b99bf5b 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt @@ -484,7 +484,7 @@ class MangaController : // Hide options for non-library manga menu.findItem(R.id.action_edit_categories).isVisible = presenter.manga.favorite && presenter.getCategories().isNotEmpty() menu.findItem(R.id.action_edit_cover).isVisible = /* SY --> */ false /* presenter.manga.favorite SY <-- */ - menu.findItem(R.id.action_migrate).isVisible = presenter.manga.favorite + menu.findItem(R.id.action_migrate).isVisible = presenter.manga.favorite /* SY --> */ && presenter.manga.source != MERGED_SOURCE_ID /* SY <-- */ // SY --> menu.findItem(R.id.action_edit).isVisible = presenter.manga.favorite || isLocalSource diff --git a/app/src/main/res/values/strings_sy.xml b/app/src/main/res/values/strings_sy.xml index 154d8ac59..ad77d16bf 100644 --- a/app/src/main/res/values/strings_sy.xml +++ b/app/src/main/res/values/strings_sy.xml @@ -384,6 +384,9 @@ + + No valid manga selected + Tracked Lewd