From 57708b37b83a88513eec7530961fec70820cd104 Mon Sep 17 00:00:00 2001
From: Pasta <mhavgonzales@gmail.com>
Date: Thu, 3 Sep 2026 17:44:12 +0300
Subject: [PATCH 01/54] fix(tv): restore imports, UI mode selection, and
 channel navigation

---
 .../ui/screens/settings/ImportViewModel.kt    |  27 +++
 .../io/github/aedev/flow/ui/tv/FlowTvApp.kt   |  35 +++-
 .../aedev/flow/ui/tv/navigation/TvNavHost.kt  |   5 +
 .../aedev/flow/ui/tv/navigation/TvRoutes.kt   |   1 +
 .../flow/ui/tv/player/TvPlayerOverlay.kt      |  32 ++-
 .../flow/ui/tv/screens/TvImportDataScreen.kt  | 190 ++++++++++++++++++
 .../flow/ui/tv/screens/TvSettingsScreen.kt    |   6 +-
 .../screens/settings/TvSettingsCategories.kt  |   2 +
 .../screens/settings/TvSystemSettingsPanes.kt |  10 +-
 9 files changed, 283 insertions(+), 25 deletions(-)
 create mode 100644 app/src/main/java/io/github/aedev/flow/ui/tv/screens/TvImportDataScreen.kt

diff --git a/app/src/main/java/io/github/aedev/flow/ui/screens/settings/ImportViewModel.kt b/app/src/main/java/io/github/aedev/flow/ui/screens/settings/ImportViewModel.kt
index c9392c108..9abffe429 100644
--- a/app/src/main/java/io/github/aedev/flow/ui/screens/settings/ImportViewModel.kt
+++ b/app/src/main/java/io/github/aedev/flow/ui/screens/settings/ImportViewModel.kt
@@ -77,6 +77,33 @@ class ImportViewModel
 
         // ── Public import launchers ───────────────────────────────────────────────
 
+        fun importFlowBackup(uri: Uri) {
+            if (isRunning) return
+            val label = context.getString(R.string.import_flow_backup_item_title)
+            val successMessage = context.getString(R.string.import_flow_backup_success)
+            viewModelScope.launch {
+                startProgress(label, 0, 0)
+                try {
+                    val result = backupRepo.importData(uri)
+                    if (result.isSuccess) {
+                        _state.value = State.Success(label, message = successMessage)
+                        if (NotificationHelper.hasNotificationPermission(context)) {
+                            NotificationHelper.showImportComplete(context, label, 0, successMessage)
+                        }
+                    } else {
+                        val msg = result.exceptionOrNull()?.message ?: context.getString(R.string.unknown_error)
+                        _state.value = State.Error(label, msg)
+                    }
+                } catch (e: CancellationException) {
+                    throw e
+                } catch (e: Exception) {
+                    _state.value = State.Error(label, e.message ?: context.getString(R.string.unknown_error))
+                } finally {
+                    NotificationHelper.cancelImportNotification(context)
+                }
+            }
+        }
+
         fun importNewPipe(uri: Uri) {
             if (isRunning) return
             val label = context.getString(R.string.import_label_newpipe_subscriptions)
diff --git a/app/src/main/java/io/github/aedev/flow/ui/tv/FlowTvApp.kt b/app/src/main/java/io/github/aedev/flow/ui/tv/FlowTvApp.kt
index bddee2c51..143377156 100644
--- a/app/src/main/java/io/github/aedev/flow/ui/tv/FlowTvApp.kt
+++ b/app/src/main/java/io/github/aedev/flow/ui/tv/FlowTvApp.kt
@@ -5,6 +5,7 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Surface
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
@@ -26,6 +27,9 @@ import io.github.aedev.flow.ui.screens.player.VideoPlayerViewModel
 import io.github.aedev.flow.ui.screens.search.SearchViewModel
 import io.github.aedev.flow.ui.screens.subscriptions.SubscriptionsViewModel
 import io.github.aedev.flow.ui.tv.music.TvMusicNowPlayingScreen
+import io.github.aedev.flow.ui.tv.navigation.TvRoutes
+import io.github.aedev.flow.ui.tv.player.LocalTvPlayerChannelAction
+import io.github.aedev.flow.ui.tv.player.TvPlayerChannelAction
 import io.github.aedev.flow.ui.tv.screens.TvPlayerScreen
 import io.github.aedev.flow.ui.tv.theme.TvTheme
 
@@ -63,6 +67,17 @@ fun FlowTvApp(
         playerViewModel.playVideo(video)
     }
 
+    fun closeVideo() {
+        playerViewModel.clearVideo()
+        GlobalPlayerState.setCurrentVideo(null)
+    }
+
+    fun openVideoChannel(channelRef: String) {
+        if (channelRef.isBlank()) return
+        closeVideo()
+        navController.navigate(TvRoutes.channel(channelRef))
+    }
+
     fun playPlaylist(
         videos: List<Video>,
         title: String,
@@ -124,14 +139,18 @@ fun FlowTvApp(
                     },
                 )
             } else {
-                TvPlayerScreen(
-                    video = video,
-                    viewModel = playerViewModel,
-                    onClose = {
-                        playerViewModel.clearVideo()
-                        GlobalPlayerState.setCurrentVideo(null)
-                    },
-                )
+                CompositionLocalProvider(
+                    LocalTvPlayerChannelAction provides TvPlayerChannelAction(
+                        channelRef = video.channelId.takeIf { it.isNotBlank() },
+                        onOpenChannel = ::openVideoChannel,
+                    ),
+                ) {
+                    TvPlayerScreen(
+                        video = video,
+                        viewModel = playerViewModel,
+                        onClose = ::closeVideo,
+                    )
+                }
             }
         }
     }
diff --git a/app/src/main/java/io/github/aedev/flow/ui/tv/navigation/TvNavHost.kt b/app/src/main/java/io/github/aedev/flow/ui/tv/navigation/TvNavHost.kt
index 5558d29f5..d12f50e74 100644
--- a/app/src/main/java/io/github/aedev/flow/ui/tv/navigation/TvNavHost.kt
+++ b/app/src/main/java/io/github/aedev/flow/ui/tv/navigation/TvNavHost.kt
@@ -18,6 +18,7 @@ import io.github.aedev.flow.ui.screens.subscriptions.SubscriptionsViewModel
 import io.github.aedev.flow.ui.tv.screens.TvArtistScreen
 import io.github.aedev.flow.ui.tv.screens.TvChannelScreen
 import io.github.aedev.flow.ui.tv.screens.TvHomeScreen
+import io.github.aedev.flow.ui.tv.screens.TvImportDataScreen
 import io.github.aedev.flow.ui.tv.screens.TvLibraryScreen
 import io.github.aedev.flow.ui.tv.screens.TvMusicCollectionScreen
 import io.github.aedev.flow.ui.tv.screens.TvMusicScreen
@@ -126,6 +127,7 @@ fun TvNavHost(
             TvSettingsScreen(
                 onOpenSync = { navController.navigate(TvRoutes.SYNC) },
                 onOpenRemoteGuide = { navController.navigate(TvRoutes.REMOTE_GUIDE) },
+                onOpenImportData = { navController.navigate(TvRoutes.IMPORT_DATA) },
                 modifier = Modifier.fillMaxSize(),
             )
         }
@@ -135,6 +137,9 @@ fun TvNavHost(
         composable(TvRoutes.REMOTE_GUIDE) {
             TvRemoteGuideScreen(onNavigateBack = { navController.popBackStack() })
         }
+        composable(TvRoutes.IMPORT_DATA) {
+            TvImportDataScreen(onNavigateBack = { navController.popBackStack() })
+        }
         composable(
             route = TvRoutes.CHANNEL,
             arguments = listOf(
diff --git a/app/src/main/java/io/github/aedev/flow/ui/tv/navigation/TvRoutes.kt b/app/src/main/java/io/github/aedev/flow/ui/tv/navigation/TvRoutes.kt
index eec92d4ec..a180bb3d7 100644
--- a/app/src/main/java/io/github/aedev/flow/ui/tv/navigation/TvRoutes.kt
+++ b/app/src/main/java/io/github/aedev/flow/ui/tv/navigation/TvRoutes.kt
@@ -18,6 +18,7 @@ object TvRoutes {
 
     const val SYNC = "sync"
     const val REMOTE_GUIDE = "remoteGuide"
+    const val IMPORT_DATA = "importData"
 
     /** [channelRef] is a full channel URL (preferred) or a bare channel id. */
     fun channel(channelRef: String): String = "channel?ref=${Uri.encode(channelRef)}"
diff --git a/app/src/main/java/io/github/aedev/flow/ui/tv/player/TvPlayerOverlay.kt b/app/src/main/java/io/github/aedev/flow/ui/tv/player/TvPlayerOverlay.kt
index ddc9f76f1..d3e530f92 100644
--- a/app/src/main/java/io/github/aedev/flow/ui/tv/player/TvPlayerOverlay.kt
+++ b/app/src/main/java/io/github/aedev/flow/ui/tv/player/TvPlayerOverlay.kt
@@ -18,14 +18,23 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.staticCompositionLocalOf
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import io.github.aedev.flow.R
+import io.github.aedev.flow.ui.tv.components.TvButton
 import io.github.aedev.flow.ui.tv.theme.LocalTvDimens
 
+data class TvPlayerChannelAction(
+    val channelRef: String?,
+    val onOpenChannel: (String) -> Unit,
+)
+
+val LocalTvPlayerChannelAction = staticCompositionLocalOf<TvPlayerChannelAction?> { null }
+
 /**
  * Transport chrome for the TV player: only the top metadata band carries a
  * translucent surface fill — the bottom controls float directly over the video
@@ -86,13 +95,22 @@ fun BoxScope.TvPlayerOverlay(
                     )
                 }
                 if (channelName.isNotBlank()) {
-                    Text(
-                        text = channelName,
-                        style = MaterialTheme.typography.bodyLarge,
-                        color = MaterialTheme.colorScheme.onSurfaceVariant,
-                        maxLines = 1,
-                        overflow = TextOverflow.Ellipsis,
-                    )
+                    val channelAction = LocalTvPlayerChannelAction.current
+                    val channelRef = channelAction?.channelRef?.takeIf { it.isNotBlank() }
+                    if (channelAction != null && channelRef != null) {
+                        TvButton(
+                            text = channelName,
+                            onClick = { channelAction.onOpenChannel(channelRef) },
+                        )
+                    } else {
+                        Text(
+                            text = channelName,
+                            style = MaterialTheme.typography.bodyLarge,
+                            color = MaterialTheme.colorScheme.onSurfaceVariant,
+                            maxLines = 1,
+                            overflow = TextOverflow.Ellipsis,
+                        )
+                    }
                 }
             }
         }
diff --git a/app/src/main/java/io/github/aedev/flow/ui/tv/screens/TvImportDataScreen.kt b/app/src/main/java/io/github/aedev/flow/ui/tv/screens/TvImportDataScreen.kt
new file mode 100644
index 000000000..34f9aaabb
--- /dev/null
+++ b/app/src/main/java/io/github/aedev/flow/ui/tv/screens/TvImportDataScreen.kt
@@ -0,0 +1,190 @@
+package io.github.aedev.flow.ui.tv.screens
+
+import androidx.activity.ComponentActivity
+import androidx.activity.compose.rememberLauncherForActivityResult
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.widthIn
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.outlined.ArrowBack
+import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.LinearProgressIndicator
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import io.github.aedev.flow.R
+import io.github.aedev.flow.ui.screens.settings.ImportViewModel
+import io.github.aedev.flow.ui.tv.components.TvButton
+import io.github.aedev.flow.ui.tv.components.TvScreenScaffold
+import io.github.aedev.flow.ui.tv.components.TvSelectionRow
+import io.github.aedev.flow.ui.tv.focus.tvInitialFocus
+import io.github.aedev.flow.ui.tv.theme.LocalTvDimens
+
+/**
+ * TV-native entry point for file based restores. The system document picker keeps
+ * storage access permissionless and works with local, USB and document-provider files.
+ */
+@Composable
+fun TvImportDataScreen(
+    onNavigateBack: () -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    val context = LocalContext.current
+    val activity = context as ComponentActivity
+    val viewModel: ImportViewModel = hiltViewModel(activity)
+    val state by viewModel.state.collectAsStateWithLifecycle()
+    val dimens = LocalTvDimens.current
+
+    val flowBackupLauncher =
+        rememberLauncherForActivityResult(ActivityResultContracts.OpenDocument()) { uri ->
+            uri?.let(viewModel::importFlowBackup)
+        }
+    val masterBackupLauncher =
+        rememberLauncherForActivityResult(ActivityResultContracts.OpenDocument()) { uri ->
+            uri?.let(viewModel::importMasterBackup)
+        }
+    val newPipeLauncher =
+        rememberLauncherForActivityResult(ActivityResultContracts.OpenDocument()) { uri ->
+            uri?.let(viewModel::importNewPipe)
+        }
+    val libreTubeLauncher =
+        rememberLauncherForActivityResult(ActivityResultContracts.OpenDocument()) { uri ->
+            uri?.let(viewModel::importLibreTube)
+        }
+    val takeoutLauncher =
+        rememberLauncherForActivityResult(ActivityResultContracts.OpenDocument()) { uri ->
+            uri?.let(viewModel::importYouTubeTakeout)
+        }
+
+    TvScreenScaffold(
+        title = stringResource(R.string.import_data_title),
+        subtitle = stringResource(R.string.import_migrate_description),
+        modifier = modifier,
+        action = {
+            TvButton(
+                text = stringResource(R.string.close),
+                icon = Icons.AutoMirrored.Outlined.ArrowBack,
+                onClick = onNavigateBack,
+            )
+        },
+    ) {
+        Column(
+            modifier =
+                Modifier
+                    .fillMaxSize()
+                    .padding(horizontal = dimens.overscanHorizontal)
+                    .verticalScroll(rememberScrollState()),
+            verticalArrangement = Arrangement.spacedBy(14.dp),
+        ) {
+            ImportStatus(state = state, onDismiss = viewModel::dismiss)
+
+            Column(
+                modifier = Modifier.widthIn(max = 760.dp),
+                verticalArrangement = Arrangement.spacedBy(8.dp),
+            ) {
+                TvSelectionRow(
+                    label = stringResource(R.string.import_flow_backup_item_title),
+                    supportingText = stringResource(R.string.import_flow_backup_desc),
+                    selected = false,
+                    onClick = { flowBackupLauncher.launch(JSON_MIME_TYPES) },
+                    modifier = Modifier.tvInitialFocus(),
+                )
+                TvSelectionRow(
+                    label = stringResource(R.string.import_master_backup_title),
+                    supportingText = stringResource(R.string.import_master_backup_desc),
+                    selected = false,
+                    onClick = { masterBackupLauncher.launch(ZIP_MIME_TYPES) },
+                )
+                TvSelectionRow(
+                    label = stringResource(R.string.import_from_newpipe),
+                    supportingText = stringResource(R.string.import_from_newpipe_desc),
+                    selected = false,
+                    onClick = { newPipeLauncher.launch(JSON_MIME_TYPES) },
+                )
+                TvSelectionRow(
+                    label = stringResource(R.string.import_from_libretube),
+                    supportingText = stringResource(R.string.import_from_libretube_desc),
+                    selected = false,
+                    onClick = { libreTubeLauncher.launch(JSON_MIME_TYPES) },
+                )
+                TvSelectionRow(
+                    label = stringResource(R.string.import_yt_takeout_all),
+                    supportingText = stringResource(R.string.import_yt_takeout_all_desc),
+                    selected = false,
+                    onClick = { takeoutLauncher.launch(ZIP_MIME_TYPES) },
+                )
+            }
+        }
+    }
+}
+
+@Composable
+private fun ImportStatus(
+    state: ImportViewModel.State,
+    onDismiss: () -> Unit,
+) {
+    when (state) {
+        ImportViewModel.State.Idle -> Unit
+        is ImportViewModel.State.Running -> {
+            Column(
+                modifier = Modifier.fillMaxWidth().widthIn(max = 760.dp),
+                verticalArrangement = Arrangement.spacedBy(8.dp),
+            ) {
+                Text(text = state.label, style = MaterialTheme.typography.titleMedium)
+                if (state.total > 0) {
+                    LinearProgressIndicator(
+                        progress = { (state.current.toFloat() / state.total).coerceIn(0f, 1f) },
+                        modifier = Modifier.fillMaxWidth(),
+                    )
+                } else {
+                    CircularProgressIndicator()
+                }
+            }
+        }
+
+        is ImportViewModel.State.Success -> {
+            Column(
+                verticalArrangement = Arrangement.spacedBy(8.dp),
+                horizontalAlignment = Alignment.Start,
+            ) {
+                Text(
+                    text = state.message ?: stringResource(R.string.import_success, state.label),
+                    style = MaterialTheme.typography.bodyLarge,
+                    color = MaterialTheme.colorScheme.primary,
+                )
+                TvButton(text = stringResource(R.string.dismiss), onClick = onDismiss)
+            }
+        }
+
+        is ImportViewModel.State.Error -> {
+            Column(
+                verticalArrangement = Arrangement.spacedBy(8.dp),
+                horizontalAlignment = Alignment.Start,
+            ) {
+                Text(
+                    text = stringResource(R.string.import_failed_template, state.message),
+                    style = MaterialTheme.typography.bodyLarge,
+                    color = MaterialTheme.colorScheme.error,
+                )
+                TvButton(text = stringResource(R.string.dismiss), onClick = onDismiss)
+            }
+        }
+    }
+}
+
+private val JSON_MIME_TYPES = arrayOf("application/json", "text/json", "text/plain", "application/octet-stream")
+private val ZIP_MIME_TYPES = arrayOf("application/zip", "application/x-zip-compressed", "application/octet-stream")
diff --git a/app/src/main/java/io/github/aedev/flow/ui/tv/screens/TvSettingsScreen.kt b/app/src/main/java/io/github/aedev/flow/ui/tv/screens/TvSettingsScreen.kt
index 0268cc3e1..2d1e25d9a 100644
--- a/app/src/main/java/io/github/aedev/flow/ui/tv/screens/TvSettingsScreen.kt
+++ b/app/src/main/java/io/github/aedev/flow/ui/tv/screens/TvSettingsScreen.kt
@@ -49,6 +49,7 @@ fun TvSettingsScreen(
     modifier: Modifier = Modifier,
     onOpenSync: () -> Unit = {},
     onOpenRemoteGuide: () -> Unit = {},
+    onOpenImportData: () -> Unit = {},
 ) {
     val context = LocalContext.current
     val playerPreferences = remember { PlayerPreferences(context.applicationContext) }
@@ -82,13 +83,15 @@ fun TvSettingsScreen(
                             when (category) {
                                 TvSettingsCategory.SYNC -> onOpenSync()
                                 TvSettingsCategory.REMOTE_GUIDE -> onOpenRemoteGuide()
+                                TvSettingsCategory.IMPORT_DATA -> onOpenImportData()
                                 else -> selectedCategory = category
                             }
                         },
                         onFocused = {
                             // Route categories need an explicit click; panes follow focus.
                             if (category != TvSettingsCategory.SYNC &&
-                                category != TvSettingsCategory.REMOTE_GUIDE
+                                category != TvSettingsCategory.REMOTE_GUIDE &&
+                                category != TvSettingsCategory.IMPORT_DATA
                             ) {
                                 selectedCategory = category
                             }
@@ -107,6 +110,7 @@ fun TvSettingsScreen(
                     TvSettingsCategory.INTERFACE -> TvInterfaceSettingsPane(modePreferences)
                     TvSettingsCategory.ABOUT -> TvAboutSettingsPane()
                     TvSettingsCategory.REMOTE_GUIDE,
+                    TvSettingsCategory.IMPORT_DATA,
                     TvSettingsCategory.SYNC,
                     -> Unit
                 }
diff --git a/app/src/main/java/io/github/aedev/flow/ui/tv/screens/settings/TvSettingsCategories.kt b/app/src/main/java/io/github/aedev/flow/ui/tv/screens/settings/TvSettingsCategories.kt
index e026c46d6..9a38a4c2e 100644
--- a/app/src/main/java/io/github/aedev/flow/ui/tv/screens/settings/TvSettingsCategories.kt
+++ b/app/src/main/java/io/github/aedev/flow/ui/tv/screens/settings/TvSettingsCategories.kt
@@ -3,6 +3,7 @@ package io.github.aedev.flow.ui.tv.screens.settings
 import androidx.annotation.StringRes
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.Devices
+import androidx.compose.material.icons.outlined.FileDownload
 import androidx.compose.material.icons.outlined.Info
 import androidx.compose.material.icons.outlined.Palette
 import androidx.compose.material.icons.outlined.PlayCircleOutline
@@ -26,6 +27,7 @@ enum class TvSettingsCategory(
     FLOW_ENGINE(R.string.tv_settings_flow_engine, Icons.Outlined.Psychology),
     INTERFACE(R.string.interface_mode_title, Icons.Outlined.Tv),
     REMOTE_GUIDE(R.string.tv_remote_guide_title, Icons.Outlined.SettingsRemote),
+    IMPORT_DATA(R.string.import_data_title, Icons.Outlined.FileDownload),
     SYNC(R.string.tv_settings_sync, Icons.Outlined.Devices),
     ABOUT(R.string.about, Icons.Outlined.Info),
 }
diff --git a/app/src/main/java/io/github/aedev/flow/ui/tv/screens/settings/TvSystemSettingsPanes.kt b/app/src/main/java/io/github/aedev/flow/ui/tv/screens/settings/TvSystemSettingsPanes.kt
index 37915a4cc..5e3b41ecf 100644
--- a/app/src/main/java/io/github/aedev/flow/ui/tv/screens/settings/TvSystemSettingsPanes.kt
+++ b/app/src/main/java/io/github/aedev/flow/ui/tv/screens/settings/TvSystemSettingsPanes.kt
@@ -6,10 +6,8 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.rememberCoroutineScope
-import androidx.compose.runtime.withFrameNanos
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.platform.LocalFocusManager
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
@@ -61,7 +59,6 @@ fun TvInterfaceSettingsPane(
     modifier: Modifier = Modifier,
 ) {
     val scope = rememberCoroutineScope()
-    val focusManager = LocalFocusManager.current
     val selectedMode by modePreferences.mode.collectAsStateWithLifecycle(initialValue = AppUiMode.AUTOMATIC)
 
     Column(
@@ -85,12 +82,7 @@ fun TvInterfaceSettingsPane(
                 selected = selectedMode == mode,
                 onClick = {
                     if (mode != selectedMode) {
-                        scope.launch {
-                            // Release focus before the whole UI tree is swapped out.
-                            focusManager.clearFocus(force = true)
-                            withFrameNanos { }
-                            modePreferences.setMode(mode)
-                        }
+                        scope.launch { modePreferences.setMode(mode) }
                     }
                 },
             )

From 9ac33d1a9d56bbc0a375d8407356fb7620f7b407 Mon Sep 17 00:00:00 2001
From: Pasta <mhavgonzales@gmail.com>
Date: Thu, 3 Sep 2026 17:55:40 +0300
Subject: [PATCH 02/54] style(tv): apply ktlint wrapping

---
 .../main/java/io/github/aedev/flow/ui/tv/FlowTvApp.kt    | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/io/github/aedev/flow/ui/tv/FlowTvApp.kt b/app/src/main/java/io/github/aedev/flow/ui/tv/FlowTvApp.kt
index 143377156..6a08a52e9 100644
--- a/app/src/main/java/io/github/aedev/flow/ui/tv/FlowTvApp.kt
+++ b/app/src/main/java/io/github/aedev/flow/ui/tv/FlowTvApp.kt
@@ -140,10 +140,11 @@ fun FlowTvApp(
                 )
             } else {
                 CompositionLocalProvider(
-                    LocalTvPlayerChannelAction provides TvPlayerChannelAction(
-                        channelRef = video.channelId.takeIf { it.isNotBlank() },
-                        onOpenChannel = ::openVideoChannel,
-                    ),
+                    LocalTvPlayerChannelAction provides
+                        TvPlayerChannelAction(
+                            channelRef = video.channelId.takeIf { it.isNotBlank() },
+                            onOpenChannel = ::openVideoChannel,
+                        ),
                 ) {
                     TvPlayerScreen(
                         video = video,

From 820eeeb9b887b39a591b3f02a89429d8f44f6e51 Mon Sep 17 00:00:00 2001
From: Pasta <mhavgonzales@gmail.com>
Date: Thu, 3 Sep 2026 17:56:01 +0300
Subject: [PATCH 03/54] style(tv): format navigation host

---
 .../aedev/flow/ui/tv/navigation/TvNavHost.kt  | 21 +++++++++++--------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/io/github/aedev/flow/ui/tv/navigation/TvNavHost.kt b/app/src/main/java/io/github/aedev/flow/ui/tv/navigation/TvNavHost.kt
index d12f50e74..c121052e1 100644
--- a/app/src/main/java/io/github/aedev/flow/ui/tv/navigation/TvNavHost.kt
+++ b/app/src/main/java/io/github/aedev/flow/ui/tv/navigation/TvNavHost.kt
@@ -142,16 +142,19 @@ fun TvNavHost(
         }
         composable(
             route = TvRoutes.CHANNEL,
-            arguments = listOf(
-                navArgument(TvRoutes.CHANNEL_ARG) {
-                    type = NavType.StringType
-                    defaultValue = ""
-                },
-            ),
+            arguments =
+                listOf(
+                    navArgument(TvRoutes.CHANNEL_ARG) {
+                        type = NavType.StringType
+                        defaultValue = ""
+                    },
+                ),
         ) { entry ->
-            val channelRef = entry.arguments?.getString(TvRoutes.CHANNEL_ARG)
-                ?.let { java.net.URLDecoder.decode(it, "UTF-8") }
-                .orEmpty()
+            val channelRef =
+                entry.arguments
+                    ?.getString(TvRoutes.CHANNEL_ARG)
+                    ?.let { java.net.URLDecoder.decode(it, "UTF-8") }
+                    .orEmpty()
             TvChannelScreen(
                 channelUrl = channelRef,
                 onVideoClick = onPlayVideo,

From 1f7087d901a6cccd424ac7a263a5e6d38d3ae33f Mon Sep 17 00:00:00 2001
From: Pasta <mhavgonzales@gmail.com>
Date: Thu, 3 Sep 2026 17:56:09 +0300
Subject: [PATCH 04/54] style(tv): format routes

---
 .../java/io/github/aedev/flow/ui/tv/navigation/TvRoutes.kt     | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/src/main/java/io/github/aedev/flow/ui/tv/navigation/TvRoutes.kt b/app/src/main/java/io/github/aedev/flow/ui/tv/navigation/TvRoutes.kt
index a180bb3d7..f19db2dce 100644
--- a/app/src/main/java/io/github/aedev/flow/ui/tv/navigation/TvRoutes.kt
+++ b/app/src/main/java/io/github/aedev/flow/ui/tv/navigation/TvRoutes.kt
@@ -25,8 +25,7 @@ object TvRoutes {
 
     fun playlist(playlistId: String): String = "playlist/${Uri.encode(playlistId)}"
 
-    fun musicCollection(collectionId: String): String =
-        "musicCollection/${Uri.encode(collectionId)}"
+    fun musicCollection(collectionId: String): String = "musicCollection/${Uri.encode(collectionId)}"
 
     fun musicArtist(channelId: String): String = "musicArtist/${Uri.encode(channelId)}"
 }

From 06d50840fb7aeadd5c3a61903b2a3a5b4a49c85b Mon Sep 17 00:00:00 2001
From: Pasta <mhavgonzales@gmail.com>
Date: Thu, 3 Sep 2026 17:56:24 +0300
Subject: [PATCH 05/54] style(tv): format player overlay

---
 .../java/io/github/aedev/flow/ui/tv/player/TvPlayerOverlay.kt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/io/github/aedev/flow/ui/tv/player/TvPlayerOverlay.kt b/app/src/main/java/io/github/aedev/flow/ui/tv/player/TvPlayerOverlay.kt
index d3e530f92..51462c5d5 100644
--- a/app/src/main/java/io/github/aedev/flow/ui/tv/player/TvPlayerOverlay.kt
+++ b/app/src/main/java/io/github/aedev/flow/ui/tv/player/TvPlayerOverlay.kt
@@ -96,8 +96,8 @@ fun BoxScope.TvPlayerOverlay(
                 }
                 if (channelName.isNotBlank()) {
                     val channelAction = LocalTvPlayerChannelAction.current
-                    val channelRef = channelAction?.channelRef?.takeIf { it.isNotBlank() }
-                    if (channelAction != null && channelRef != null) {
+                    val channelRef = channelAction?.channelRef
+                    if (channelAction != null && !channelRef.isNullOrBlank()) {
                         TvButton(
                             text = channelName,
                             onClick = { channelAction.onOpenChannel(channelRef) },

From e32b25aa022bba2ba08f3c2d338dc33b9efbb708 Mon Sep 17 00:00:00 2001
From: Pasta <mhavgonzales@gmail.com>
Date: Thu, 3 Sep 2026 17:56:49 +0300
Subject: [PATCH 06/54] style(tv): format import screen

---
 .../flow/ui/tv/screens/TvImportDataScreen.kt  | 26 ++++++++++++++-----
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/io/github/aedev/flow/ui/tv/screens/TvImportDataScreen.kt b/app/src/main/java/io/github/aedev/flow/ui/tv/screens/TvImportDataScreen.kt
index 34f9aaabb..074441aa7 100644
--- a/app/src/main/java/io/github/aedev/flow/ui/tv/screens/TvImportDataScreen.kt
+++ b/app/src/main/java/io/github/aedev/flow/ui/tv/screens/TvImportDataScreen.kt
@@ -100,32 +100,32 @@ fun TvImportDataScreen(
                     label = stringResource(R.string.import_flow_backup_item_title),
                     supportingText = stringResource(R.string.import_flow_backup_desc),
                     selected = false,
-                    onClick = { flowBackupLauncher.launch(JSON_MIME_TYPES) },
+                    onClick = { flowBackupLauncher.launch(jsonMimeTypes) },
                     modifier = Modifier.tvInitialFocus(),
                 )
                 TvSelectionRow(
                     label = stringResource(R.string.import_master_backup_title),
                     supportingText = stringResource(R.string.import_master_backup_desc),
                     selected = false,
-                    onClick = { masterBackupLauncher.launch(ZIP_MIME_TYPES) },
+                    onClick = { masterBackupLauncher.launch(zipMimeTypes) },
                 )
                 TvSelectionRow(
                     label = stringResource(R.string.import_from_newpipe),
                     supportingText = stringResource(R.string.import_from_newpipe_desc),
                     selected = false,
-                    onClick = { newPipeLauncher.launch(JSON_MIME_TYPES) },
+                    onClick = { newPipeLauncher.launch(jsonMimeTypes) },
                 )
                 TvSelectionRow(
                     label = stringResource(R.string.import_from_libretube),
                     supportingText = stringResource(R.string.import_from_libretube_desc),
                     selected = false,
-                    onClick = { libreTubeLauncher.launch(JSON_MIME_TYPES) },
+                    onClick = { libreTubeLauncher.launch(jsonMimeTypes) },
                 )
                 TvSelectionRow(
                     label = stringResource(R.string.import_yt_takeout_all),
                     supportingText = stringResource(R.string.import_yt_takeout_all_desc),
                     selected = false,
-                    onClick = { takeoutLauncher.launch(ZIP_MIME_TYPES) },
+                    onClick = { takeoutLauncher.launch(zipMimeTypes) },
                 )
             }
         }
@@ -186,5 +186,17 @@ private fun ImportStatus(
     }
 }
 
-private val JSON_MIME_TYPES = arrayOf("application/json", "text/json", "text/plain", "application/octet-stream")
-private val ZIP_MIME_TYPES = arrayOf("application/zip", "application/x-zip-compressed", "application/octet-stream")
+private val jsonMimeTypes =
+    arrayOf(
+        "application/json",
+        "text/json",
+        "text/plain",
+        "application/octet-stream",
+    )
+
+private val zipMimeTypes =
+    arrayOf(
+        "application/zip",
+        "application/x-zip-compressed",
+        "application/octet-stream",
+    )

From ac7178c9413c35e7c5be6183a958febd83f2ceb9 Mon Sep 17 00:00:00 2001
From: Pasta <mhavgonzales@gmail.com>
Date: Thu, 3 Sep 2026 17:57:07 +0300
Subject: [PATCH 07/54] style(tv): format settings routing

---
 .../io/github/aedev/flow/ui/tv/screens/TvSettingsScreen.kt     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/io/github/aedev/flow/ui/tv/screens/TvSettingsScreen.kt b/app/src/main/java/io/github/aedev/flow/ui/tv/screens/TvSettingsScreen.kt
index 2d1e25d9a..68d87d02b 100644
--- a/app/src/main/java/io/github/aedev/flow/ui/tv/screens/TvSettingsScreen.kt
+++ b/app/src/main/java/io/github/aedev/flow/ui/tv/screens/TvSettingsScreen.kt
@@ -89,7 +89,8 @@ fun TvSettingsScreen(
                         },
                         onFocused = {
                             // Route categories need an explicit click; panes follow focus.
-                            if (category != TvSettingsCategory.SYNC &&
+                            if (
+                                category != TvSettingsCategory.SYNC &&
                                 category != TvSettingsCategory.REMOTE_GUIDE &&
                                 category != TvSettingsCategory.IMPORT_DATA
                             ) {

From 58013437d34b9e5e7a3874d2ec5f69b95479b2d6 Mon Sep 17 00:00:00 2001
From: Pasta <mhavgonzales@gmail.com>
Date: Thu, 3 Sep 2026 17:58:53 +0300
Subject: [PATCH 08/54] style(tv): match ktlint modifier wrapping

---
 .../flow/ui/tv/player/TvPlayerOverlay.kt      | 33 ++++++++++---------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/app/src/main/java/io/github/aedev/flow/ui/tv/player/TvPlayerOverlay.kt b/app/src/main/java/io/github/aedev/flow/ui/tv/player/TvPlayerOverlay.kt
index 51462c5d5..9f80efaad 100644
--- a/app/src/main/java/io/github/aedev/flow/ui/tv/player/TvPlayerOverlay.kt
+++ b/app/src/main/java/io/github/aedev/flow/ui/tv/player/TvPlayerOverlay.kt
@@ -59,15 +59,17 @@ fun BoxScope.TvPlayerOverlay(
         exit = fadeOut() + slideOutVertically { -it / 3 },
     ) {
         Box(
-            modifier = Modifier
-                .fillMaxWidth()
-                .background(scrimColor),
+            modifier =
+                Modifier
+                    .fillMaxWidth()
+                    .background(scrimColor),
         ) {
             Column(
-                modifier = Modifier.padding(
-                    horizontal = dimens.overscanHorizontal,
-                    vertical = dimens.overscanVertical,
-                ),
+                modifier =
+                    Modifier.padding(
+                        horizontal = dimens.overscanHorizontal,
+                        vertical = dimens.overscanVertical,
+                    ),
                 verticalArrangement = Arrangement.spacedBy(4.dp),
             ) {
                 Row(
@@ -123,14 +125,15 @@ fun BoxScope.TvPlayerOverlay(
         exit = fadeOut() + slideOutVertically { it / 3 },
     ) {
         Column(
-            modifier = Modifier
-                .fillMaxWidth()
-                .padding(
-                    start = dimens.overscanHorizontal,
-                    end = dimens.overscanHorizontal,
-                    top = 20.dp,
-                    bottom = dimens.overscanVertical,
-                ),
+            modifier =
+                Modifier
+                    .fillMaxWidth()
+                    .padding(
+                        start = dimens.overscanHorizontal,
+                        end = dimens.overscanHorizontal,
+                        top = 20.dp,
+                        bottom = dimens.overscanVertical,
+                    ),
             verticalArrangement = Arrangement.spacedBy(16.dp),
             content = bottomContent,
         )

From 150483768b6f19757737223f5ca64b93806aa032 Mon Sep 17 00:00:00 2001
From: Pasta <mhavgonzales@gmail.com>
Date: Thu, 3 Sep 2026 18:00:18 +0300
Subject: [PATCH 09/54] style(tv): preserve multiline UI mode launch

---
 .../flow/ui/tv/screens/settings/TvSystemSettingsPanes.kt      | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/io/github/aedev/flow/ui/tv/screens/settings/TvSystemSettingsPanes.kt b/app/src/main/java/io/github/aedev/flow/ui/tv/screens/settings/TvSystemSettingsPanes.kt
index 5e3b41ecf..1c6a4a668 100644
--- a/app/src/main/java/io/github/aedev/flow/ui/tv/screens/settings/TvSystemSettingsPanes.kt
+++ b/app/src/main/java/io/github/aedev/flow/ui/tv/screens/settings/TvSystemSettingsPanes.kt
@@ -82,7 +82,9 @@ fun TvInterfaceSettingsPane(
                 selected = selectedMode == mode,
                 onClick = {
                     if (mode != selectedMode) {
-                        scope.launch { modePreferences.setMode(mode) }
+                        scope.launch {
+                            modePreferences.setMode(mode)
+                        }
                     }
                 },
             )

From 5bbe66a3525a4217812581e1992dddc14717a017 Mon Sep 17 00:00:00 2001
From: Pasta <mhavgonzales@gmail.com>
Date: Thu, 3 Sep 2026 18:05:32 +0300
Subject: [PATCH 10/54] style(tv): satisfy ktlint when-entry bracing

---
 .../io/github/aedev/flow/ui/tv/screens/TvImportDataScreen.kt | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/io/github/aedev/flow/ui/tv/screens/TvImportDataScreen.kt b/app/src/main/java/io/github/aedev/flow/ui/tv/screens/TvImportDataScreen.kt
index 074441aa7..6fc28f3c5 100644
--- a/app/src/main/java/io/github/aedev/flow/ui/tv/screens/TvImportDataScreen.kt
+++ b/app/src/main/java/io/github/aedev/flow/ui/tv/screens/TvImportDataScreen.kt
@@ -138,7 +138,10 @@ private fun ImportStatus(
     onDismiss: () -> Unit,
 ) {
     when (state) {
-        ImportViewModel.State.Idle -> Unit
+        ImportViewModel.State.Idle -> {
+            Unit
+        }
+
         is ImportViewModel.State.Running -> {
             Column(
                 modifier = Modifier.fillMaxWidth().widthIn(max = 760.dp),

From d8bfb70aaf349844b0bbc1a940d37ca9858ca711 Mon Sep 17 00:00:00 2001
From: Pasta <mhavgonzales@gmail.com>
Date: Thu, 3 Sep 2026 18:06:12 +0300
Subject: [PATCH 11/54] style(tv): apply ktlint multiline expression rules

---
 .../flow/ui/tv/screens/TvSettingsScreen.kt    | 59 +++++++++++--------
 1 file changed, 36 insertions(+), 23 deletions(-)

diff --git a/app/src/main/java/io/github/aedev/flow/ui/tv/screens/TvSettingsScreen.kt b/app/src/main/java/io/github/aedev/flow/ui/tv/screens/TvSettingsScreen.kt
index 68d87d02b..82c1c1e80 100644
--- a/app/src/main/java/io/github/aedev/flow/ui/tv/screens/TvSettingsScreen.kt
+++ b/app/src/main/java/io/github/aedev/flow/ui/tv/screens/TvSettingsScreen.kt
@@ -63,16 +63,18 @@ fun TvSettingsScreen(
         modifier = modifier,
     ) {
         Row(
-            modifier = Modifier
-                .fillMaxSize()
-                .padding(horizontal = dimens.overscanHorizontal),
+            modifier =
+                Modifier
+                    .fillMaxSize()
+                    .padding(horizontal = dimens.overscanHorizontal),
             horizontalArrangement = Arrangement.spacedBy(32.dp),
         ) {
             Column(
-                modifier = Modifier
-                    .width(300.dp)
-                    .verticalScroll(rememberScrollState())
-                    .focusGroup(),
+                modifier =
+                    Modifier
+                        .width(300.dp)
+                        .verticalScroll(rememberScrollState())
+                        .focusGroup(),
                 verticalArrangement = Arrangement.spacedBy(6.dp),
             ) {
                 TvSettingsCategory.entries.forEach { category ->
@@ -104,12 +106,19 @@ fun TvSettingsScreen(
             androidx.compose.foundation.layout.Box(modifier = Modifier.weight(1f)) {
                 when (selectedCategory) {
                     TvSettingsCategory.PLAYBACK -> TvPlaybackSettingsPane(playerPreferences)
+
                     TvSettingsCategory.QUALITY -> TvQualitySettingsPane(playerPreferences)
+
                     TvSettingsCategory.CONTENT -> TvContentSettingsPane(playerPreferences)
+
                     TvSettingsCategory.APPEARANCE -> TvAppearanceSettingsPane(localDataManager)
+
                     TvSettingsCategory.FLOW_ENGINE -> TvFlowEngineSettingsPane(playerPreferences)
+
                     TvSettingsCategory.INTERFACE -> TvInterfaceSettingsPane(modePreferences)
+
                     TvSettingsCategory.ABOUT -> TvAboutSettingsPane()
+
                     TvSettingsCategory.REMOTE_GUIDE,
                     TvSettingsCategory.IMPORT_DATA,
                     TvSettingsCategory.SYNC,
@@ -131,25 +140,29 @@ private fun TvSettingsCategoryItem(
 
     Surface(
         onClick = onClick,
-        modifier = Modifier.onFocusChanged { state ->
-            focused = state.isFocused
-            if (state.isFocused) onFocused()
-        },
+        modifier =
+            Modifier.onFocusChanged { state ->
+                focused = state.isFocused
+                if (state.isFocused) onFocused()
+            },
         shape = MaterialTheme.shapes.medium,
-        color = when {
-            focused -> MaterialTheme.colorScheme.inverseSurface
-            selected -> MaterialTheme.colorScheme.secondaryContainer
-            else -> MaterialTheme.colorScheme.surfaceContainer
-        },
-        contentColor = when {
-            focused -> MaterialTheme.colorScheme.inverseOnSurface
-            selected -> MaterialTheme.colorScheme.onSecondaryContainer
-            else -> MaterialTheme.colorScheme.onSurface
-        },
+        color =
+            when {
+                focused -> MaterialTheme.colorScheme.inverseSurface
+                selected -> MaterialTheme.colorScheme.secondaryContainer
+                else -> MaterialTheme.colorScheme.surfaceContainer
+            },
+        contentColor =
+            when {
+                focused -> MaterialTheme.colorScheme.inverseOnSurface
+                selected -> MaterialTheme.colorScheme.onSecondaryContainer
+                else -> MaterialTheme.colorScheme.onSurface
+            },
     ) {
         Row(
-            modifier = Modifier
-                .padding(horizontal = 16.dp, vertical = 14.dp),
+            modifier =
+                Modifier
+                    .padding(horizontal = 16.dp, vertical = 14.dp),
             horizontalArrangement = Arrangement.spacedBy(14.dp),
             verticalAlignment = Alignment.CenterVertically,
         ) {

From 0626a00dfb58a33e86eb636904e61b6389fe4792 Mon Sep 17 00:00:00 2001
From: Pasta <mhavgonzales@gmail.com>
Date: Thu, 3 Sep 2026 18:06:40 +0300
Subject: [PATCH 12/54] style(tv): wrap multiline when expressions

---
 .../screens/settings/TvSystemSettingsPanes.kt | 22 ++++++++++---------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/io/github/aedev/flow/ui/tv/screens/settings/TvSystemSettingsPanes.kt b/app/src/main/java/io/github/aedev/flow/ui/tv/screens/settings/TvSystemSettingsPanes.kt
index 1c6a4a668..8080b7a09 100644
--- a/app/src/main/java/io/github/aedev/flow/ui/tv/screens/settings/TvSystemSettingsPanes.kt
+++ b/app/src/main/java/io/github/aedev/flow/ui/tv/screens/settings/TvSystemSettingsPanes.kt
@@ -66,16 +66,18 @@ fun TvInterfaceSettingsPane(
         verticalArrangement = Arrangement.spacedBy(8.dp),
     ) {
         AppUiMode.entries.forEach { mode ->
-            val label = when (mode) {
-                AppUiMode.AUTOMATIC -> stringResource(R.string.interface_mode_automatic)
-                AppUiMode.MOBILE -> stringResource(R.string.interface_mode_mobile)
-                AppUiMode.TV -> stringResource(R.string.interface_mode_tv)
-            }
-            val summary = when (mode) {
-                AppUiMode.AUTOMATIC -> stringResource(R.string.interface_mode_automatic_summary)
-                AppUiMode.MOBILE -> stringResource(R.string.interface_mode_mobile_summary)
-                AppUiMode.TV -> stringResource(R.string.interface_mode_tv_summary)
-            }
+            val label =
+                when (mode) {
+                    AppUiMode.AUTOMATIC -> stringResource(R.string.interface_mode_automatic)
+                    AppUiMode.MOBILE -> stringResource(R.string.interface_mode_mobile)
+                    AppUiMode.TV -> stringResource(R.string.interface_mode_tv)
+                }
+            val summary =
+                when (mode) {
+                    AppUiMode.AUTOMATIC -> stringResource(R.string.interface_mode_automatic_summary)
+                    AppUiMode.MOBILE -> stringResource(R.string.interface_mode_mobile_summary)
+                    AppUiMode.TV -> stringResource(R.string.interface_mode_tv_summary)
+                }
             TvSelectionRow(
                 label = label,
                 supportingText = summary,

From 0c75905153a8b1da1eea43906435794e9c5f4efd Mon Sep 17 00:00:00 2001
From: Pasta <mhavgonzales@gmail.com>
Date: Thu, 3 Sep 2026 18:09:24 +0300
Subject: [PATCH 13/54] style(tv): align settings category filename with ktlint

---
 .../settings/{TvSettingsCategories.kt => TvSettingsCategory.kt}   | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename app/src/main/java/io/github/aedev/flow/ui/tv/screens/settings/{TvSettingsCategories.kt => TvSettingsCategory.kt} (100%)

diff --git a/app/src/main/java/io/github/aedev/flow/ui/tv/screens/settings/TvSettingsCategories.kt b/app/src/main/java/io/github/aedev/flow/ui/tv/screens/settings/TvSettingsCategory.kt
similarity index 100%
rename from app/src/main/java/io/github/aedev/flow/ui/tv/screens/settings/TvSettingsCategories.kt
rename to app/src/main/java/io/github/aedev/flow/ui/tv/screens/settings/TvSettingsCategory.kt

From 0e89dea5d72294c3f15e0bd56522281d18771c5a Mon Sep 17 00:00:00 2001
From: Pasta <mhavgonzales@gmail.com>
Date: Thu, 3 Sep 2026 18:11:29 +0300
Subject: [PATCH 14/54] style(tv): sort settings category imports

---
 .../aedev/flow/ui/tv/screens/settings/TvSettingsCategory.kt     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/io/github/aedev/flow/ui/tv/screens/settings/TvSettingsCategory.kt b/app/src/main/java/io/github/aedev/flow/ui/tv/screens/settings/TvSettingsCategory.kt
index 9a38a4c2e..9c92eec21 100644
--- a/app/src/main/java/io/github/aedev/flow/ui/tv/screens/settings/TvSettingsCategory.kt
+++ b/app/src/main/java/io/github/aedev/flow/ui/tv/screens/settings/TvSettingsCategory.kt
@@ -10,8 +10,8 @@ import androidx.compose.material.icons.outlined.PlayCircleOutline
 import androidx.compose.material.icons.outlined.Psychology
 import androidx.compose.material.icons.outlined.SettingsRemote
 import androidx.compose.material.icons.outlined.Shield
-import androidx.compose.material.icons.outlined.Tv
 import androidx.compose.material.icons.outlined.Tune
+import androidx.compose.material.icons.outlined.Tv
 import androidx.compose.ui.graphics.vector.ImageVector
 import io.github.aedev.flow.R
 

From a8f0e78bbefe2cc98f680536ddfe6c5021f312b2 Mon Sep 17 00:00:00 2001
From: Pasta <mhavgonzales@gmail.com>
Date: Thu, 3 Sep 2026 20:24:25 +0300
Subject: [PATCH 15/54] feat(import): parse subscription OPML exports

---
 .../flow/data/local/OpmlSubscriptionParser.kt | 101 ++++++++++++++++++
 1 file changed, 101 insertions(+)
 create mode 100644 app/src/main/java/io/github/aedev/flow/data/local/OpmlSubscriptionParser.kt

diff --git a/app/src/main/java/io/github/aedev/flow/data/local/OpmlSubscriptionParser.kt b/app/src/main/java/io/github/aedev/flow/data/local/OpmlSubscriptionParser.kt
new file mode 100644
index 000000000..587153f96
--- /dev/null
+++ b/app/src/main/java/io/github/aedev/flow/data/local/OpmlSubscriptionParser.kt
@@ -0,0 +1,101 @@
+package io.github.aedev.flow.data.local
+
+internal data class OpmlSubscriptionEntry(
+    val channelId: String,
+    val channelName: String,
+)
+
+/** Lightweight OPML reader for YouTube subscription exports. */
+internal object OpmlSubscriptionParser {
+    private val outlineRegex =
+        Regex(
+            pattern = """<outline\b([^>]*)/?>""",
+            options = setOf(RegexOption.IGNORE_CASE, RegexOption.DOT_MATCHES_ALL),
+        )
+    private val attributeRegex =
+        Regex(
+            pattern = """([A-Za-z_:][A-Za-z0-9_:.-]*)\s*=\s*([\"'])(.*?)\2""",
+            options = setOf(RegexOption.IGNORE_CASE, RegexOption.DOT_MATCHES_ALL),
+        )
+    private val youtubeChannelIdRegex = Regex("""UC[0-9A-Za-z_-]{22}""")
+    private val decimalEntityRegex = Regex("""&#(\d+);""")
+    private val hexEntityRegex = Regex("""&#x([0-9A-Fa-f]+);""")
+
+    fun parse(xml: String): List<OpmlSubscriptionEntry> {
+        if (!xml.trimStart().startsWith("<")) return emptyList()
+
+        val seen = LinkedHashSet<String>()
+        return outlineRegex
+            .findAll(xml)
+            .mapNotNull { match ->
+                val attributes = parseAttributes(match.groupValues[1])
+                val channelId = extractChannelId(attributes) ?: return@mapNotNull null
+                if (!seen.add(channelId)) return@mapNotNull null
+
+                val channelName =
+                    sequenceOf("title", "text")
+                        .mapNotNull(attributes::get)
+                        .map(::decodeXml)
+                        .map(String::trim)
+                        .firstOrNull(String::isNotEmpty)
+                        ?: channelId
+
+                OpmlSubscriptionEntry(
+                    channelId = channelId,
+                    channelName = channelName,
+                )
+            }.toList()
+    }
+
+    private fun parseAttributes(raw: String): Map<String, String> =
+        attributeRegex
+            .findAll(raw)
+            .associate { match ->
+                match.groupValues[1].lowercase() to match.groupValues[3]
+            }
+
+    private fun extractChannelId(attributes: Map<String, String>): String? {
+        val preferredKeys =
+            listOf(
+                "channelid",
+                "channel_id",
+                "xmlurl",
+                "htmlurl",
+                "url",
+                "href",
+            )
+        val candidates =
+            buildList {
+                preferredKeys.mapNotNullTo(this) { attributes[it] }
+                attributes.values.forEach { value ->
+                    if (value !in this) add(value)
+                }
+            }
+
+        return candidates
+            .asSequence()
+            .map(::decodeXml)
+            .mapNotNull { value -> youtubeChannelIdRegex.find(value)?.value }
+            .firstOrNull()
+    }
+
+    private fun decodeXml(value: String): String =
+        value
+            .replace(hexEntityRegex) { match -> decodeCodePoint(match.groupValues[1], 16) }
+            .replace(decimalEntityRegex) { match -> decodeCodePoint(match.groupValues[1], 10) }
+            .replace("&quot;", "\"")
+            .replace("&apos;", "'")
+            .replace("&lt;", "<")
+            .replace("&gt;", ">")
+            .replace("&amp;", "&")
+
+    private fun decodeCodePoint(
+        value: String,
+        radix: Int,
+    ): String =
+        value
+            .toIntOrNull(radix)
+            ?.takeIf(Character::isValidCodePoint)
+            ?.let { String(Character.toChars(it)) }
+            .orEmpty()
+}

From b600d6f9e29e5cd7a83b79e68eb9cce0a660541e Mon Sep 17 00:00:00 2001
From: Pasta <mhavgonzales@gmail.com>
Date: Thu, 3 Sep 2026 20:24:38 +0300
Subject: [PATCH 16/54] feat(import): import subscription OPML files

---
 .../data/local/OpmlSubscriptionImporter.kt    | 59 +++++++++++++++++++
 1 file changed, 59 insertions(+)
 create mode 100644 app/src/main/java/io/github/aedev/flow/data/local/OpmlSubscriptionImporter.kt

diff --git a/app/src/main/java/io/github/aedev/flow/data/local/OpmlSubscriptionImporter.kt b/app/src/main/java/io/github/aedev/flow/data/local/OpmlSubscriptionImporter.kt
new file mode 100644
index 000000000..6262cebfc
--- /dev/null
+++ b/app/src/main/java/io/github/aedev/flow/data/local/OpmlSubscriptionImporter.kt
@@ -0,0 +1,59 @@
+package io.github.aedev.flow.data.local
+
+import android.content.Context
+import android.net.Uri
+import io.github.aedev.flow.data.recommendation.FlowNeuroEngine
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+
+class OpmlSubscriptionImporter(
+    context: Context,
+) {
+    private val appContext = context.applicationContext
+    private val subscriptionRepository = SubscriptionRepository.getInstance(appContext)
+
+    suspend fun import(
+        uri: Uri,
+        onProgress: ((current: Int, total: Int) -> Unit)? = null,
+    ): Result<Int> =
+        withContext(Dispatchers.IO) {
+            try {
+                val xml =
+                    appContext.contentResolver
+                        .openInputStream(uri)
+                        ?.bufferedReader(Charsets.UTF_8)
+                        ?.use { it.readText() }
+                        ?: return@withContext Result.failure(Exception("Could not read file"))
+
+                val entries = OpmlSubscriptionParser.parse(xml)
+                if (entries.isEmpty()) {
+                    return@withContext Result.failure(Exception("no_entries"))
+                }
+
+                onProgress?.invoke(0, entries.size)
+                val subscribedAt = System.currentTimeMillis()
+                val subscriptions =
+                    entries.mapIndexed { index, entry ->
+                        ChannelSubscription(
+                            channelId = entry.channelId,
+                            channelName = entry.channelName,
+                            channelThumbnail = "",
+                            subscribedAt = subscribedAt - index,
+                        )
+                    }
+                subscriptionRepository.subscribeAll(subscriptions)
+                onProgress?.invoke(subscriptions.size, subscriptions.size)
+
+                val channelNames = subscriptions.map(ChannelSubscription::channelName).filter(String::isNotBlank)
+                if (channelNames.isNotEmpty()) {
+                    runCatching {
+                        FlowNeuroEngine.bootstrapFromSubscriptions(appContext, channelNames)
+                    }
+                }
+
+                Result.success(subscriptions.size)
+            } catch (e: Exception) {
+                Result.failure(e)
+            }
+        }
+}

From 9f21350414e64a218bece845c3cb7ca0627ca2f2 Mon Sep 17 00:00:00 2001
From: Pasta <mhavgonzales@gmail.com>
Date: Thu, 3 Sep 2026 20:24:46 +0300
Subject: [PATCH 17/54] feat(tv): add OPML import strings

---
 app/src/main/res/values/strings_tv_import.xml | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 app/src/main/res/values/strings_tv_import.xml

diff --git a/app/src/main/res/values/strings_tv_import.xml b/app/src/main/res/values/strings_tv_import.xml
new file mode 100644
index 000000000..339e107aa
--- /dev/null
+++ b/app/src/main/res/values/strings_tv_import.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="import_subscriptions_xml_title">Import subscriptions XML/OPML</string>
+    <string name="import_subscriptions_xml_desc">Import YouTube subscriptions from an OPML or XML feed export.</string>
+</resources>

From 67c7f8af12b2491cdaba1eb1cfc8270cf818f49b Mon Sep 17 00:00:00 2001
From: Pasta <mhavgonzales@gmail.com>
Date: Thu, 3 Sep 2026 20:24:58 +0300
Subject: [PATCH 18/54] feat(import): add activity-scoped OPML import state

---
 .../screens/settings/OpmlImportViewModel.kt   | 78 +++++++++++++++++++
 1 file changed, 78 insertions(+)
 create mode 100644 app/src/main/java/io/github/aedev/flow/ui/screens/settings/OpmlImportViewModel.kt

diff --git a/app/src/main/java/io/github/aedev/flow/ui/screens/settings/OpmlImportViewModel.kt b/app/src/main/java/io/github/aedev/flow/ui/screens/settings/OpmlImportViewModel.kt
new file mode 100644
index 000000000..0a5a0c572
--- /dev/null
+++ b/app/src/main/java/io/github/aedev/flow/ui/screens/settings/OpmlImportViewModel.kt
@@ -0,0 +1,78 @@
+package io.github.aedev.flow.ui.screens.settings
+
+import android.content.Context
+import android.net.Uri
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import dagger.hilt.android.lifecycle.HiltViewModel
+import dagger.hilt.android.qualifiers.ApplicationContext
+import io.github.aedev.flow.R
+import io.github.aedev.flow.data.local.OpmlSubscriptionImporter
+import io.github.aedev.flow.notification.NotificationHelper
+import kotlinx.coroutines.CancellationException
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+
+@HiltViewModel
+class OpmlImportViewModel
+    @Inject
+    constructor(
+        @ApplicationContext private val context: Context,
+    ) : ViewModel() {
+        private val importer = OpmlSubscriptionImporter(context)
+        private val _state = MutableStateFlow<ImportViewModel.State>(ImportViewModel.State.Idle)
+        val state: StateFlow<ImportViewModel.State> = _state.asStateFlow()
+
+        fun importSubscriptions(uri: Uri) {
+            if (_state.value is ImportViewModel.State.Running) return
+
+            val label = context.getString(R.string.import_subscriptions_xml_title)
+            viewModelScope.launch {
+                try {
+                    updateProgress(label, 0, 0)
+                    val result =
+                        importer.import(uri) { current, total ->
+                            updateProgress(label, current, total)
+                        }
+                    if (result.isSuccess) {
+                        val count = result.getOrNull() ?: 0
+                        _state.value = ImportViewModel.State.Success(label, count = count)
+                        if (NotificationHelper.hasNotificationPermission(context)) {
+                            NotificationHelper.showImportComplete(context, label, count)
+                        }
+                    } else {
+                        val message = result.exceptionOrNull()?.message ?: context.getString(R.string.unknown_error)
+                        _state.value = ImportViewModel.State.Error(label, message)
+                    }
+                } catch (e: CancellationException) {
+                    throw e
+                } catch (e: Exception) {
+                    _state.value =
+                        ImportViewModel.State.Error(
+                            label,
+                            e.message ?: context.getString(R.string.unknown_error),
+                        )
+                } finally {
+                    NotificationHelper.cancelImportNotification(context)
+                }
+            }
+        }
+
+        fun dismiss() {
+            _state.value = ImportViewModel.State.Idle
+        }
+
+        private fun updateProgress(
+            label: String,
+            current: Int,
+            total: Int,
+        ) {
+            _state.value = ImportViewModel.State.Running(label, current, total)
+            if (NotificationHelper.hasNotificationPermission(context)) {
+                NotificationHelper.showImportProgress(context, label, current, total)
+            }
+        }
+    }

From a518a3cd31c4241074e167e16e71dbf728017a76 Mon Sep 17 00:00:00 2001
From: Pasta <mhavgonzales@gmail.com>
Date: Thu, 3 Sep 2026 20:25:24 +0300
Subject: [PATCH 19/54] feat(tv): expose XML subscription import

---
 .../flow/ui/tv/screens/TvImportDataScreen.kt  | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/app/src/main/java/io/github/aedev/flow/ui/tv/screens/TvImportDataScreen.kt b/app/src/main/java/io/github/aedev/flow/ui/tv/screens/TvImportDataScreen.kt
index 6fc28f3c5..6996929e8 100644
--- a/app/src/main/java/io/github/aedev/flow/ui/tv/screens/TvImportDataScreen.kt
+++ b/app/src/main/java/io/github/aedev/flow/ui/tv/screens/TvImportDataScreen.kt
@@ -28,6 +28,7 @@ import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import io.github.aedev.flow.R
 import io.github.aedev.flow.ui.screens.settings.ImportViewModel
+import io.github.aedev.flow.ui.screens.settings.OpmlImportViewModel
 import io.github.aedev.flow.ui.tv.components.TvButton
 import io.github.aedev.flow.ui.tv.components.TvScreenScaffold
 import io.github.aedev.flow.ui.tv.components.TvSelectionRow
@@ -47,6 +48,8 @@ fun TvImportDataScreen(
     val activity = context as ComponentActivity
     val viewModel: ImportViewModel = hiltViewModel(activity)
     val state by viewModel.state.collectAsStateWithLifecycle()
+    val opmlViewModel: OpmlImportViewModel = hiltViewModel(activity)
+    val opmlState by opmlViewModel.state.collectAsStateWithLifecycle()
     val dimens = LocalTvDimens.current
 
     val flowBackupLauncher =
@@ -57,6 +60,10 @@ fun TvImportDataScreen(
         rememberLauncherForActivityResult(ActivityResultContracts.OpenDocument()) { uri ->
             uri?.let(viewModel::importMasterBackup)
         }
+    val opmlLauncher =
+        rememberLauncherForActivityResult(ActivityResultContracts.OpenDocument()) { uri ->
+            uri?.let(opmlViewModel::importSubscriptions)
+        }
     val newPipeLauncher =
         rememberLauncherForActivityResult(ActivityResultContracts.OpenDocument()) { uri ->
             uri?.let(viewModel::importNewPipe)
@@ -91,6 +98,7 @@ fun TvImportDataScreen(
             verticalArrangement = Arrangement.spacedBy(14.dp),
         ) {
             ImportStatus(state = state, onDismiss = viewModel::dismiss)
+            ImportStatus(state = opmlState, onDismiss = opmlViewModel::dismiss)
 
             Column(
                 modifier = Modifier.widthIn(max = 760.dp),
@@ -109,6 +117,12 @@ fun TvImportDataScreen(
                     selected = false,
                     onClick = { masterBackupLauncher.launch(zipMimeTypes) },
                 )
+                TvSelectionRow(
+                    label = stringResource(R.string.import_subscriptions_xml_title),
+                    supportingText = stringResource(R.string.import_subscriptions_xml_desc),
+                    selected = false,
+                    onClick = { opmlLauncher.launch(xmlMimeTypes) },
+                )
                 TvSelectionRow(
                     label = stringResource(R.string.import_from_newpipe),
                     supportingText = stringResource(R.string.import_from_newpipe_desc),
@@ -197,6 +211,15 @@ private val jsonMimeTypes =
         "application/octet-stream",
     )
 
+private val xmlMimeTypes =
+    arrayOf(
+        "application/xml",
+        "text/xml",
+        "application/rss+xml",
+        "text/plain",
+        "application/octet-stream",
+    )
+
 private val zipMimeTypes =
     arrayOf(
         "application/zip",

From ece7c2394ab96930e2d44dc0136b1d061cb24a32 Mon Sep 17 00:00:00 2001
From: Pasta <mhavgonzales@gmail.com>
Date: Thu, 3 Sep 2026 20:25:37 +0300
Subject: [PATCH 20/54] test(import): cover OPML subscription parsing

---
 .../data/local/OpmlSubscriptionParserTest.kt  | 74 +++++++++++++++++++
 1 file changed, 74 insertions(+)
 create mode 100644 app/src/test/java/io/github/aedev/flow/data/local/OpmlSubscriptionParserTest.kt

diff --git a/app/src/test/java/io/github/aedev/flow/data/local/OpmlSubscriptionParserTest.kt b/app/src/test/java/io/github/aedev/flow/data/local/OpmlSubscriptionParserTest.kt
new file mode 100644
index 000000000..228955ed4
--- /dev/null
+++ b/app/src/test/java/io/github/aedev/flow/data/local/OpmlSubscriptionParserTest.kt
@@ -0,0 +1,74 @@
+package io.github.aedev.flow.data.local
+
+import com.google.common.truth.Truth.assertThat
+import org.junit.Test
+
+class OpmlSubscriptionParserTest {
+    @Test
+    fun `parses YouTube feed outlines and decodes names`() {
+        val xml =
+            """
+            <?xml version="1.0" encoding="UTF-8"?>
+            <opml version="1.0">
+              <body>
+                <outline
+                    text="Tom &amp; Jerry"
+                    title="Tom &amp; Jerry"
+                    type="rss"
+                    xmlUrl="https://www.youtube.com/feeds/videos.xml?channel_id=UC1234567890123456789012"
+                    htmlUrl="https://www.youtube.com/channel/UC1234567890123456789012" />
+              </body>
+            </opml>
+            """.trimIndent()
+
+        assertThat(OpmlSubscriptionParser.parse(xml))
+            .containsExactly(
+                OpmlSubscriptionEntry(
+                    channelId = "UC1234567890123456789012",
+                    channelName = "Tom & Jerry",
+                ),
+            )
+    }
+
+    @Test
+    fun `deduplicates channel ids and supports single quoted attributes`() {
+        val xml =
+            """
+            <opml>
+              <body>
+                <outline text='First name' xmlUrl='https://www.youtube.com/feeds/videos.xml?channel_id=UCabcdefghijklmnopqrstuv' />
+                <outline text='Duplicate name' htmlUrl='https://www.youtube.com/channel/UCabcdefghijklmnopqrstuv' />
+              </body>
+            </opml>
+            """.trimIndent()
+
+        assertThat(OpmlSubscriptionParser.parse(xml))
+            .containsExactly(
+                OpmlSubscriptionEntry(
+                    channelId = "UCabcdefghijklmnopqrstuv",
+                    channelName = "First name",
+                ),
+            )
+    }
+
+    @Test
+    fun `ignores outlines without a canonical YouTube channel id`() {
+        val xml =
+            """
+            <opml>
+              <body>
+                <outline text="Folder">
+                  <outline text="Generic RSS" xmlUrl="https://example.com/feed.xml" />
+                </outline>
+              </body>
+            </opml>
+            """.trimIndent()
+
+        assertThat(OpmlSubscriptionParser.parse(xml)).isEmpty()
+    }
+
+    @Test
+    fun `rejects non xml input`() {
+        assertThat(OpmlSubscriptionParser.parse("channel,name\nUC123,Example")).isEmpty()
+    }
+}

From 203bd82a02ac37d7d25203c8636abdc1e20a8cdd Mon Sep 17 00:00:00 2001
From: Pasta <mhavgonzales@gmail.com>
Date: Thu, 3 Sep 2026 20:25:51 +0300
Subject: [PATCH 21/54] test(tv): guard feedback regressions

---
 .../flow/ui/tv/TvFeedbackRegressionTest.kt    | 39 +++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 app/src/test/java/io/github/aedev/flow/ui/tv/TvFeedbackRegressionTest.kt

diff --git a/app/src/test/java/io/github/aedev/flow/ui/tv/TvFeedbackRegressionTest.kt b/app/src/test/java/io/github/aedev/flow/ui/tv/TvFeedbackRegressionTest.kt
new file mode 100644
index 000000000..5fc8acc8b
--- /dev/null
+++ b/app/src/test/java/io/github/aedev/flow/ui/tv/TvFeedbackRegressionTest.kt
@@ -0,0 +1,39 @@
+package io.github.aedev.flow.ui.tv
+
+import com.google.common.truth.Truth.assertThat
+import org.junit.Test
+import java.io.File
+
+class TvFeedbackRegressionTest {
+    @Test
+    fun `ui mode changes do not clear focus before persistence`() {
+        val source = readMainSource("io/github/aedev/flow/ui/tv/screens/settings/TvSystemSettingsPanes.kt")
+
+        assertThat(source).doesNotContain("clearFocus")
+        assertThat(source).doesNotContain("withFrameNanos")
+        assertThat(source).contains("modePreferences.setMode(mode)")
+    }
+
+    @Test
+    fun `player channel action routes to the TV channel destination`() {
+        val appSource = readMainSource("io/github/aedev/flow/ui/tv/FlowTvApp.kt")
+        val overlaySource = readMainSource("io/github/aedev/flow/ui/tv/player/TvPlayerOverlay.kt")
+
+        assertThat(appSource).contains("navController.navigate(TvRoutes.channel(channelRef))")
+        assertThat(appSource).contains("LocalTvPlayerChannelAction provides")
+        assertThat(overlaySource).contains("channelAction.onOpenChannel(channelRef)")
+        assertThat(overlaySource).contains("TvButton(")
+    }
+
+    private fun readMainSource(relativePath: String): String {
+        val candidates =
+            listOf(
+                File("src/main/java/$relativePath"),
+                File("app/src/main/java/$relativePath"),
+                File("../app/src/main/java/$relativePath"),
+            )
+        val sourceFile = candidates.firstOrNull(File::isFile)
+        checkNotNull(sourceFile) { "Could not locate production source: $relativePath" }
+        return sourceFile.readText()
+    }
+}

From 9e8e77b190c05804eee41402b01aa352d2283ea8 Mon Sep 17 00:00:00 2001
From: Pasta <mhavgonzales@gmail.com>
Date: Thu, 3 Sep 2026 20:30:46 +0300
Subject: [PATCH 22/54] fix(import): share import operation state for XML

---
 .../flow/ui/screens/settings/ImportViewModel.kt   | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/app/src/main/java/io/github/aedev/flow/ui/screens/settings/ImportViewModel.kt b/app/src/main/java/io/github/aedev/flow/ui/screens/settings/ImportViewModel.kt
index 9abffe429..de95c85de 100644
--- a/app/src/main/java/io/github/aedev/flow/ui/screens/settings/ImportViewModel.kt
+++ b/app/src/main/java/io/github/aedev/flow/ui/screens/settings/ImportViewModel.kt
@@ -8,6 +8,7 @@ import dagger.hilt.android.lifecycle.HiltViewModel
 import dagger.hilt.android.qualifiers.ApplicationContext
 import io.github.aedev.flow.R
 import io.github.aedev.flow.data.local.BackupRepository
+import io.github.aedev.flow.data.local.OpmlSubscriptionImporter
 import io.github.aedev.flow.notification.NotificationHelper
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -69,6 +70,7 @@ class ImportViewModel
         }
 
         private val backupRepo = BackupRepository(context)
+        private val opmlImporter = OpmlSubscriptionImporter(context)
 
         private val _state = MutableStateFlow<State>(State.Idle)
         val state: StateFlow<State> = _state.asStateFlow()
@@ -104,6 +106,19 @@ class ImportViewModel
             }
         }
 
+        fun importOpmlSubscriptions(uri: Uri) {
+            if (isRunning) return
+            val label = context.getString(R.string.import_subscriptions_xml_title)
+            viewModelScope.launch {
+                startProgress(label, 0, 0)
+                val result =
+                    opmlImporter.import(uri) { current, total ->
+                        updateProgress(label, current, total)
+                    }
+                handleResult(label, result)
+            }
+        }
+
         fun importNewPipe(uri: Uri) {
             if (isRunning) return
             val label = context.getString(R.string.import_label_newpipe_subscriptions)

From 82339b4347530a7fdf585fdaf7e0f10b986300d8 Mon Sep 17 00:00:00 2001
From: Pasta <mhavgonzales@gmail.com>
Date: Thu, 3 Sep 2026 20:31:11 +0300
Subject: [PATCH 23/54] fix(tv): reuse shared import state for XML

---
 .../github/aedev/flow/ui/tv/screens/TvImportDataScreen.kt   | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/app/src/main/java/io/github/aedev/flow/ui/tv/screens/TvImportDataScreen.kt b/app/src/main/java/io/github/aedev/flow/ui/tv/screens/TvImportDataScreen.kt
index 6996929e8..280cc2fcb 100644
--- a/app/src/main/java/io/github/aedev/flow/ui/tv/screens/TvImportDataScreen.kt
+++ b/app/src/main/java/io/github/aedev/flow/ui/tv/screens/TvImportDataScreen.kt
@@ -28,7 +28,6 @@ import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import io.github.aedev.flow.R
 import io.github.aedev.flow.ui.screens.settings.ImportViewModel
-import io.github.aedev.flow.ui.screens.settings.OpmlImportViewModel
 import io.github.aedev.flow.ui.tv.components.TvButton
 import io.github.aedev.flow.ui.tv.components.TvScreenScaffold
 import io.github.aedev.flow.ui.tv.components.TvSelectionRow
@@ -48,8 +47,6 @@ fun TvImportDataScreen(
     val activity = context as ComponentActivity
     val viewModel: ImportViewModel = hiltViewModel(activity)
     val state by viewModel.state.collectAsStateWithLifecycle()
-    val opmlViewModel: OpmlImportViewModel = hiltViewModel(activity)
-    val opmlState by opmlViewModel.state.collectAsStateWithLifecycle()
     val dimens = LocalTvDimens.current
 
     val flowBackupLauncher =
@@ -62,7 +59,7 @@ fun TvImportDataScreen(
         }
     val opmlLauncher =
         rememberLauncherForActivityResult(ActivityResultContracts.OpenDocument()) { uri ->
-            uri?.let(opmlViewModel::importSubscriptions)
+            uri?.let(viewModel::importOpmlSubscriptions)
         }
     val newPipeLauncher =
         rememberLauncherForActivityResult(ActivityResultContracts.OpenDocument()) { uri ->
@@ -98,7 +95,6 @@ fun TvImportDataScreen(
             verticalArrangement = Arrangement.spacedBy(14.dp),
         ) {
             ImportStatus(state = state, onDismiss = viewModel::dismiss)
-            ImportStatus(state = opmlState, onDismiss = opmlViewModel::dismiss)
 
             Column(
                 modifier = Modifier.widthIn(max = 760.dp),

From c3ec3868c9442c93cbb988c74166340b4846b08f Mon Sep 17 00:00:00 2001
From: Pasta <mhavgonzales@gmail.com>
Date: Thu, 3 Sep 2026 20:31:20 +0300
Subject: [PATCH 24/54] refactor(import): remove duplicate XML import state

---
 .../screens/settings/OpmlImportViewModel.kt   | 78 -------------------
 1 file changed, 78 deletions(-)
 delete mode 100644 app/src/main/java/io/github/aedev/flow/ui/screens/settings/OpmlImportViewModel.kt

diff --git a/app/src/main/java/io/github/aedev/flow/ui/screens/settings/OpmlImportViewModel.kt b/app/src/main/java/io/github/aedev/flow/ui/screens/settings/OpmlImportViewModel.kt
deleted file mode 100644
index 0a5a0c572..000000000
--- a/app/src/main/java/io/github/aedev/flow/ui/screens/settings/OpmlImportViewModel.kt
+++ /dev/null
@@ -1,78 +0,0 @@
-package io.github.aedev.flow.ui.screens.settings
-
-import android.content.Context
-import android.net.Uri
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.viewModelScope
-import dagger.hilt.android.lifecycle.HiltViewModel
-import dagger.hilt.android.qualifiers.ApplicationContext
-import io.github.aedev.flow.R
-import io.github.aedev.flow.data.local.OpmlSubscriptionImporter
-import io.github.aedev.flow.notification.NotificationHelper
-import kotlinx.coroutines.CancellationException
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.flow.asStateFlow
-import kotlinx.coroutines.launch
-import javax.inject.Inject
-
-@HiltViewModel
-class OpmlImportViewModel
-    @Inject
-    constructor(
-        @ApplicationContext private val context: Context,
-    ) : ViewModel() {
-        private val importer = OpmlSubscriptionImporter(context)
-        private val _state = MutableStateFlow<ImportViewModel.State>(ImportViewModel.State.Idle)
-        val state: StateFlow<ImportViewModel.State> = _state.asStateFlow()
-
-        fun importSubscriptions(uri: Uri) {
-            if (_state.value is ImportViewModel.State.Running) return
-
-            val label = context.getString(R.string.import_subscriptions_xml_title)
-            viewModelScope.launch {
-                try {
-                    updateProgress(label, 0, 0)
-                    val result =
-                        importer.import(uri) { current, total ->
-                            updateProgress(label, current, total)
-                        }
-                    if (result.isSuccess) {
-                        val count = result.getOrNull() ?: 0
-                        _state.value = ImportViewModel.State.Success(label, count = count)
-                        if (NotificationHelper.hasNotificationPermission(context)) {
-                            NotificationHelper.showImportComplete(context, label, count)
-                        }
-                    } else {
-                        val message = result.exceptionOrNull()?.message ?: context.getString(R.string.unknown_error)
-                        _state.value = ImportViewModel.State.Error(label, message)
-                    }
-                } catch (e: CancellationException) {
-                    throw e
-                } catch (e: Exception) {
-                    _state.value =
-                        ImportViewModel.State.Error(
-                            label,
-                            e.message ?: context.getString(R.string.unknown_error),
-                        )
-                } finally {
-                    NotificationHelper.cancelImportNotification(context)
-                }
-            }
-        }
-
-        fun dismiss() {
-            _state.value = ImportViewModel.State.Idle
-        }
-
-        private fun updateProgress(
-            label: String,
-            current: Int,
-            total: Int,
-        ) {
-            _state.value = ImportViewModel.State.Running(label, current, total)
-            if (NotificationHelper.hasNotificationPermission(context)) {
-                NotificationHelper.showImportProgress(context, label, current, total)
-            }
-        }
-    }

From 80da3dfc6f6fd8e57698f238cbfb75573bd31557 Mon Sep 17 00:00:00 2001
From: Pasta <mhavgonzales@gmail.com>
Date: Thu, 3 Sep 2026 20:44:31 +0300
Subject: [PATCH 25/54] ci: serialize debug flavor unit tests

---
 .github/workflows/build.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 396395fae..7824b879a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -78,7 +78,7 @@ jobs:
       - name: Run unit tests
         run: >
           ./gradlew :app:testGithubDebugUnitTest :app:testFossDebugUnitTest
-          --parallel --build-cache --stacktrace
+          --build-cache --stacktrace
 
       # Instrumentation tests are not executed in CI, but they must still
       # compile: breakage here otherwise lands on main unnoticed.
@@ -330,4 +330,4 @@ jobs:
           draft: false
           prerelease: false
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
\ No newline at end of file

From afb555648f8bebd8d87fcf53ef8df648dfc6e634 Mon Sep 17 00:00:00 2001
From: Pasta <mhavgonzales@gmail.com>
Date: Thu, 3 Sep 2026 21:04:25 +0300
Subject: [PATCH 26/54] ci: isolate debug flavor unit test compiles

---
 .github/workflows/build.yml | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7824b879a..a443582d5 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -75,10 +75,13 @@ jobs:
             echo "Release keystore secret is not available. Continuing with an unsigned CI build."
           fi
 
+      # Keep the two debug flavors in separate Gradle invocations. Compiling
+      # both in one task graph lets Kotlin compile both variants concurrently
+      # and can exhaust the hosted runner's memory even without --parallel.
       - name: Run unit tests
-        run: >
-          ./gradlew :app:testGithubDebugUnitTest :app:testFossDebugUnitTest
-          --build-cache --stacktrace
+        run: |
+          ./gradlew :app:testGithubDebugUnitTest --build-cache --stacktrace
+          ./gradlew :app:testFossDebugUnitTest --build-cache --stacktrace
 
       # Instrumentation tests are not executed in CI, but they must still
       # compile: breakage here otherwise lands on main unnoticed.
@@ -303,7 +306,7 @@ jobs:
 
       - name: Get version from tag
         id: get_version
-        run: echo "VERSION=${GITHUB_REF#refs/tags/}" >> "$GITHUB_OUTPUT"
+        run: echo "VERSION=${GITHUB_REF#refs/tags/v}" >> "$GITHUB_OUTPUT"
 
       - name: Validate release notes
         env:
@@ -330,4 +333,4 @@ jobs:
           draft: false
           prerelease: false
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
\ No newline at end of file
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

From fc1fc1c3d9c18a9e483f05b56357585154f502d2 Mon Sep 17 00:00:00 2001
From: Pasta <mhavgonzales@gmail.com>
Date: Fri, 4 Sep 2026 07:33:56 +0300
Subject: [PATCH 27/54] fix(tv): preserve subscriptions during OPML import

---
 .../data/local/OpmlSubscriptionImporter.kt    | 114 +++++++++++-------
 1 file changed, 70 insertions(+), 44 deletions(-)

diff --git a/app/src/main/java/io/github/aedev/flow/data/local/OpmlSubscriptionImporter.kt b/app/src/main/java/io/github/aedev/flow/data/local/OpmlSubscriptionImporter.kt
index 6262cebfc..888ae00f7 100644
--- a/app/src/main/java/io/github/aedev/flow/data/local/OpmlSubscriptionImporter.kt
+++ b/app/src/main/java/io/github/aedev/flow/data/local/OpmlSubscriptionImporter.kt
@@ -2,58 +2,84 @@ package io.github.aedev.flow.data.local
 
 import android.content.Context
 import android.net.Uri
+import dagger.hilt.android.qualifiers.ApplicationContext
 import io.github.aedev.flow.data.recommendation.FlowNeuroEngine
+import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
+import javax.inject.Inject
 
-class OpmlSubscriptionImporter(
-    context: Context,
-) {
-    private val appContext = context.applicationContext
-    private val subscriptionRepository = SubscriptionRepository.getInstance(appContext)
-
-    suspend fun import(
-        uri: Uri,
-        onProgress: ((current: Int, total: Int) -> Unit)? = null,
-    ): Result<Int> =
-        withContext(Dispatchers.IO) {
-            try {
-                val xml =
-                    appContext.contentResolver
-                        .openInputStream(uri)
-                        ?.bufferedReader(Charsets.UTF_8)
-                        ?.use { it.readText() }
-                        ?: return@withContext Result.failure(Exception("Could not read file"))
-
-                val entries = OpmlSubscriptionParser.parse(xml)
-                if (entries.isEmpty()) {
-                    return@withContext Result.failure(Exception("no_entries"))
-                }
+internal sealed class OpmlImportException : Exception() {
+    data object UnreadableFile : OpmlImportException()
 
-                onProgress?.invoke(0, entries.size)
-                val subscribedAt = System.currentTimeMillis()
-                val subscriptions =
-                    entries.mapIndexed { index, entry ->
-                        ChannelSubscription(
-                            channelId = entry.channelId,
-                            channelName = entry.channelName,
-                            channelThumbnail = "",
-                            subscribedAt = subscribedAt - index,
-                        )
+    data object NoSubscriptions : OpmlImportException()
+}
+
+class OpmlSubscriptionImporter
+    @Inject
+    constructor(
+        @ApplicationContext context: Context,
+        private val subscriptionRepository: SubscriptionRepository,
+    ) {
+        private val appContext = context.applicationContext
+
+        suspend fun import(
+            uri: Uri,
+            onProgress: ((current: Int, total: Int) -> Unit)? = null,
+        ): Result<Int> =
+            withContext(Dispatchers.IO) {
+                try {
+                    val xml =
+                        appContext.contentResolver
+                            .openInputStream(uri)
+                            ?.bufferedReader(Charsets.UTF_8)
+                            ?.use { it.readText() }
+                            ?: return@withContext Result.failure(OpmlImportException.UnreadableFile)
+
+                    val entries = OpmlSubscriptionParser.parse(xml)
+                    if (entries.isEmpty()) {
+                        return@withContext Result.failure(OpmlImportException.NoSubscriptions)
                     }
-                subscriptionRepository.subscribeAll(subscriptions)
-                onProgress?.invoke(subscriptions.size, subscriptions.size)
 
-                val channelNames = subscriptions.map(ChannelSubscription::channelName).filter(String::isNotBlank)
-                if (channelNames.isNotEmpty()) {
-                    runCatching {
-                        FlowNeuroEngine.bootstrapFromSubscriptions(appContext, channelNames)
+                    onProgress?.invoke(0, entries.size)
+                    val existingIds = subscriptionRepository.getAllSubscriptionIds()
+                    val subscriptions =
+                        buildMissingOpmlSubscriptions(
+                            entries = entries,
+                            existingIds = existingIds,
+                            subscribedAt = System.currentTimeMillis(),
+                        )
+                    subscriptionRepository.subscribeAll(subscriptions)
+                    onProgress?.invoke(entries.size, entries.size)
+
+                    val channelNames = subscriptions.map(ChannelSubscription::channelName).filter(String::isNotBlank)
+                    if (channelNames.isNotEmpty()) {
+                        runCatching {
+                            FlowNeuroEngine.bootstrapFromSubscriptions(appContext, channelNames)
+                        }
                     }
-                }
 
-                Result.success(subscriptions.size)
-            } catch (e: Exception) {
-                Result.failure(e)
+                    Result.success(subscriptions.size)
+                } catch (e: CancellationException) {
+                    throw e
+                } catch (e: Exception) {
+                    Result.failure(e)
+                }
             }
+    }
+
+internal fun buildMissingOpmlSubscriptions(
+    entries: List<OpmlSubscriptionEntry>,
+    existingIds: Set<String>,
+    subscribedAt: Long,
+): List<ChannelSubscription> =
+    entries
+        .filterNot { it.channelId in existingIds }
+        .mapIndexed { index, entry ->
+            ChannelSubscription(
+                channelId = entry.channelId,
+                channelName = entry.channelName,
+                channelThumbnail = "",
+                subscribedAt = subscribedAt - index,
+            )
         }
-}

From a8bf3d6ebf994779435fd0a6979eaba10842e10d Mon Sep 17 00:00:00 2001
From: Pasta <mhavgonzales@gmail.com>
Date: Fri, 4 Sep 2026 07:34:11 +0300
Subject: [PATCH 28/54] fix(tv): localize OPML import errors

---
 app/src/main/res/values/strings_tv_import.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/src/main/res/values/strings_tv_import.xml b/app/src/main/res/values/strings_tv_import.xml
index 339e107aa..4104d9e99 100644
--- a/app/src/main/res/values/strings_tv_import.xml
+++ b/app/src/main/res/values/strings_tv_import.xml
@@ -2,4 +2,6 @@
 <resources>
     <string name="import_subscriptions_xml_title">Import subscriptions XML/OPML</string>
     <string name="import_subscriptions_xml_desc">Import YouTube subscriptions from an OPML or XML feed export.</string>
+    <string name="import_subscriptions_xml_read_error">Could not read the selected XML/OPML file.</string>
+    <string name="import_subscriptions_xml_no_entries">No YouTube subscriptions were found in this XML/OPML file.</string>
 </resources>

From b54963bcd800de5896f2ce6b3d0c38189062a936 Mon Sep 17 00:00:00 2001
From: Pasta <mhavgonzales@gmail.com>
Date: Fri, 4 Sep 2026 07:34:53 +0300
Subject: [PATCH 29/54] fix(tv): inject OPML importer and map errors

---
 .../ui/screens/settings/ImportViewModel.kt    | 26 +++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/io/github/aedev/flow/ui/screens/settings/ImportViewModel.kt b/app/src/main/java/io/github/aedev/flow/ui/screens/settings/ImportViewModel.kt
index de95c85de..1b3ffe1b2 100644
--- a/app/src/main/java/io/github/aedev/flow/ui/screens/settings/ImportViewModel.kt
+++ b/app/src/main/java/io/github/aedev/flow/ui/screens/settings/ImportViewModel.kt
@@ -8,6 +8,7 @@ import dagger.hilt.android.lifecycle.HiltViewModel
 import dagger.hilt.android.qualifiers.ApplicationContext
 import io.github.aedev.flow.R
 import io.github.aedev.flow.data.local.BackupRepository
+import io.github.aedev.flow.data.local.OpmlImportException
 import io.github.aedev.flow.data.local.OpmlSubscriptionImporter
 import io.github.aedev.flow.notification.NotificationHelper
 import kotlinx.coroutines.CancellationException
@@ -36,6 +37,7 @@ class ImportViewModel
     @Inject
     constructor(
         @ApplicationContext private val context: Context,
+        private val opmlImporter: OpmlSubscriptionImporter,
     ) : ViewModel() {
         init {
             NotificationHelper.cancelImportNotification(context)
@@ -70,7 +72,6 @@ class ImportViewModel
         }
 
         private val backupRepo = BackupRepository(context)
-        private val opmlImporter = OpmlSubscriptionImporter(context)
 
         private val _state = MutableStateFlow<State>(State.Idle)
         val state: StateFlow<State> = _state.asStateFlow()
@@ -115,7 +116,7 @@ class ImportViewModel
                     opmlImporter.import(uri) { current, total ->
                         updateProgress(label, current, total)
                     }
-                handleResult(label, result)
+                handleOpmlResult(label, result)
             }
         }
 
@@ -313,6 +314,27 @@ class ImportViewModel
             }
         }
 
+        private fun handleOpmlResult(
+            label: String,
+            result: Result<Int>,
+        ) {
+            if (result.isSuccess) {
+                handleResult(label, result)
+                return
+            }
+
+            NotificationHelper.cancelImportNotification(context)
+            val message =
+                when (result.exceptionOrNull()) {
+                    OpmlImportException.UnreadableFile ->
+                        context.getString(R.string.import_subscriptions_xml_read_error)
+                    OpmlImportException.NoSubscriptions ->
+                        context.getString(R.string.import_subscriptions_xml_no_entries)
+                    else -> context.getString(R.string.unknown_error)
+                }
+            _state.value = State.Error(label, message)
+        }
+
         private fun handleResult(
             label: String,
             result: Result<Int>,

From 56ff42394c6e54e6c4c947878fef0f4617b0b668 Mon Sep 17 00:00:00 2001
From: Pasta <mhavgonzales@gmail.com>
Date: Fri, 4 Sep 2026 07:35:29 +0300
Subject: [PATCH 30/54] fix(ci): preserve release tag version prefix

---
 .github/workflows/build.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a443582d5..f2346ea29 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -306,7 +306,7 @@ jobs:
 
       - name: Get version from tag
         id: get_version
-        run: echo "VERSION=${GITHUB_REF#refs/tags/v}" >> "$GITHUB_OUTPUT"
+        run: echo "VERSION=${GITHUB_REF#refs/tags/}" >> "$GITHUB_OUTPUT"
 
       - name: Validate release notes
         env:
@@ -333,4 +333,4 @@ jobs:
           draft: false
           prerelease: false
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
\ No newline at end of file

From aa3e954a68664deaeb998ed71af86922b173f3e0 Mon Sep 17 00:00:00 2001
From: Pasta <mhavgonzales@gmail.com>
Date: Fri, 4 Sep 2026 07:35:45 +0300
Subject: [PATCH 31/54] test(tv): guard OPML metadata preservation

---
 .../data/local/OpmlSubscriptionParserTest.kt  | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/app/src/test/java/io/github/aedev/flow/data/local/OpmlSubscriptionParserTest.kt b/app/src/test/java/io/github/aedev/flow/data/local/OpmlSubscriptionParserTest.kt
index 228955ed4..49d7b8996 100644
--- a/app/src/test/java/io/github/aedev/flow/data/local/OpmlSubscriptionParserTest.kt
+++ b/app/src/test/java/io/github/aedev/flow/data/local/OpmlSubscriptionParserTest.kt
@@ -71,4 +71,30 @@ class OpmlSubscriptionParserTest {
     fun `rejects non xml input`() {
         assertThat(OpmlSubscriptionParser.parse("channel,name\nUC123,Example")).isEmpty()
     }
+
+    @Test
+    fun `builds subscriptions only for channel ids that are not already followed`() {
+        val existingId = "UC1234567890123456789012"
+        val newId = "UCabcdefghijklmnopqrstuv"
+        val subscriptions =
+            buildMissingOpmlSubscriptions(
+                entries =
+                    listOf(
+                        OpmlSubscriptionEntry(existingId, "Existing channel"),
+                        OpmlSubscriptionEntry(newId, "New channel"),
+                    ),
+                existingIds = setOf(existingId),
+                subscribedAt = 1_000L,
+            )
+
+        assertThat(subscriptions)
+            .containsExactly(
+                ChannelSubscription(
+                    channelId = newId,
+                    channelName = "New channel",
+                    channelThumbnail = "",
+                    subscribedAt = 1_000L,
+                ),
+            )
+    }
 }

From 564e70f9334a0a7f7f06e518d0c166a2f0fac11b Mon Sep 17 00:00:00 2001
From: Pasta <mhavgonzales@gmail.com>
Date: Fri, 4 Sep 2026 07:37:45 +0300
Subject: [PATCH 32/54] style(tv): apply OPML result formatting

---
 .../flow/ui/screens/settings/ImportViewModel.kt      | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/io/github/aedev/flow/ui/screens/settings/ImportViewModel.kt b/app/src/main/java/io/github/aedev/flow/ui/screens/settings/ImportViewModel.kt
index 1b3ffe1b2..8226d93c6 100644
--- a/app/src/main/java/io/github/aedev/flow/ui/screens/settings/ImportViewModel.kt
+++ b/app/src/main/java/io/github/aedev/flow/ui/screens/settings/ImportViewModel.kt
@@ -326,11 +326,17 @@ class ImportViewModel
             NotificationHelper.cancelImportNotification(context)
             val message =
                 when (result.exceptionOrNull()) {
-                    OpmlImportException.UnreadableFile ->
+                    OpmlImportException.UnreadableFile -> {
                         context.getString(R.string.import_subscriptions_xml_read_error)
-                    OpmlImportException.NoSubscriptions ->
+                    }
+
+                    OpmlImportException.NoSubscriptions -> {
                         context.getString(R.string.import_subscriptions_xml_no_entries)
-                    else -> context.getString(R.string.unknown_error)
+                    }
+
+                    else -> {
+                        context.getString(R.string.unknown_error)
+                    }
                 }
             _state.value = State.Error(label, message)
         }

From 855f836ef6b9a906e734921be855b46889880bc6 Mon Sep 17 00:00:00 2001
From: Pasta <mhavgonzales@gmail.com>
Date: Fri, 4 Sep 2026 14:05:09 +0300
Subject: [PATCH 33/54] fix(import): parse OPML with strict YouTube URL
 validation

---
 .../flow/data/local/OpmlSubscriptionParser.kt | 171 ++++++++++--------
 1 file changed, 94 insertions(+), 77 deletions(-)

diff --git a/app/src/main/java/io/github/aedev/flow/data/local/OpmlSubscriptionParser.kt b/app/src/main/java/io/github/aedev/flow/data/local/OpmlSubscriptionParser.kt
index 587153f96..6e252c3dd 100644
--- a/app/src/main/java/io/github/aedev/flow/data/local/OpmlSubscriptionParser.kt
+++ b/app/src/main/java/io/github/aedev/flow/data/local/OpmlSubscriptionParser.kt
@@ -1,101 +1,118 @@
 package io.github.aedev.flow.data.local
 
+import org.w3c.dom.Element
+import org.w3c.dom.Node
+import org.xml.sax.InputSource
+import java.io.StringReader
+import java.net.URI
+import java.net.URLDecoder
+import javax.xml.XMLConstants
+import javax.xml.parsers.DocumentBuilderFactory
+
 internal data class OpmlSubscriptionEntry(
     val channelId: String,
     val channelName: String,
 )
 
-/** Lightweight OPML reader for YouTube subscription exports. */
+/** XML-backed OPML reader for YouTube subscription exports. */
 internal object OpmlSubscriptionParser {
-    private val outlineRegex =
-        Regex(
-            pattern = """<outline\b([^>]*)/?>""",
-            options = setOf(RegexOption.IGNORE_CASE, RegexOption.DOT_MATCHES_ALL),
-        )
-    private val attributeRegex =
-        Regex(
-            pattern = """([A-Za-z_:][A-Za-z0-9_:.-]*)\s*=\s*([\"'])(.*?)\2""",
-            options = setOf(RegexOption.IGNORE_CASE, RegexOption.DOT_MATCHES_ALL),
-        )
     private val youtubeChannelIdRegex = Regex("""UC[0-9A-Za-z_-]{22}""")
-    private val decimalEntityRegex = Regex("""&#(\d+);""")
-    private val hexEntityRegex = Regex("""&#x([0-9A-Fa-f]+);""")
 
     fun parse(xml: String): List<OpmlSubscriptionEntry> {
         if (!xml.trimStart().startsWith("<")) return emptyList()
 
+        val document =
+            runCatching {
+                val factory = DocumentBuilderFactory.newInstance()
+                runCatching { factory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true) }
+                runCatching { factory.setFeature("http://apache.org/xml/features/disallow-doctype-decl", true) }
+                runCatching { factory.setFeature("http://xml.org/sax/features/external-general-entities", false) }
+                runCatching { factory.setFeature("http://xml.org/sax/features/external-parameter-entities", false) }
+                runCatching { factory.isXIncludeAware = false }
+                runCatching { factory.isExpandEntityReferences = false }
+
+                factory
+                    .newDocumentBuilder()
+                    .apply {
+                        setEntityResolver { _, _ -> InputSource(StringReader("")) }
+                    }.parse(InputSource(StringReader(xml)))
+            }.getOrNull() ?: return emptyList()
+
         val seen = LinkedHashSet<String>()
-        return outlineRegex
-            .findAll(xml)
-            .mapNotNull { match ->
-                val attributes = parseAttributes(match.groupValues[1])
-                val channelId = extractChannelId(attributes) ?: return@mapNotNull null
-                if (!seen.add(channelId)) return@mapNotNull null
-
-                val channelName =
-                    sequenceOf("title", "text")
-                        .mapNotNull(attributes::get)
-                        .map(::decodeXml)
-                        .map(String::trim)
-                        .firstOrNull(String::isNotEmpty)
-                        ?: channelId
-
-                OpmlSubscriptionEntry(
-                    channelId = channelId,
-                    channelName = channelName,
-                )
-            }.toList()
+        val entries = mutableListOf<OpmlSubscriptionEntry>()
+
+        fun visit(node: Node) {
+            if (node is Element && node.tagName.equals("outline", ignoreCase = true)) {
+                val attributes = node.attributes.toAttributeMap()
+                val channelId = extractChannelId(attributes)
+                if (channelId != null && seen.add(channelId)) {
+                    val channelName =
+                        sequenceOf("title", "text")
+                            .mapNotNull(attributes::get)
+                            .map(String::trim)
+                            .firstOrNull(String::isNotEmpty)
+                            ?: channelId
+                    entries += OpmlSubscriptionEntry(channelId = channelId, channelName = channelName)
+                }
+            }
+
+            val children = node.childNodes
+            for (index in 0 until children.length) {
+                visit(children.item(index))
+            }
+        }
+
+        document.documentElement?.let(::visit)
+        return entries
     }
 
-    private fun parseAttributes(raw: String): Map<String, String> =
-        attributeRegex
-            .findAll(raw)
-            .associate { match ->
-                match.groupValues[1].lowercase() to match.groupValues[3]
+    private fun org.w3c.dom.NamedNodeMap.toAttributeMap(): Map<String, String> =
+        buildMap {
+            for (index in 0 until length) {
+                val attribute = item(index)
+                put(attribute.nodeName.lowercase(), attribute.nodeValue.orEmpty())
             }
+        }
 
     private fun extractChannelId(attributes: Map<String, String>): String? {
-        val preferredKeys =
-            listOf(
-                "channelid",
-                "channel_id",
-                "xmlurl",
-                "htmlurl",
-                "url",
-                "href",
-            )
-        val candidates =
-            buildList {
-                preferredKeys.mapNotNullTo(this) { attributes[it] }
-                attributes.values.forEach { value ->
-                    if (value !in this) add(value)
-                }
-            }
+        sequenceOf("channelid", "channel_id")
+            .mapNotNull(attributes::get)
+            .map(String::trim)
+            .firstOrNull(youtubeChannelIdRegex::matches)
+            ?.let { return it }
 
-        return candidates
-            .asSequence()
-            .map(::decodeXml)
-            .mapNotNull { value -> youtubeChannelIdRegex.find(value)?.value }
+        return sequenceOf("xmlurl", "htmlurl", "url", "href")
+            .mapNotNull(attributes::get)
+            .mapNotNull(::extractChannelIdFromYouTubeUrl)
             .firstOrNull()
     }
 
-    private fun decodeXml(value: String): String =
-        value
-            .replace(hexEntityRegex) { match -> decodeCodePoint(match.groupValues[1], 16) }
-            .replace(decimalEntityRegex) { match -> decodeCodePoint(match.groupValues[1], 10) }
-            .replace("&quot;", "\"")
-            .replace("&apos;", "'")
-            .replace("&lt;", "<")
-            .replace("&gt;", ">")
-            .replace("&amp;", "&")
-
-    private fun decodeCodePoint(
-        value: String,
-        radix: Int,
-    ): String =
-        value
-            .toIntOrNull(radix)
-            ?.takeIf(Character::isValidCodePoint)
-            ?.let { String(Character.toChars(it)) }
-            .orEmpty()
+    private fun extractChannelIdFromYouTubeUrl(rawUrl: String): String? {
+        val uri = runCatching { URI(rawUrl.trim()) }.getOrNull() ?: return null
+        if (uri.scheme?.lowercase() !in setOf("http", "https")) return null
+
+        val host = uri.host?.lowercase() ?: return null
+        if (host != "youtube.com" && !host.endsWith(".youtube.com")) return null
+
+        val path = uri.path.orEmpty()
+        if (path.equals("/feeds/videos.xml", ignoreCase = true)) {
+            return uri.rawQuery
+                .orEmpty()
+                .split("&")
+                .asSequence()
+                .mapNotNull { part ->
+                    val key = part.substringBefore("=", missingDelimiterValue = part)
+                    if (!key.equals("channel_id", ignoreCase = true)) return@mapNotNull null
+                    URLDecoder.decode(part.substringAfter("=", ""), Charsets.UTF_8.name())
+                }.map(String::trim)
+                .firstOrNull(youtubeChannelIdRegex::matches)
+        }
+
+        val segments = path.split('/').filter(String::isNotBlank)
+        if (segments.size >= 2 && segments[0].equals("channel", ignoreCase = true)) {
+            return segments[1].trim().takeIf(youtubeChannelIdRegex::matches)
+        }
+
+        return null
+    }
 }

From 07fa1d23d9dfb4c3cbaf95b14ceba0da38df44bc Mon Sep 17 00:00:00 2001
From: Pasta <mhavgonzales@gmail.com>
Date: Fri, 4 Sep 2026 14:05:26 +0300
Subject: [PATCH 34/54] fix(import): enrich OPML subscriptions with channel
 avatars

---
 .../data/local/OpmlSubscriptionImporter.kt    | 57 ++++++++++++++++++-
 1 file changed, 54 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/io/github/aedev/flow/data/local/OpmlSubscriptionImporter.kt b/app/src/main/java/io/github/aedev/flow/data/local/OpmlSubscriptionImporter.kt
index 888ae00f7..7503b4d5f 100644
--- a/app/src/main/java/io/github/aedev/flow/data/local/OpmlSubscriptionImporter.kt
+++ b/app/src/main/java/io/github/aedev/flow/data/local/OpmlSubscriptionImporter.kt
@@ -6,7 +6,15 @@ import dagger.hilt.android.qualifiers.ApplicationContext
 import io.github.aedev.flow.data.recommendation.FlowNeuroEngine
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.async
+import kotlinx.coroutines.awaitAll
+import kotlinx.coroutines.supervisorScope
+import kotlinx.coroutines.sync.Semaphore
+import kotlinx.coroutines.sync.withPermit
 import kotlinx.coroutines.withContext
+import org.schabi.newpipe.extractor.ServiceList
+import org.schabi.newpipe.extractor.channel.ChannelInfo
+import java.util.concurrent.atomic.AtomicInteger
 import javax.inject.Inject
 
 internal sealed class OpmlImportException : Exception() {
@@ -41,16 +49,20 @@ class OpmlSubscriptionImporter
                         return@withContext Result.failure(OpmlImportException.NoSubscriptions)
                     }
 
-                    onProgress?.invoke(0, entries.size)
                     val existingIds = subscriptionRepository.getAllSubscriptionIds()
-                    val subscriptions =
+                    val missingSubscriptions =
                         buildMissingOpmlSubscriptions(
                             entries = entries,
                             existingIds = existingIds,
                             subscribedAt = System.currentTimeMillis(),
                         )
+                    val subscriptions =
+                        enrichOpmlSubscriptionAvatars(
+                            subscriptions = missingSubscriptions,
+                            avatarFetcher = ::fetchYoutubeChannelAvatar,
+                            onProgress = onProgress,
+                        )
                     subscriptionRepository.subscribeAll(subscriptions)
-                    onProgress?.invoke(entries.size, entries.size)
 
                     val channelNames = subscriptions.map(ChannelSubscription::channelName).filter(String::isNotBlank)
                     if (channelNames.isNotEmpty()) {
@@ -66,6 +78,15 @@ class OpmlSubscriptionImporter
                     Result.failure(e)
                 }
             }
+
+        private fun fetchYoutubeChannelAvatar(channelId: String): String =
+            try {
+                val url = "https://www.youtube.com/channel/$channelId"
+                val info = ChannelInfo.getInfo(ServiceList.YouTube, url)
+                info.avatars.maxByOrNull { it.height }?.url ?: ""
+            } catch (e: Exception) {
+                ""
+            }
     }
 
 internal fun buildMissingOpmlSubscriptions(
@@ -83,3 +104,33 @@ internal fun buildMissingOpmlSubscriptions(
                 subscribedAt = subscribedAt - index,
             )
         }
+
+internal suspend fun enrichOpmlSubscriptionAvatars(
+    subscriptions: List<ChannelSubscription>,
+    avatarFetcher: suspend (String) -> String,
+    onProgress: ((current: Int, total: Int) -> Unit)? = null,
+): List<ChannelSubscription> {
+    if (subscriptions.isEmpty()) {
+        onProgress?.invoke(0, 0)
+        return emptyList()
+    }
+
+    val semaphore = Semaphore(5)
+    val completed = AtomicInteger(0)
+    onProgress?.invoke(0, subscriptions.size)
+
+    return supervisorScope {
+        subscriptions
+            .map { subscription ->
+                async(Dispatchers.IO) {
+                    val enriched =
+                        semaphore.withPermit {
+                            val avatar = runCatching { avatarFetcher(subscription.channelId) }.getOrDefault("")
+                            if (avatar.isBlank()) subscription else subscription.copy(channelThumbnail = avatar)
+                        }
+                    onProgress?.invoke(completed.incrementAndGet(), subscriptions.size)
+                    enriched
+                }
+            }.awaitAll()
+    }
+}

From 6ddb1d824ca79795aa3981dce3b3506d6c8e39f8 Mon Sep 17 00:00:00 2001
From: Pasta <mhavgonzales@gmail.com>
Date: Fri, 4 Sep 2026 14:05:43 +0300
Subject: [PATCH 35/54] fix(import): localize generic file import failures

---
 app/src/main/res/values/strings_tv_import.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values/strings_tv_import.xml b/app/src/main/res/values/strings_tv_import.xml
index 4104d9e99..9a498348f 100644
--- a/app/src/main/res/values/strings_tv_import.xml
+++ b/app/src/main/res/values/strings_tv_import.xml
@@ -4,4 +4,5 @@
     <string name="import_subscriptions_xml_desc">Import YouTube subscriptions from an OPML or XML feed export.</string>
     <string name="import_subscriptions_xml_read_error">Could not read the selected XML/OPML file.</string>
     <string name="import_subscriptions_xml_no_entries">No YouTube subscriptions were found in this XML/OPML file.</string>
+    <string name="import_file_failed_generic">Could not import the selected file.</string>
 </resources>

From f2c2ae5e462e07a342807a1265a82f6ec619f5f4 Mon Sep 17 00:00:00 2001
From: Pasta <mhavgonzales@gmail.com>
Date: Fri, 4 Sep 2026 14:06:20 +0300
Subject: [PATCH 36/54] fix(import): keep technical errors out of user-facing
 state

---
 .../ui/screens/settings/ImportViewModel.kt    | 41 +++++++++++++------
 1 file changed, 28 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/io/github/aedev/flow/ui/screens/settings/ImportViewModel.kt b/app/src/main/java/io/github/aedev/flow/ui/screens/settings/ImportViewModel.kt
index 8226d93c6..83884f2a1 100644
--- a/app/src/main/java/io/github/aedev/flow/ui/screens/settings/ImportViewModel.kt
+++ b/app/src/main/java/io/github/aedev/flow/ui/screens/settings/ImportViewModel.kt
@@ -2,6 +2,7 @@ package io.github.aedev.flow.ui.screens.settings
 
 import android.content.Context
 import android.net.Uri
+import android.util.Log
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import dagger.hilt.android.lifecycle.HiltViewModel
@@ -39,6 +40,10 @@ class ImportViewModel
         @ApplicationContext private val context: Context,
         private val opmlImporter: OpmlSubscriptionImporter,
     ) : ViewModel() {
+        companion object {
+            private const val TAG = "ImportViewModel"
+        }
+
         init {
             NotificationHelper.cancelImportNotification(context)
         }
@@ -94,13 +99,12 @@ class ImportViewModel
                             NotificationHelper.showImportComplete(context, label, 0, successMessage)
                         }
                     } else {
-                        val msg = result.exceptionOrNull()?.message ?: context.getString(R.string.unknown_error)
-                        _state.value = State.Error(label, msg)
+                        setLocalizedError(label, result.exceptionOrNull())
                     }
                 } catch (e: CancellationException) {
                     throw e
                 } catch (e: Exception) {
-                    _state.value = State.Error(label, e.message ?: context.getString(R.string.unknown_error))
+                    setLocalizedError(label, e)
                 } finally {
                     NotificationHelper.cancelImportNotification(context)
                 }
@@ -233,13 +237,12 @@ class ImportViewModel
                             NotificationHelper.showImportComplete(context, label, 0, summary)
                         }
                     } else {
-                        val msg = result.exceptionOrNull()?.message ?: context.getString(R.string.unknown_error)
-                        _state.value = State.Error(label, msg)
+                        setLocalizedError(label, result.exceptionOrNull())
                     }
                 } catch (e: CancellationException) {
                     throw e
                 } catch (e: Exception) {
-                    _state.value = State.Error(label, e.message ?: context.getString(R.string.unknown_error))
+                    setLocalizedError(label, e)
                 } finally {
                     NotificationHelper.cancelImportNotification(context)
                 }
@@ -260,13 +263,12 @@ class ImportViewModel
                             NotificationHelper.showImportComplete(context, label, 0, successMessage)
                         }
                     } else {
-                        val msg = result.exceptionOrNull()?.message ?: context.getString(R.string.unknown_error)
-                        _state.value = State.Error(label, msg)
+                        setLocalizedError(label, result.exceptionOrNull())
                     }
                 } catch (e: CancellationException) {
                     throw e
                 } catch (e: Exception) {
-                    _state.value = State.Error(label, e.message ?: context.getString(R.string.unknown_error))
+                    setLocalizedError(label, e)
                 } finally {
                     NotificationHelper.cancelImportNotification(context)
                 }
@@ -324,8 +326,12 @@ class ImportViewModel
             }
 
             NotificationHelper.cancelImportNotification(context)
+            val error = result.exceptionOrNull()
+            if (error != null) {
+                Log.e(TAG, "OPML import failed: $label", error)
+            }
             val message =
-                when (result.exceptionOrNull()) {
+                when (error) {
                     OpmlImportException.UnreadableFile -> {
                         context.getString(R.string.import_subscriptions_xml_read_error)
                     }
@@ -335,7 +341,7 @@ class ImportViewModel
                     }
 
                     else -> {
-                        context.getString(R.string.unknown_error)
+                        context.getString(R.string.import_file_failed_generic)
                     }
                 }
             _state.value = State.Error(label, message)
@@ -353,8 +359,17 @@ class ImportViewModel
                     NotificationHelper.showImportComplete(context, label, count)
                 }
             } else {
-                val msg = result.exceptionOrNull()?.message ?: context.getString(R.string.unknown_error)
-                _state.value = State.Error(label, msg)
+                setLocalizedError(label, result.exceptionOrNull())
+            }
+        }
+
+        private fun setLocalizedError(
+            label: String,
+            error: Throwable?,
+        ) {
+            if (error != null) {
+                Log.e(TAG, "Import failed: $label", error)
             }
+            _state.value = State.Error(label, context.getString(R.string.import_file_failed_generic))
         }
     }

From 32ec044cb8fadf9579280cb6546e893c544aaa5b Mon Sep 17 00:00:00 2001
From: Pasta <mhavgonzales@gmail.com>
Date: Fri, 4 Sep 2026 14:06:47 +0300
Subject: [PATCH 37/54] test(import): cover strict OPML parsing and avatar
 enrichment

---
 .../data/local/OpmlSubscriptionParserTest.kt  | 63 +++++++++++++++++++
 1 file changed, 63 insertions(+)

diff --git a/app/src/test/java/io/github/aedev/flow/data/local/OpmlSubscriptionParserTest.kt b/app/src/test/java/io/github/aedev/flow/data/local/OpmlSubscriptionParserTest.kt
index 49d7b8996..1d2b761a5 100644
--- a/app/src/test/java/io/github/aedev/flow/data/local/OpmlSubscriptionParserTest.kt
+++ b/app/src/test/java/io/github/aedev/flow/data/local/OpmlSubscriptionParserTest.kt
@@ -1,6 +1,7 @@
 package io.github.aedev.flow.data.local
 
 import com.google.common.truth.Truth.assertThat
+import kotlinx.coroutines.runBlocking
 import org.junit.Test
 
 class OpmlSubscriptionParserTest {
@@ -51,6 +52,26 @@ class OpmlSubscriptionParserTest {
             )
     }
 
+    @Test
+    fun `accepts an explicit canonical channel id attribute`() {
+        val xml =
+            """
+            <opml>
+              <body>
+                <outline text="Direct channel" channelId="UC1234567890123456789012" />
+              </body>
+            </opml>
+            """.trimIndent()
+
+        assertThat(OpmlSubscriptionParser.parse(xml))
+            .containsExactly(
+                OpmlSubscriptionEntry(
+                    channelId = "UC1234567890123456789012",
+                    channelName = "Direct channel",
+                ),
+            )
+    }
+
     @Test
     fun `ignores outlines without a canonical YouTube channel id`() {
         val xml =
@@ -67,6 +88,23 @@ class OpmlSubscriptionParserTest {
         assertThat(OpmlSubscriptionParser.parse(xml)).isEmpty()
     }
 
+    @Test
+    fun `does not scan labels non YouTube URLs or comments for channel ids`() {
+        val xml =
+            """
+            <opml>
+              <body>
+                <outline
+                    text="UC1234567890123456789012"
+                    xmlUrl="https://example.com/feed.xml?channel_id=UC1234567890123456789012" />
+                <!-- <outline text="Commented" xmlUrl="https://www.youtube.com/feeds/videos.xml?channel_id=UCabcdefghijklmnopqrstuv" /> -->
+              </body>
+            </opml>
+            """.trimIndent()
+
+        assertThat(OpmlSubscriptionParser.parse(xml)).isEmpty()
+    }
+
     @Test
     fun `rejects non xml input`() {
         assertThat(OpmlSubscriptionParser.parse("channel,name\nUC123,Example")).isEmpty()
@@ -97,4 +135,29 @@ class OpmlSubscriptionParserTest {
                 ),
             )
     }
+
+    @Test
+    fun `enriches new subscriptions with fetched channel avatars`() =
+        runBlocking {
+            val channelId = "UCabcdefghijklmnopqrstuv"
+            val progress = mutableListOf<Pair<Int, Int>>()
+            val subscriptions =
+                enrichOpmlSubscriptionAvatars(
+                    subscriptions =
+                        listOf(
+                            ChannelSubscription(
+                                channelId = channelId,
+                                channelName = "New channel",
+                                channelThumbnail = "",
+                                subscribedAt = 1_000L,
+                            ),
+                        ),
+                    avatarFetcher = { "https://yt3.ggpht.com/avatar-$it" },
+                    onProgress = { current, total -> progress += current to total },
+                )
+
+            assertThat(subscriptions.single().channelThumbnail)
+                .isEqualTo("https://yt3.ggpht.com/avatar-$channelId")
+            assertThat(progress).containsExactly(0 to 1, 1 to 1).inOrder()
+        }
 }

From 8c6fb2e03f64f6dcd6350739c72dcc9b2f468da2 Mon Sep 17 00:00:00 2001
From: Pasta <mhavgonzales@gmail.com>
Date: Fri, 4 Sep 2026 15:34:47 +0300
Subject: [PATCH 38/54] fix(import): preserve known import error states

---
 .../flow/ui/screens/settings/ImportViewModel.kt    | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/io/github/aedev/flow/ui/screens/settings/ImportViewModel.kt b/app/src/main/java/io/github/aedev/flow/ui/screens/settings/ImportViewModel.kt
index 83884f2a1..67bb70c1a 100644
--- a/app/src/main/java/io/github/aedev/flow/ui/screens/settings/ImportViewModel.kt
+++ b/app/src/main/java/io/github/aedev/flow/ui/screens/settings/ImportViewModel.kt
@@ -42,6 +42,13 @@ class ImportViewModel
     ) : ViewModel() {
         companion object {
             private const val TAG = "ImportViewModel"
+            private val KNOWN_IMPORT_ERROR_CODES =
+                setOf(
+                    "no_entries",
+                    "no_videos",
+                    "no_content",
+                    "invalid_format",
+                )
         }
 
         init {
@@ -370,6 +377,11 @@ class ImportViewModel
             if (error != null) {
                 Log.e(TAG, "Import failed: $label", error)
             }
-            _state.value = State.Error(label, context.getString(R.string.import_file_failed_generic))
+            val message =
+                error
+                    ?.message
+                    ?.takeIf(KNOWN_IMPORT_ERROR_CODES::contains)
+                    ?: context.getString(R.string.import_file_failed_generic)
+            _state.value = State.Error(label, message)
         }
     }

From 367cb366256587fbb4ca4f6766aec275d6214e29 Mon Sep 17 00:00:00 2001
From: Pasta <mhavgonzales@gmail.com>
Date: Fri, 4 Sep 2026 15:36:59 +0300
Subject: [PATCH 39/54] fix(import): reuse default import resources

---
 .../aedev/flow/ui/screens/settings/ImportViewModel.kt  | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/io/github/aedev/flow/ui/screens/settings/ImportViewModel.kt b/app/src/main/java/io/github/aedev/flow/ui/screens/settings/ImportViewModel.kt
index 67bb70c1a..8133620d7 100644
--- a/app/src/main/java/io/github/aedev/flow/ui/screens/settings/ImportViewModel.kt
+++ b/app/src/main/java/io/github/aedev/flow/ui/screens/settings/ImportViewModel.kt
@@ -120,7 +120,7 @@ class ImportViewModel
 
         fun importOpmlSubscriptions(uri: Uri) {
             if (isRunning) return
-            val label = context.getString(R.string.import_subscriptions_xml_title)
+            val label = context.getString(R.string.import_from_youtube)
             viewModelScope.launch {
                 startProgress(label, 0, 0)
                 val result =
@@ -340,15 +340,15 @@ class ImportViewModel
             val message =
                 when (error) {
                     OpmlImportException.UnreadableFile -> {
-                        context.getString(R.string.import_subscriptions_xml_read_error)
+                        context.getString(R.string.import_invalid_format)
                     }
 
                     OpmlImportException.NoSubscriptions -> {
-                        context.getString(R.string.import_subscriptions_xml_no_entries)
+                        context.getString(R.string.import_no_content)
                     }
 
                     else -> {
-                        context.getString(R.string.import_file_failed_generic)
+                        context.getString(R.string.unknown_error)
                     }
                 }
             _state.value = State.Error(label, message)
@@ -381,7 +381,7 @@ class ImportViewModel
                 error
                     ?.message
                     ?.takeIf(KNOWN_IMPORT_ERROR_CODES::contains)
-                    ?: context.getString(R.string.import_file_failed_generic)
+                    ?: context.getString(R.string.unknown_error)
             _state.value = State.Error(label, message)
         }
     }

From 6237180eb3e2c8382ea52b39e0778983b360a6ce Mon Sep 17 00:00:00 2001
From: Pasta <mhavgonzales@gmail.com>
Date: Fri, 4 Sep 2026 15:37:34 +0300
Subject: [PATCH 40/54] fix(tv): reuse default import strings

---
 .../io/github/aedev/flow/ui/tv/screens/TvImportDataScreen.kt  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/io/github/aedev/flow/ui/tv/screens/TvImportDataScreen.kt b/app/src/main/java/io/github/aedev/flow/ui/tv/screens/TvImportDataScreen.kt
index 280cc2fcb..d5ca0d9ed 100644
--- a/app/src/main/java/io/github/aedev/flow/ui/tv/screens/TvImportDataScreen.kt
+++ b/app/src/main/java/io/github/aedev/flow/ui/tv/screens/TvImportDataScreen.kt
@@ -114,8 +114,8 @@ fun TvImportDataScreen(
                     onClick = { masterBackupLauncher.launch(zipMimeTypes) },
                 )
                 TvSelectionRow(
-                    label = stringResource(R.string.import_subscriptions_xml_title),
-                    supportingText = stringResource(R.string.import_subscriptions_xml_desc),
+                    label = stringResource(R.string.import_label_youtube_subscriptions),
+                    supportingText = stringResource(R.string.import_other_youtube_clients),
                     selected = false,
                     onClick = { opmlLauncher.launch(xmlMimeTypes) },
                 )

From 9bff9839aa1d3625413b470583a62691db427305 Mon Sep 17 00:00:00 2001
From: Pasta <mhavgonzales@gmail.com>
Date: Fri, 4 Sep 2026 15:37:45 +0300
Subject: [PATCH 41/54] chore(resources): remove duplicate TV import strings

---
 app/src/main/res/values/strings_tv_import.xml | 8 --------
 1 file changed, 8 deletions(-)
 delete mode 100644 app/src/main/res/values/strings_tv_import.xml

diff --git a/app/src/main/res/values/strings_tv_import.xml b/app/src/main/res/values/strings_tv_import.xml
deleted file mode 100644
index 9a498348f..000000000
--- a/app/src/main/res/values/strings_tv_import.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="import_subscriptions_xml_title">Import subscriptions XML/OPML</string>
-    <string name="import_subscriptions_xml_desc">Import YouTube subscriptions from an OPML or XML feed export.</string>
-    <string name="import_subscriptions_xml_read_error">Could not read the selected XML/OPML file.</string>
-    <string name="import_subscriptions_xml_no_entries">No YouTube subscriptions were found in this XML/OPML file.</string>
-    <string name="import_file_failed_generic">Could not import the selected file.</string>
-</resources>

From bbafaca84e62f113938e254977e3a381fd81935e Mon Sep 17 00:00:00 2001
From: Pasta <mhavgonzales@gmail.com>
Date: Fri, 4 Sep 2026 15:38:54 +0300
Subject: [PATCH 42/54] refactor(import): centralize safe error mapping

---
 .../ui/screens/settings/ImportViewModel.kt    | 30 +++++++++++--------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/io/github/aedev/flow/ui/screens/settings/ImportViewModel.kt b/app/src/main/java/io/github/aedev/flow/ui/screens/settings/ImportViewModel.kt
index 8133620d7..456b36887 100644
--- a/app/src/main/java/io/github/aedev/flow/ui/screens/settings/ImportViewModel.kt
+++ b/app/src/main/java/io/github/aedev/flow/ui/screens/settings/ImportViewModel.kt
@@ -19,6 +19,19 @@ import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.launch
 import javax.inject.Inject
 
+private val KNOWN_IMPORT_ERROR_CODES =
+    setOf(
+        "no_entries",
+        "no_videos",
+        "no_content",
+        "invalid_format",
+    )
+
+internal fun safeImportErrorMessage(
+    rawMessage: String?,
+    fallback: String,
+): String = rawMessage?.takeIf(KNOWN_IMPORT_ERROR_CODES::contains) ?: fallback
+
 /**
  * Activity-scoped ViewModel for all data-import operations.
  *
@@ -42,13 +55,6 @@ class ImportViewModel
     ) : ViewModel() {
         companion object {
             private const val TAG = "ImportViewModel"
-            private val KNOWN_IMPORT_ERROR_CODES =
-                setOf(
-                    "no_entries",
-                    "no_videos",
-                    "no_content",
-                    "invalid_format",
-                )
         }
 
         init {
@@ -120,7 +126,7 @@ class ImportViewModel
 
         fun importOpmlSubscriptions(uri: Uri) {
             if (isRunning) return
-            val label = context.getString(R.string.import_from_youtube)
+            val label = context.getString(R.string.import_label_youtube_subscriptions)
             viewModelScope.launch {
                 startProgress(label, 0, 0)
                 val result =
@@ -378,10 +384,10 @@ class ImportViewModel
                 Log.e(TAG, "Import failed: $label", error)
             }
             val message =
-                error
-                    ?.message
-                    ?.takeIf(KNOWN_IMPORT_ERROR_CODES::contains)
-                    ?: context.getString(R.string.unknown_error)
+                safeImportErrorMessage(
+                    rawMessage = error?.message,
+                    fallback = context.getString(R.string.unknown_error),
+                )
             _state.value = State.Error(label, message)
         }
     }

From 01a6c7876002a673120e6034d8580d68595e0861 Mon Sep 17 00:00:00 2001
From: Pasta <mhavgonzales@gmail.com>
Date: Fri, 4 Sep 2026 15:39:23 +0300
Subject: [PATCH 43/54] fix(tv): localize preserved import error codes

---
 .../aedev/flow/ui/tv/screens/TvImportDataScreen.kt   | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/io/github/aedev/flow/ui/tv/screens/TvImportDataScreen.kt b/app/src/main/java/io/github/aedev/flow/ui/tv/screens/TvImportDataScreen.kt
index d5ca0d9ed..2680f7968 100644
--- a/app/src/main/java/io/github/aedev/flow/ui/tv/screens/TvImportDataScreen.kt
+++ b/app/src/main/java/io/github/aedev/flow/ui/tv/screens/TvImportDataScreen.kt
@@ -189,7 +189,7 @@ private fun ImportStatus(
                 horizontalAlignment = Alignment.Start,
             ) {
                 Text(
-                    text = stringResource(R.string.import_failed_template, state.message),
+                    text = stringResource(R.string.import_failed_template, localizedImportErrorMessage(state.message)),
                     style = MaterialTheme.typography.bodyLarge,
                     color = MaterialTheme.colorScheme.error,
                 )
@@ -199,6 +199,16 @@ private fun ImportStatus(
     }
 }
 
+@Composable
+private fun localizedImportErrorMessage(message: String): String =
+    when (message) {
+        "no_entries" -> stringResource(R.string.import_no_history_entries)
+        "no_videos" -> stringResource(R.string.import_no_videos)
+        "no_content" -> stringResource(R.string.import_no_content)
+        "invalid_format" -> stringResource(R.string.import_invalid_format)
+        else -> message
+    }
+
 private val jsonMimeTypes =
     arrayOf(
         "application/json",

From 377309820bffcabf6d61444e9696022fd1d715de Mon Sep 17 00:00:00 2001
From: Pasta <mhavgonzales@gmail.com>
Date: Fri, 4 Sep 2026 15:39:34 +0300
Subject: [PATCH 44/54] test(import): preserve known error codes safely

---
 .../settings/ImportErrorMappingTest.kt        | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 app/src/test/java/io/github/aedev/flow/ui/screens/settings/ImportErrorMappingTest.kt

diff --git a/app/src/test/java/io/github/aedev/flow/ui/screens/settings/ImportErrorMappingTest.kt b/app/src/test/java/io/github/aedev/flow/ui/screens/settings/ImportErrorMappingTest.kt
new file mode 100644
index 000000000..8ff5a29c9
--- /dev/null
+++ b/app/src/test/java/io/github/aedev/flow/ui/screens/settings/ImportErrorMappingTest.kt
@@ -0,0 +1,23 @@
+package io.github.aedev.flow.ui.screens.settings
+
+import com.google.common.truth.Truth.assertThat
+import org.junit.Test
+
+class ImportErrorMappingTest {
+    @Test
+    fun `preserves known import error codes for existing UI mapping`() {
+        val fallback = "fallback"
+
+        assertThat(safeImportErrorMessage("no_entries", fallback)).isEqualTo("no_entries")
+        assertThat(safeImportErrorMessage("no_videos", fallback)).isEqualTo("no_videos")
+        assertThat(safeImportErrorMessage("no_content", fallback)).isEqualTo("no_content")
+        assertThat(safeImportErrorMessage("invalid_format", fallback)).isEqualTo("invalid_format")
+    }
+
+    @Test
+    fun `replaces arbitrary exception messages with safe fallback`() {
+        assertThat(safeImportErrorMessage("database path and stack details", "fallback"))
+            .isEqualTo("fallback")
+        assertThat(safeImportErrorMessage(null, "fallback")).isEqualTo("fallback")
+    }
+}

From 6740e87c555560f0e06806332ad5231076dd72d8 Mon Sep 17 00:00:00 2001
From: Pasta <mhavgonzales@gmail.com>
Date: Fri, 4 Sep 2026 16:08:26 +0300
Subject: [PATCH 45/54] fix(import): skip malformed OPML feed URLs

---
 .../io/github/aedev/flow/data/local/OpmlSubscriptionParser.kt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/io/github/aedev/flow/data/local/OpmlSubscriptionParser.kt b/app/src/main/java/io/github/aedev/flow/data/local/OpmlSubscriptionParser.kt
index 6e252c3dd..8ce05cc87 100644
--- a/app/src/main/java/io/github/aedev/flow/data/local/OpmlSubscriptionParser.kt
+++ b/app/src/main/java/io/github/aedev/flow/data/local/OpmlSubscriptionParser.kt
@@ -103,7 +103,9 @@ internal object OpmlSubscriptionParser {
                 .mapNotNull { part ->
                     val key = part.substringBefore("=", missingDelimiterValue = part)
                     if (!key.equals("channel_id", ignoreCase = true)) return@mapNotNull null
-                    URLDecoder.decode(part.substringAfter("=", ""), Charsets.UTF_8.name())
+                    runCatching {
+                        URLDecoder.decode(part.substringAfter("=", ""), Charsets.UTF_8.name())
+                    }.getOrNull()
                 }.map(String::trim)
                 .firstOrNull(youtubeChannelIdRegex::matches)
         }

From 51068c126fa5f65d735ec844da6f507e1eb97685 Mon Sep 17 00:00:00 2001
From: Pasta <mhavgonzales@gmail.com>
Date: Fri, 4 Sep 2026 16:08:54 +0300
Subject: [PATCH 46/54] test(import): keep valid OPML entries after malformed
 URL

---
 .../data/local/OpmlSubscriptionParserTest.kt  | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/app/src/test/java/io/github/aedev/flow/data/local/OpmlSubscriptionParserTest.kt b/app/src/test/java/io/github/aedev/flow/data/local/OpmlSubscriptionParserTest.kt
index 1d2b761a5..c2129a946 100644
--- a/app/src/test/java/io/github/aedev/flow/data/local/OpmlSubscriptionParserTest.kt
+++ b/app/src/test/java/io/github/aedev/flow/data/local/OpmlSubscriptionParserTest.kt
@@ -105,6 +105,27 @@ class OpmlSubscriptionParserTest {
         assertThat(OpmlSubscriptionParser.parse(xml)).isEmpty()
     }
 
+    @Test
+    fun `skips malformed feed query and keeps valid outlines`() {
+        val xml =
+            """
+            <opml>
+              <body>
+                <outline text="Malformed" xmlUrl="https://www.youtube.com/feeds/videos.xml?channel_id=%ZZ" />
+                <outline text="Valid" xmlUrl="https://www.youtube.com/feeds/videos.xml?channel_id=UC1234567890123456789012" />
+              </body>
+            </opml>
+            """.trimIndent()
+
+        assertThat(OpmlSubscriptionParser.parse(xml))
+            .containsExactly(
+                OpmlSubscriptionEntry(
+                    channelId = "UC1234567890123456789012",
+                    channelName = "Valid",
+                ),
+            )
+    }
+
     @Test
     fun `rejects non xml input`() {
         assertThat(OpmlSubscriptionParser.parse("channel,name\nUC123,Example")).isEmpty()

From 171a231f5539bfd0f6f284e1815d0aebfab56254 Mon Sep 17 00:00:00 2001
From: Pasta <mhavgonzales@gmail.com>
Date: Fri, 4 Sep 2026 16:09:11 +0300
Subject: [PATCH 47/54] refactor(import): share YouTube channel avatar resolver

---
 .../local/YouTubeChannelAvatarResolver.kt     | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 app/src/main/java/io/github/aedev/flow/data/local/YouTubeChannelAvatarResolver.kt

diff --git a/app/src/main/java/io/github/aedev/flow/data/local/YouTubeChannelAvatarResolver.kt b/app/src/main/java/io/github/aedev/flow/data/local/YouTubeChannelAvatarResolver.kt
new file mode 100644
index 000000000..3281df0b3
--- /dev/null
+++ b/app/src/main/java/io/github/aedev/flow/data/local/YouTubeChannelAvatarResolver.kt
@@ -0,0 +1,32 @@
+package io.github.aedev.flow.data.local
+
+import org.schabi.newpipe.extractor.ServiceList
+import org.schabi.newpipe.extractor.channel.ChannelInfo
+
+internal fun buildYouTubeChannelUrl(channelId: String): String? {
+    val channelRef = channelId.trim()
+    if (channelRef.isEmpty()) return null
+
+    return when {
+        channelRef.startsWith("UC") && channelRef.length > 20 -> {
+            "https://www.youtube.com/channel/$channelRef"
+        }
+
+        channelRef.startsWith("@") -> {
+            "https://www.youtube.com/$channelRef"
+        }
+
+        else -> {
+            "https://www.youtube.com/@$channelRef"
+        }
+    }
+}
+
+internal fun fetchYouTubeChannelAvatar(channelId: String): String =
+    try {
+        val url = buildYouTubeChannelUrl(channelId) ?: return ""
+        val info = ChannelInfo.getInfo(ServiceList.YouTube, url)
+        info.avatars.maxByOrNull { it.height }?.url ?: ""
+    } catch (e: Exception) {
+        ""
+    }

From 53e14c6b2cad13e528ffcf6d91c15297002adea9 Mon Sep 17 00:00:00 2001
From: Pasta <mhavgonzales@gmail.com>
Date: Fri, 4 Sep 2026 16:09:33 +0300
Subject: [PATCH 48/54] refactor(import): reuse shared avatar resolver for OPML

---
 .../flow/data/local/OpmlSubscriptionImporter.kt     | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/app/src/main/java/io/github/aedev/flow/data/local/OpmlSubscriptionImporter.kt b/app/src/main/java/io/github/aedev/flow/data/local/OpmlSubscriptionImporter.kt
index 7503b4d5f..008451bdf 100644
--- a/app/src/main/java/io/github/aedev/flow/data/local/OpmlSubscriptionImporter.kt
+++ b/app/src/main/java/io/github/aedev/flow/data/local/OpmlSubscriptionImporter.kt
@@ -12,8 +12,6 @@ import kotlinx.coroutines.supervisorScope
 import kotlinx.coroutines.sync.Semaphore
 import kotlinx.coroutines.sync.withPermit
 import kotlinx.coroutines.withContext
-import org.schabi.newpipe.extractor.ServiceList
-import org.schabi.newpipe.extractor.channel.ChannelInfo
 import java.util.concurrent.atomic.AtomicInteger
 import javax.inject.Inject
 
@@ -59,7 +57,7 @@ class OpmlSubscriptionImporter
                     val subscriptions =
                         enrichOpmlSubscriptionAvatars(
                             subscriptions = missingSubscriptions,
-                            avatarFetcher = ::fetchYoutubeChannelAvatar,
+                            avatarFetcher = ::fetchYouTubeChannelAvatar,
                             onProgress = onProgress,
                         )
                     subscriptionRepository.subscribeAll(subscriptions)
@@ -78,15 +76,6 @@ class OpmlSubscriptionImporter
                     Result.failure(e)
                 }
             }
-
-        private fun fetchYoutubeChannelAvatar(channelId: String): String =
-            try {
-                val url = "https://www.youtube.com/channel/$channelId"
-                val info = ChannelInfo.getInfo(ServiceList.YouTube, url)
-                info.avatars.maxByOrNull { it.height }?.url ?: ""
-            } catch (e: Exception) {
-                ""
-            }
     }
 
 internal fun buildMissingOpmlSubscriptions(

From 5b3d9601e49b692629f945074daf70ce15739e7d Mon Sep 17 00:00:00 2001
From: Pasta <mhavgonzales@gmail.com>
Date: Fri, 4 Sep 2026 16:10:52 +0300
Subject: [PATCH 49/54] fix(import): restore precise OPML error messages

---
 .../aedev/flow/ui/screens/settings/ImportViewModel.kt       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/io/github/aedev/flow/ui/screens/settings/ImportViewModel.kt b/app/src/main/java/io/github/aedev/flow/ui/screens/settings/ImportViewModel.kt
index 456b36887..9a70651d6 100644
--- a/app/src/main/java/io/github/aedev/flow/ui/screens/settings/ImportViewModel.kt
+++ b/app/src/main/java/io/github/aedev/flow/ui/screens/settings/ImportViewModel.kt
@@ -126,7 +126,7 @@ class ImportViewModel
 
         fun importOpmlSubscriptions(uri: Uri) {
             if (isRunning) return
-            val label = context.getString(R.string.import_label_youtube_subscriptions)
+            val label = context.getString(R.string.import_subscriptions_xml_title)
             viewModelScope.launch {
                 startProgress(label, 0, 0)
                 val result =
@@ -346,11 +346,11 @@ class ImportViewModel
             val message =
                 when (error) {
                     OpmlImportException.UnreadableFile -> {
-                        context.getString(R.string.import_invalid_format)
+                        context.getString(R.string.import_subscriptions_xml_read_error)
                     }
 
                     OpmlImportException.NoSubscriptions -> {
-                        context.getString(R.string.import_no_content)
+                        context.getString(R.string.import_subscriptions_xml_no_entries)
                     }
 
                     else -> {

From 04a730dfba3450a20b0a1f1b80f0c5b21a9cea1e Mon Sep 17 00:00:00 2001
From: Pasta <mhavgonzales@gmail.com>
Date: Fri, 4 Sep 2026 16:11:21 +0300
Subject: [PATCH 50/54] fix(tv): label OPML import precisely

---
 .../io/github/aedev/flow/ui/tv/screens/TvImportDataScreen.kt  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/io/github/aedev/flow/ui/tv/screens/TvImportDataScreen.kt b/app/src/main/java/io/github/aedev/flow/ui/tv/screens/TvImportDataScreen.kt
index 2680f7968..4e93f08f7 100644
--- a/app/src/main/java/io/github/aedev/flow/ui/tv/screens/TvImportDataScreen.kt
+++ b/app/src/main/java/io/github/aedev/flow/ui/tv/screens/TvImportDataScreen.kt
@@ -114,8 +114,8 @@ fun TvImportDataScreen(
                     onClick = { masterBackupLauncher.launch(zipMimeTypes) },
                 )
                 TvSelectionRow(
-                    label = stringResource(R.string.import_label_youtube_subscriptions),
-                    supportingText = stringResource(R.string.import_other_youtube_clients),
+                    label = stringResource(R.string.import_subscriptions_xml_title),
+                    supportingText = stringResource(R.string.import_subscriptions_xml_desc),
                     selected = false,
                     onClick = { opmlLauncher.launch(xmlMimeTypes) },
                 )

From f18f413bbd013450bdeaa912af6c00500f8b322d Mon Sep 17 00:00:00 2001
From: Pasta <mhavgonzales@gmail.com>
Date: Fri, 4 Sep 2026 16:13:28 +0300
Subject: [PATCH 51/54] test(import): cover shared channel avatar URL resolver

---
 .../local/YouTubeChannelAvatarResolverTest.kt | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 app/src/test/java/io/github/aedev/flow/data/local/YouTubeChannelAvatarResolverTest.kt

diff --git a/app/src/test/java/io/github/aedev/flow/data/local/YouTubeChannelAvatarResolverTest.kt b/app/src/test/java/io/github/aedev/flow/data/local/YouTubeChannelAvatarResolverTest.kt
new file mode 100644
index 000000000..b36bc95cb
--- /dev/null
+++ b/app/src/test/java/io/github/aedev/flow/data/local/YouTubeChannelAvatarResolverTest.kt
@@ -0,0 +1,21 @@
+package io.github.aedev.flow.data.local
+
+import com.google.common.truth.Truth.assertThat
+import org.junit.Test
+
+class YouTubeChannelAvatarResolverTest {
+    @Test
+    fun `builds channel url for canonical id and handle`() {
+        assertThat(buildYouTubeChannelUrl("UC1234567890123456789012"))
+            .isEqualTo("https://www.youtube.com/channel/UC1234567890123456789012")
+        assertThat(buildYouTubeChannelUrl("creator"))
+            .isEqualTo("https://www.youtube.com/@creator")
+        assertThat(buildYouTubeChannelUrl("@creator"))
+            .isEqualTo("https://www.youtube.com/@creator")
+    }
+
+    @Test
+    fun `rejects blank channel reference`() {
+        assertThat(buildYouTubeChannelUrl("   ")).isNull()
+    }
+}

From a4064c671e6e73d29a47db67384b16edb222def0 Mon Sep 17 00:00:00 2001
From: Pasta <mhavgonzales@gmail.com>
Date: Fri, 4 Sep 2026 16:21:44 +0300
Subject: [PATCH 52/54] fix(import): restore OPML strings in default resources

---
 app/src/main/res/values/strings.xml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index eb1e88e5f..c77837511 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -966,8 +966,8 @@
     <string name="player_settings_shorts_playback_mode_dialog_title">Shorts Playback Mode</string>
     <string name="player_settings_shorts_playback_mode_dialog_body">Choose how Shorts should behave when the current short finishes playing:</string>
     <plurals name="player_settings_shorts_auto_scroll_seconds_template">
-        <item quantity="one">%1$d second</item>
-        <item quantity="other">%1$d seconds</item>
+        <item quantity="one">Auto-scroll every %1$d second</item>
+        <item quantity="other">Auto-scroll every %1$d seconds</item>
     </plurals>
     <string name="player_settings_autoplay">Autoplay related videos</string>
     <string name="player_settings_autoplay_subtitle">When nothing is queued, automatically play a suggested video next</string>
@@ -1321,6 +1321,10 @@
     <string name="import_youtube_failed_template">Failed to import YouTube backup: %1$s</string>
     <string name="import_flow_backup_item_title">Import Flow Backup</string>
     <string name="import_flow_backup_desc">Restore your history, settings, and subscriptions from a Flow backup file.</string>
+    <string name="import_subscriptions_xml_title">Import subscriptions XML/OPML</string>
+    <string name="import_subscriptions_xml_desc">Import YouTube subscriptions from an OPML or XML feed export.</string>
+    <string name="import_subscriptions_xml_read_error">Could not read the selected XML/OPML file.</string>
+    <string name="import_subscriptions_xml_no_entries">No YouTube subscriptions were found in this XML/OPML file.</string>
     <string name="import_from_newpipe">Import from NewPipe</string>
     <string name="import_from_newpipe_desc">Import subscriptions from a NewPipe export file (JSON).</string>
     <string name="import_from_libretube">Import from LibreTube</string>

From 53be8c5624038de9eb334d961188e1d3da1e811d Mon Sep 17 00:00:00 2001
From: Pasta <mhavgonzales@gmail.com>
Date: Fri, 4 Sep 2026 17:13:41 +0300
Subject: [PATCH 53/54] refactor(import): share YouTube avatar resolver

---
 .../aedev/flow/data/local/BackupRepository.kt   | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/app/src/main/java/io/github/aedev/flow/data/local/BackupRepository.kt b/app/src/main/java/io/github/aedev/flow/data/local/BackupRepository.kt
index 60145f326..6b9be2de2 100644
--- a/app/src/main/java/io/github/aedev/flow/data/local/BackupRepository.kt
+++ b/app/src/main/java/io/github/aedev/flow/data/local/BackupRepository.kt
@@ -30,8 +30,6 @@ import kotlinx.coroutines.sync.Semaphore
 import kotlinx.coroutines.sync.withPermit
 import kotlinx.coroutines.withContext
 import org.schabi.newpipe.extractor.NewPipe
-import org.schabi.newpipe.extractor.ServiceList
-import org.schabi.newpipe.extractor.channel.ChannelInfo
 import java.io.BufferedReader
 import java.io.ByteArrayOutputStream
 import java.io.InputStreamReader
@@ -2281,18 +2279,5 @@ class BackupRepository(
             }
         }
 
-    // Helper to fetch channel avatar using NewPipe
-    private fun fetchChannelAvatar(channelId: String): String =
-        try {
-            val url =
-                if (channelId.startsWith("UC") && channelId.length > 20) {
-                    "https://www.youtube.com/channel/$channelId"
-                } else {
-                    "https://www.youtube.com/@$channelId"
-                }
-            val info = ChannelInfo.getInfo(ServiceList.YouTube, url)
-            info.avatars.maxByOrNull { it.height }?.url ?: ""
-        } catch (e: Exception) {
-            ""
-        }
+    private fun fetchChannelAvatar(channelId: String): String = fetchYouTubeChannelAvatar(channelId)
 }

From 02c544695da86e9f2a755e754605beb5fe91cc9c Mon Sep 17 00:00:00 2001
From: Pasta <mhavgonzales@gmail.com>
Date: Fri, 4 Sep 2026 17:21:43 +0300
Subject: [PATCH 54/54] fix(import): keep OPML strings scoped and precise

---
 app/src/main/res/values/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c77837511..54f346d20 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -966,8 +966,8 @@
     <string name="player_settings_shorts_playback_mode_dialog_title">Shorts Playback Mode</string>
     <string name="player_settings_shorts_playback_mode_dialog_body">Choose how Shorts should behave when the current short finishes playing:</string>
     <plurals name="player_settings_shorts_auto_scroll_seconds_template">
-        <item quantity="one">Auto-scroll every %1$d second</item>
-        <item quantity="other">Auto-scroll every %1$d seconds</item>
+        <item quantity="one">%1$d second</item>
+        <item quantity="other">%1$d seconds</item>
     </plurals>
     <string name="player_settings_autoplay">Autoplay related videos</string>
     <string name="player_settings_autoplay_subtitle">When nothing is queued, automatically play a suggested video next</string>