From b7260b41b13cba7223c5cb4669787053a66a68f1 Mon Sep 17 00:00:00 2001 From: cranci1 <100066266+cranci1@users.noreply.github.com> Date: Tue, 4 Mar 2025 09:34:04 +0100 Subject: [PATCH] crash fixes --- Sora/Utils/MediaPlayer/VideoPlayer.swift | 10 ++++++---- Sora/Views/MediaInfoView/MediaInfoView.swift | 2 +- .../project.xcworkspace/contents.xcworkspacedata | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Sora/Utils/MediaPlayer/VideoPlayer.swift b/Sora/Utils/MediaPlayer/VideoPlayer.swift index 48ac5227..aede1b09 100644 --- a/Sora/Utils/MediaPlayer/VideoPlayer.swift +++ b/Sora/Utils/MediaPlayer/VideoPlayer.swift @@ -47,17 +47,19 @@ class VideoPlayerViewController: UIViewController { let playerItem = AVPlayerItem(asset: asset) player = AVPlayer(playerItem: playerItem) + playerViewController = NormalPlayer() playerViewController?.player = player - addPeriodicTimeObserver(fullURL: fullUrl) if let playerViewController = playerViewController { - playerViewController.view.frame = self.view.frame - self.view.addSubview(playerViewController.view) - self.addChild(playerViewController) + addChild(playerViewController) + playerViewController.view.frame = view.bounds + playerViewController.view.autoresizingMask = [.flexibleWidth, .flexibleHeight] + view.addSubview(playerViewController.view) playerViewController.didMove(toParent: self) } + addPeriodicTimeObserver(fullURL: fullUrl) let lastPlayedTime = UserDefaults.standard.double(forKey: "lastPlayedTime_\(fullUrl)") if lastPlayedTime > 0 { let seekTime = CMTime(seconds: lastPlayedTime, preferredTimescale: 1) diff --git a/Sora/Views/MediaInfoView/MediaInfoView.swift b/Sora/Views/MediaInfoView/MediaInfoView.swift index a1dca9c5..646847e0 100644 --- a/Sora/Views/MediaInfoView/MediaInfoView.swift +++ b/Sora/Views/MediaInfoView/MediaInfoView.swift @@ -561,7 +561,7 @@ struct MediaInfoView: View { } private func openSafariViewController(with urlString: String) { - guard let url = URL(string: urlString) else { + guard let url = URL(string: urlString), UIApplication.shared.canOpenURL(url) else { Logger.shared.log("Unable to open the webpage", type: "Error") return } diff --git a/Sulfur.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/Sulfur.xcodeproj/project.xcworkspace/contents.xcworkspacedata index 0d7c8e4c..919434a6 100644 --- a/Sulfur.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ b/Sulfur.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -2,6 +2,6 @@ + location = "self:">