From 3c04b8540f8a1248c4bd4740bfe730cf778bd1c0 Mon Sep 17 00:00:00 2001
From: Arkadiusz Fal <arek@arekf.net>
Date: Fri, 27 Mar 2026 17:52:08 +0100
Subject: [PATCH] Fix 5 TestFlight crash types from builds 250-254

- Fix BGTaskScheduler assertion crash on Mac Catalyst by guarding all
  iOS background task APIs with isMacCatalystApp check
- Fix iPad popover crash in UIPopoverPresentationController by adding
  .presentationCompactAdaptation(.sheet) to all 27 confirmationDialogs
- Fix SwiftData assertion crash when accessing deleted Bookmark model
  properties during SwiftUI hit testing in BookmarkRowView
- Fix UICollectionView invalid item count crash on queue swipe-to-delete
  by using ID-based removal with withAnimation instead of stale index
- Fix Range crash in storyboard download when storyboardCount is zero
---
 .../BackgroundRefreshManager.swift                |  4 ++++
 .../Downloads/DownloadManager+Assets.swift        |  2 +-
 Yattee/Services/Player/PlayerState.swift          |  5 +++++
 Yattee/Services/Player/QueueManager.swift         |  5 +++++
 Yattee/Views/Channel/ChannelView.swift            |  2 ++
 Yattee/Views/Components/BookmarkRowView.swift     | 15 ++++++++++++++-
 Yattee/Views/Downloads/DownloadsStorageView.swift |  2 ++
 Yattee/Views/Home/HistoryListView.swift           |  1 +
 Yattee/Views/MediaBrowser/MediaSourcesView.swift  |  1 +
 Yattee/Views/Player/QueueManagementSheet.swift    |  4 +++-
 .../Playlist/UnifiedPlaylistDetailView.swift      |  1 +
 Yattee/Views/Search/SearchView.swift              |  1 +
 .../Settings/AddSource/AddRemoteServerView.swift  |  2 ++
 Yattee/Views/Settings/AdvancedSettingsView.swift  |  2 ++
 Yattee/Views/Settings/DeveloperSettingsView.swift |  2 ++
 Yattee/Views/Settings/EditSourceView.swift        |  3 +++
 Yattee/Views/Settings/ImportPlaylistsView.swift   |  2 ++
 .../Views/Settings/ImportSubscriptionsView.swift  |  1 +
 .../Views/Settings/MPVOptionsSettingsView.swift   |  1 +
 Yattee/Views/Settings/SourcesListView.swift       |  1 +
 .../Settings/SubscriptionsSettingsView.swift      |  1 +
 Yattee/Views/Settings/iCloudSettingsView.swift    |  4 ++++
 22 files changed, 59 insertions(+), 3 deletions(-)

diff --git a/Yattee/Services/BackgroundRefresh/BackgroundRefreshManager.swift b/Yattee/Services/BackgroundRefresh/BackgroundRefreshManager.swift
index d455fac4..c071df40 100644
--- a/Yattee/Services/BackgroundRefresh/BackgroundRefreshManager.swift
+++ b/Yattee/Services/BackgroundRefresh/BackgroundRefreshManager.swift
@@ -43,6 +43,7 @@ final class BackgroundRefreshManager {
 
     func registerBackgroundTasks() {
         #if os(iOS)
+        guard !ProcessInfo.processInfo.isMacCatalystApp else { return }
         registerIOSBackgroundTask()
         #elseif os(macOS)
         registerMacOSBackgroundActivity()
@@ -64,6 +65,7 @@ final class BackgroundRefreshManager {
     }
 
     func scheduleIOSBackgroundRefresh() {
+        guard !ProcessInfo.processInfo.isMacCatalystApp else { return }
         let request = BGAppRefreshTaskRequest(identifier: Self.backgroundTaskIdentifier)
         // Request to run in ~15 minutes (system decides actual timing)
         request.earliestBeginDate = Date(timeIntervalSinceNow: 15 * 60)
@@ -77,6 +79,7 @@ final class BackgroundRefreshManager {
     }
 
     func cancelIOSBackgroundRefresh() {
+        guard !ProcessInfo.processInfo.isMacCatalystApp else { return }
         BGTaskScheduler.shared.cancel(taskRequestWithIdentifier: Self.backgroundTaskIdentifier)
         LoggingService.shared.debug("Cancelled iOS background refresh", category: .notifications)
     }
@@ -156,6 +159,7 @@ final class BackgroundRefreshManager {
 
     func handleNotificationsEnabledChanged(_ enabled: Bool) {
         #if os(iOS)
+        guard !ProcessInfo.processInfo.isMacCatalystApp else { return }
         if enabled {
             scheduleIOSBackgroundRefresh()
         } else {
diff --git a/Yattee/Services/Downloads/DownloadManager+Assets.swift b/Yattee/Services/Downloads/DownloadManager+Assets.swift
index 767b4ed1..445695dc 100644
--- a/Yattee/Services/Downloads/DownloadManager+Assets.swift
+++ b/Yattee/Services/Downloads/DownloadManager+Assets.swift
@@ -74,7 +74,7 @@ extension DownloadManager {
             }
 
             // If VTT parsing failed, fall back to direct URLs (may not work if blocked)
-            if imageURLs.isEmpty {
+            if imageURLs.isEmpty, storyboard.storyboardCount > 0 {
                 for sheetIndex in 0..<storyboard.storyboardCount {
                     if let url = storyboard.directSheetURL(for: sheetIndex) {
                         imageURLs.append(url)
diff --git a/Yattee/Services/Player/PlayerState.swift b/Yattee/Services/Player/PlayerState.swift
index 25b12e88..3cb9ab6a 100644
--- a/Yattee/Services/Player/PlayerState.swift
+++ b/Yattee/Services/Player/PlayerState.swift
@@ -539,6 +539,11 @@ final class PlayerState {
         queue.remove(at: index)
     }
 
+    /// Removes a video from the queue by its ID.
+    func removeFromQueue(id: QueuedVideo.ID) {
+        queue.removeAll { $0.id == id }
+    }
+
     /// Updates a queue item with preloaded video details and streams.
     /// Preserves the item's ID for stable SwiftUI identity.
     func updateQueueItemWithPreload(at index: Int, video: Video, stream: Stream?, audioStream: Stream?) {
diff --git a/Yattee/Services/Player/QueueManager.swift b/Yattee/Services/Player/QueueManager.swift
index d444a71f..7a5f78ea 100644
--- a/Yattee/Services/Player/QueueManager.swift
+++ b/Yattee/Services/Player/QueueManager.swift
@@ -122,6 +122,11 @@ final class QueueManager {
         playerState?.removeFromQueue(at: index)
     }
 
+    /// Removes a video from the queue by its ID.
+    func removeFromQueue(id: QueuedVideo.ID) {
+        playerState?.removeFromQueue(id: id)
+    }
+
     /// Moves a queue item from one position to another.
     func moveQueueItem(from sourceIndex: Int, to destinationIndex: Int) {
         playerState?.moveQueueItem(from: sourceIndex, to: destinationIndex)
diff --git a/Yattee/Views/Channel/ChannelView.swift b/Yattee/Views/Channel/ChannelView.swift
index c9d37a03..2c235ee8 100644
--- a/Yattee/Views/Channel/ChannelView.swift
+++ b/Yattee/Views/Channel/ChannelView.swift
@@ -368,6 +368,7 @@ struct ChannelView: View {
         } message: {
             Text(String(localized: "channel.unsubscribe.confirmation.message"))
         }
+        .presentationCompactAdaptation(.sheet)
     }
 
     // MARK: - Loading Content
@@ -475,6 +476,7 @@ struct ChannelView: View {
         } message: {
             Text(String(localized: "channel.unsubscribe.confirmation.message"))
         }
+        .presentationCompactAdaptation(.sheet)
     }
 
     // MARK: - Header
diff --git a/Yattee/Views/Components/BookmarkRowView.swift b/Yattee/Views/Components/BookmarkRowView.swift
index 24e299a6..aaf99ec9 100644
--- a/Yattee/Views/Components/BookmarkRowView.swift
+++ b/Yattee/Views/Components/BookmarkRowView.swift
@@ -5,6 +5,7 @@
 //  Row view for displaying bookmarked videos with tags and notes.
 //
 
+import SwiftData
 import SwiftUI
 
 /// Row view for displaying bookmarked videos.
@@ -30,15 +31,21 @@ struct BookmarkRowView: View {
         appEnvironment?.settingsManager.accentColor.color ?? .accentColor
     }
 
+    private var isBookmarkValid: Bool {
+        bookmark.modelContext != nil && !bookmark.isDeleted
+    }
+
     private var video: Video {
         bookmark.toVideo()
     }
 
     private var hasTags: Bool {
-        !bookmark.tags.isEmpty
+        guard isBookmarkValid else { return false }
+        return !bookmark.tags.isEmpty
     }
 
     private var hasNote: Bool {
+        guard isBookmarkValid else { return false }
         if let note = bookmark.note, !note.isEmpty {
             return true
         }
@@ -56,6 +63,12 @@ struct BookmarkRowView: View {
     }
 
     var body: some View {
+        if isBookmarkValid {
+            content
+        }
+    }
+
+    private var content: some View {
         VStack(alignment: .leading, spacing: 0) {
             // Video row content
             videoRowContent
diff --git a/Yattee/Views/Downloads/DownloadsStorageView.swift b/Yattee/Views/Downloads/DownloadsStorageView.swift
index b6ebed9b..09aa5fcc 100644
--- a/Yattee/Views/Downloads/DownloadsStorageView.swift
+++ b/Yattee/Views/Downloads/DownloadsStorageView.swift
@@ -87,6 +87,7 @@ struct DownloadsStorageView: View {
         } message: {
             Text("settings.downloads.storage.deleteWatched.message \(watchedDownloads.count) \(formatBytes(watchedDownloadsSize))")
         }
+        .presentationCompactAdaptation(.sheet)
         .confirmationDialog(
             String(localized: "settings.downloads.storage.deleteAll"),
             isPresented: $showingDeleteAllConfirmation,
@@ -101,6 +102,7 @@ struct DownloadsStorageView: View {
         } message: {
             Text("settings.downloads.storage.deleteAll.message \(completedDownloads.count) \(formatBytes(allDownloadsSize))")
         }
+        .presentationCompactAdaptation(.sheet)
     }
 
     // MARK: - Delete Menu
diff --git a/Yattee/Views/Home/HistoryListView.swift b/Yattee/Views/Home/HistoryListView.swift
index 3f3eba17..3da900c4 100644
--- a/Yattee/Views/Home/HistoryListView.swift
+++ b/Yattee/Views/Home/HistoryListView.swift
@@ -192,6 +192,7 @@ struct HistoryListView: View {
                 selectedClearOption = nil
             }
         }
+        .presentationCompactAdaptation(.sheet)
         .onAppear {
             loadHistory()
         }
diff --git a/Yattee/Views/MediaBrowser/MediaSourcesView.swift b/Yattee/Views/MediaBrowser/MediaSourcesView.swift
index bbda6e92..50963fa5 100644
--- a/Yattee/Views/MediaBrowser/MediaSourcesView.swift
+++ b/Yattee/Views/MediaBrowser/MediaSourcesView.swift
@@ -91,6 +91,7 @@ struct MediaSourcesView: View {
                 pendingDeleteSource = nil
             }
         }
+        .presentationCompactAdaptation(.sheet)
     }
 
     // MARK: - Private
diff --git a/Yattee/Views/Player/QueueManagementSheet.swift b/Yattee/Views/Player/QueueManagementSheet.swift
index 02294d93..e6920e66 100644
--- a/Yattee/Views/Player/QueueManagementSheet.swift
+++ b/Yattee/Views/Player/QueueManagementSheet.swift
@@ -135,7 +135,9 @@ struct QueueManagementSheet: View {
                                 index: index + 1, // +1 because "Now Playing" is shown as position 1
                                 isCurrentlyPlaying: false,
                                 onRemove: {
-                                    queueManager?.removeFromQueue(at: index)
+                                    withAnimation {
+                                        queueManager?.removeFromQueue(id: queuedVideo.id)
+                                    }
                                 },
                                 onTap: {
                                     playVideo(at: index)
diff --git a/Yattee/Views/Playlist/UnifiedPlaylistDetailView.swift b/Yattee/Views/Playlist/UnifiedPlaylistDetailView.swift
index 73b49fd6..753b5a69 100644
--- a/Yattee/Views/Playlist/UnifiedPlaylistDetailView.swift
+++ b/Yattee/Views/Playlist/UnifiedPlaylistDetailView.swift
@@ -173,6 +173,7 @@ struct UnifiedPlaylistDetailView: View {
                 }
             }
         }
+        .presentationCompactAdaptation(.sheet)
         .task {
             await loadPlaylist()
         }
diff --git a/Yattee/Views/Search/SearchView.swift b/Yattee/Views/Search/SearchView.swift
index 83e223a4..de46ff3a 100644
--- a/Yattee/Views/Search/SearchView.swift
+++ b/Yattee/Views/Search/SearchView.swift
@@ -615,6 +615,7 @@ struct SearchView: View {
                     }
                     Button(String(localized: "common.cancel"), role: .cancel) {}
                 }
+                .presentationCompactAdaptation(.sheet)
             }
         }
     }
diff --git a/Yattee/Views/Settings/AddSource/AddRemoteServerView.swift b/Yattee/Views/Settings/AddSource/AddRemoteServerView.swift
index fe6801ad..69fed3b6 100644
--- a/Yattee/Views/Settings/AddSource/AddRemoteServerView.swift
+++ b/Yattee/Views/Settings/AddSource/AddRemoteServerView.swift
@@ -103,6 +103,7 @@ struct AddRemoteServerView: View {
         } message: {
             Text(String(localized: "sources.yatteeServer.warning.message"))
         }
+        .presentationCompactAdaptation(.sheet)
         #else
         formContent
             .navigationTitle(String(localized: "sources.addRemoteServer"))
@@ -118,6 +119,7 @@ struct AddRemoteServerView: View {
             } message: {
                 Text(String(localized: "sources.yatteeServer.warning.message"))
             }
+            .presentationCompactAdaptation(.sheet)
         #endif
     }
 
diff --git a/Yattee/Views/Settings/AdvancedSettingsView.swift b/Yattee/Views/Settings/AdvancedSettingsView.swift
index a471fa34..34c3ac16 100644
--- a/Yattee/Views/Settings/AdvancedSettingsView.swift
+++ b/Yattee/Views/Settings/AdvancedSettingsView.swift
@@ -49,6 +49,7 @@ struct AdvancedSettingsView: View {
             }
             Button(String(localized: "common.cancel"), role: .cancel) {}
         }
+        .presentationCompactAdaptation(.sheet)
         .onAppear {
             userAgentText = settingsManager.customUserAgent
             #if !os(tvOS)
@@ -68,6 +69,7 @@ struct AdvancedSettingsView: View {
         } message: {
             Text(String(localized: "settings.advanced.storage.deleteOrphaned.message \(orphanedFilesCount) \(formatBytes(orphanedFilesSize))"))
         }
+        .presentationCompactAdaptation(.sheet)
         .alert(
             String(localized: "settings.advanced.storage.cleanupComplete"),
             isPresented: $showingOrphanCleanupResult
diff --git a/Yattee/Views/Settings/DeveloperSettingsView.swift b/Yattee/Views/Settings/DeveloperSettingsView.swift
index 81206544..c302e54b 100644
--- a/Yattee/Views/Settings/DeveloperSettingsView.swift
+++ b/Yattee/Views/Settings/DeveloperSettingsView.swift
@@ -45,6 +45,7 @@ struct DeveloperSettingsView: View {
         } message: {
             Text(String(localized: "settings.advanced.data.removeDuplicates.message"))
         }
+        .presentationCompactAdaptation(.sheet)
         .alert(
             String(localized: "settings.advanced.data.deduplicationComplete"),
             isPresented: $showingDeduplicationResult
@@ -71,6 +72,7 @@ struct DeveloperSettingsView: View {
         } message: {
             Text(String(localized: "settings.advanced.data.resetICloud.message"))
         }
+        .presentationCompactAdaptation(.sheet)
         .alert(
             String(localized: "settings.advanced.data.iCloudReset"),
             isPresented: $showingResetiCloudComplete
diff --git a/Yattee/Views/Settings/EditSourceView.swift b/Yattee/Views/Settings/EditSourceView.swift
index ddde68f6..67d4a1a4 100644
--- a/Yattee/Views/Settings/EditSourceView.swift
+++ b/Yattee/Views/Settings/EditSourceView.swift
@@ -334,6 +334,7 @@ private struct EditRemoteServerContent: View {
             }
             Button(String(localized: "common.cancel"), role: .cancel) {}
         }
+        .presentationCompactAdaptation(.sheet)
         .sheet(isPresented: $showLoginSheet) {
             InstanceLoginView(instance: instance) { credential in
                 appEnvironment?.credentialsManager(for: instance)?.setCredential(credential, for: instance)
@@ -366,6 +367,7 @@ private struct EditRemoteServerContent: View {
         } message: {
             Text(String(localized: "sources.yatteeServer.warning.message"))
         }
+        .presentationCompactAdaptation(.sheet)
     }
 
     // MARK: - Computed Properties
@@ -733,6 +735,7 @@ private struct EditFileSourceContent: View {
             }
             Button(String(localized: "common.cancel"), role: .cancel) {}
         }
+        .presentationCompactAdaptation(.sheet)
     }
 
     @ViewBuilder
diff --git a/Yattee/Views/Settings/ImportPlaylistsView.swift b/Yattee/Views/Settings/ImportPlaylistsView.swift
index 7bcb544a..c39abe67 100644
--- a/Yattee/Views/Settings/ImportPlaylistsView.swift
+++ b/Yattee/Views/Settings/ImportPlaylistsView.swift
@@ -77,6 +77,7 @@ struct ImportPlaylistsView: View {
                     Task { await addAllPlaylists() }
                 }
             }
+            .presentationCompactAdaptation(.sheet)
             .confirmationDialog(
                 String(localized: "import.playlists.mergeWarning.title"),
                 isPresented: $showMergeWarning,
@@ -97,6 +98,7 @@ struct ImportPlaylistsView: View {
                     Text(String(localized: "import.playlists.mergeWarning.message \(playlist.title)"))
                 }
             }
+            .presentationCompactAdaptation(.sheet)
             .task {
                 await loadPlaylists()
             }
diff --git a/Yattee/Views/Settings/ImportSubscriptionsView.swift b/Yattee/Views/Settings/ImportSubscriptionsView.swift
index ad6c0ad5..b77fd2e4 100644
--- a/Yattee/Views/Settings/ImportSubscriptionsView.swift
+++ b/Yattee/Views/Settings/ImportSubscriptionsView.swift
@@ -68,6 +68,7 @@ struct ImportSubscriptionsView: View {
                     addAllSubscriptions()
                 }
             }
+            .presentationCompactAdaptation(.sheet)
             .task {
                 await loadSubscriptions()
             }
diff --git a/Yattee/Views/Settings/MPVOptionsSettingsView.swift b/Yattee/Views/Settings/MPVOptionsSettingsView.swift
index 96c2e779..d9676f7d 100644
--- a/Yattee/Views/Settings/MPVOptionsSettingsView.swift
+++ b/Yattee/Views/Settings/MPVOptionsSettingsView.swift
@@ -318,6 +318,7 @@ private struct EditMPVOptionSheet: View {
                 }
                 Button(String(localized: "common.cancel"), role: .cancel) {}
             }
+            .presentationCompactAdaptation(.sheet)
         }
         #if os(macOS)
         .frame(minWidth: 400, minHeight: 200)
diff --git a/Yattee/Views/Settings/SourcesListView.swift b/Yattee/Views/Settings/SourcesListView.swift
index a1e7b657..addc5d97 100644
--- a/Yattee/Views/Settings/SourcesListView.swift
+++ b/Yattee/Views/Settings/SourcesListView.swift
@@ -75,6 +75,7 @@ struct SourcesListView: View {
                 pendingDeleteSource = nil
             }
         }
+        .presentationCompactAdaptation(.sheet)
     }
 
     // MARK: - Empty State
diff --git a/Yattee/Views/Settings/SubscriptionsSettingsView.swift b/Yattee/Views/Settings/SubscriptionsSettingsView.swift
index 4e04972c..7f7118a2 100644
--- a/Yattee/Views/Settings/SubscriptionsSettingsView.swift
+++ b/Yattee/Views/Settings/SubscriptionsSettingsView.swift
@@ -111,6 +111,7 @@ struct SubscriptionsSettingsView: View {
         } message: {
             Text(String(localized: "settings.subscriptions.account.switch.message"))
         }
+        .presentationCompactAdaptation(.sheet)
     }
 
     // MARK: - Account Section
diff --git a/Yattee/Views/Settings/iCloudSettingsView.swift b/Yattee/Views/Settings/iCloudSettingsView.swift
index 65c2bebc..e842a8da 100644
--- a/Yattee/Views/Settings/iCloudSettingsView.swift
+++ b/Yattee/Views/Settings/iCloudSettingsView.swift
@@ -101,6 +101,7 @@ struct iCloudSettingsView: View {
         } message: {
             Text(String(localized: "settings.icloud.enable.confirmation.message"))
         }
+        .presentationCompactAdaptation(.sheet)
         .confirmationDialog(
             String(localized: "settings.icloud.disable.confirmation.title"),
             isPresented: $showingDisableConfirmation,
@@ -113,6 +114,7 @@ struct iCloudSettingsView: View {
         } message: {
             Text(String(localized: "settings.icloud.disable.confirmation.message"))
         }
+        .presentationCompactAdaptation(.sheet)
         // Confirmation for categories that replace local data (instances, settings, media sources)
         .confirmationDialog(
             String(localized: "settings.icloud.category.enable.title"),
@@ -134,6 +136,7 @@ struct iCloudSettingsView: View {
         } message: {
             Text(String(localized: "settings.icloud.category.enable.message"))
         }
+        .presentationCompactAdaptation(.sheet)
         // Confirmation for categories that upload/merge local data (subscriptions, bookmarks, playlists, history)
         .confirmationDialog(
             String(localized: "settings.icloud.category.sync.title"),
@@ -155,6 +158,7 @@ struct iCloudSettingsView: View {
         } message: {
             Text(String(localized: "settings.icloud.category.sync.message"))
         }
+        .presentationCompactAdaptation(.sheet)
     }
 
     // MARK: - Sync Categories Section