minor final fixes

app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsDownloadScreen.kt

@@ -139,7 +139,7 @@ object SettingsDownloadScreen : SearchableSettings {
                     "downloads",
                 ),
             )!!
-            file.uri.toString() + "\n" to file.filePath!!
+            file.uri.toString() to file.filePath!!
         }
     }
 
@@ -153,7 +153,7 @@ object SettingsDownloadScreen : SearchableSettings {
                     "downloads",
                 ),
             )!!
-            file.uri.toString() to file.filePath!!
+            "(ADM)" + file.uri.toString() to file.filePath!!
         }
     }
 

app/src/main/java/eu/kanade/tachiyomi/data/animedownload/AnimeDownloadCache.kt

@@ -252,6 +252,7 @@ class AnimeDownloadCache(
 
         renewalJob = scope.launchIO {
             var sources = getSources()
+
             // Try to wait until extensions and sources have loaded
             withTimeout(30.seconds) {
                 while (!extensionManager.isInitialized) {
@@ -263,6 +264,7 @@ class AnimeDownloadCache(
                     sources = getSources()
                 }
             }
+
             val sourceDirs = rootDownloadsDir.dir.listFiles().orEmpty()
                 .associate { it.name to SourceDirectory(it) }
                 .mapNotNullKeys { entry ->
@@ -271,6 +273,8 @@ class AnimeDownloadCache(
                     }?.id
                 }
 
+            rootDownloadsDir.sourceDirs = sourceDirs
+
             sourceDirs.values
                 .map { sourceDir ->
                     async {

app/src/main/java/eu/kanade/tachiyomi/data/animelib/AnimelibUpdateNotifier.kt

@@ -160,7 +160,7 @@ class AnimelibUpdateNotifier(private val context: Context) {
         NotificationManagerCompat.from(context).apply {
             // Parent group notification
             notify(
-                Notifications.ID_NEW_CHAPTERS,
+                Notifications.ID_NEW_EPISODES,
                 context.notification(Notifications.CHANNEL_NEW_CHAPTERS_EPISODES) {
                     setContentTitle(context.getString(R.string.notification_new_episodes))
                     if (updates.size == 1 && !preferences.hideNotificationContent().get()) {
@@ -182,7 +182,7 @@ class AnimelibUpdateNotifier(private val context: Context) {
                     setSmallIcon(R.drawable.ic_ani)
                     setLargeIcon(notificationBitmap)
 
-                    setGroup(Notifications.GROUP_NEW_CHAPTERS)
+                    setGroup(Notifications.GROUP_NEW_EPISODES)
                     setGroupAlertBehavior(NotificationCompat.GROUP_ALERT_SUMMARY)
                     setGroupSummary(true)
                     priority = NotificationCompat.PRIORITY_HIGH

app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt

@@ -180,12 +180,13 @@ class MainActivity : BaseActivity() {
             val incognito by preferences.incognitoMode().collectAsState()
             val downloadOnly by preferences.downloadedOnly().collectAsState()
             val indexing by downloadCache.isRenewing.collectAsState()
+            val indexingAnime by animeDownloadCache.isRenewing.collectAsState()
 
             // Set statusbar color considering the top app state banner
             val systemUiController = rememberSystemUiController()
             val isSystemInDarkTheme = isSystemInDarkTheme()
             val statusBarBackgroundColor = when {
-                indexing -> IndexingBannerBackgroundColor
+                indexing || indexingAnime -> IndexingBannerBackgroundColor
                 downloadOnly -> DownloadedOnlyBannerBackgroundColor
                 incognito -> IncognitoModeBannerBackgroundColor
                 else -> MaterialTheme.colorScheme.surface
@@ -240,7 +241,7 @@ class MainActivity : BaseActivity() {
                         AppStateBanners(
                             downloadedOnlyMode = downloadOnly,
                             incognitoMode = incognito,
-                            indexing = indexing,
+                            indexing = indexing || indexingAnime,
                             modifier = Modifier.windowInsetsPadding(scaffoldInsets),
                         )
                     },
@@ -511,6 +512,7 @@ class MainActivity : BaseActivity() {
             libraryPreferences.autoClearChapterCache().get()
         ) {
             chapterCache.clear()
+            episodeCache.clear()
         }
         super.onBackPressed()
     }

i18n/src/main/res/values/strings-aniyomi.xml

@@ -8,14 +8,13 @@
     <string name="chapters_episodes">Chapters and episodes</string>
     <string name="episodes">Episodes</string>
     <string name="backup_settings_warning">Warning: Backing up settings will store your track passwords as well, do not share this backup file!</string>
-    <string name="label_download_queue">Manga Download queue</string>
-    <string name="label_anime_download_queue">Anime Download queue</string>
     <string name="label_mangalibrary">Manga</string>
     <string name="label_animelib">Anime</string>
     <string name="label_anime">Anime</string>
     <string name="label_manga">Manga</string>
     <string name="label_mangasources">Manga Sources</string>
     <string name="label_animesources">Anime Sources</string>
+    <string name="label_watched_duration">Watched duration</string>
     <string name="label_watched_episodes">Watched</string>
     <string name="pref_bottom_nav_no_history">Move History to the More tab</string>
     <string name="pref_bottom_nav_no_updates">Move Updates to the More tab</string>
@@ -214,6 +213,7 @@
     <string name="download_notifier_download_paused_chapters">Chapter download paused</string>
     <string name="download_notifier_download_paused_episodes">Episode download paused</string>
     <string name="channel_new_chapters_episodes">Chapter/Episode updates</string>
+    <string name="pref_invalidate_download_cache_summary">Force app to recheck downloaded chapters and episodes</string>
 
     <string name="player_controls_skip_intro_text">+%1$d s</string>
 

i18n/src/main/res/values/strings.xml

@@ -35,7 +35,6 @@
     <string name="label_local">Local</string>
     <string name="label_downloaded">Downloaded</string>
 
-    <string name="unlock_app">Unlock Aniyomi</string>
     <string name="confirm_lock_change">Authenticate to confirm change</string>
     <string name="confirm_exit">Press back again to exit</string>
 
@@ -495,6 +494,7 @@
     <string name="used_cache">Used: %1$s</string>
     <string name="cache_deleted">Cache cleared. %1$d files have been deleted</string>
     <string name="cache_delete_error">Error occurred while clearing</string>
+    <string name="pref_invalidate_download_cache">Invalidate downloads index</string>
     <string name="clear_database_source_item_count">%1$d non-library entries in database</string>
     <string name="clear_database_completed">Entries deleted</string>
     <string name="database_clean">Nothing to clear</string>
@@ -766,12 +766,10 @@
     <string name="label_overview_section">Overview</string>
     <string name="label_completed_titles">Completed entries</string>
     <string name="label_read_duration">Read duration</string>
-    <string name="label_watched_duration">Watched duration</string>
     <string name="label_titles_section">Entries</string>
     <string name="label_titles_in_global_update">In global update</string>
     <string name="label_total_chapters">Total</string>
     <string name="label_read_chapters">Read</string>
-    <string name="label_watched_episodes">Watched</string>
     <string name="label_tracker_section">Trackers</string>
     <string name="label_tracked_titles">Tracked entries</string>
     <string name="label_mean_score">Mean score</string>