diff --git a/JellyfinPlayer.xcodeproj/project.pbxproj b/JellyfinPlayer.xcodeproj/project.pbxproj index 59089512..8062048a 100644 --- a/JellyfinPlayer.xcodeproj/project.pbxproj +++ b/JellyfinPlayer.xcodeproj/project.pbxproj @@ -7,7 +7,6 @@ objects = { /* Begin PBXBuildFile section */ - 5302F82A2658791C00647A2E /* Sentry in Frameworks */ = {isa = PBXBuildFile; productRef = 5302F8292658791C00647A2E /* Sentry */; }; 53192D5D265AA78A008A4215 /* DeviceProfileBuilder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 53192D5C265AA78A008A4215 /* DeviceProfileBuilder.swift */; }; 53313B90265EEA6D00947AA3 /* VideoPlayer.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 53313B8F265EEA6D00947AA3 /* VideoPlayer.storyboard */; }; 53352571265EA0A0006CCA86 /* Introspect in Frameworks */ = {isa = PBXBuildFile; productRef = 53352570265EA0A0006CCA86 /* Introspect */; }; @@ -139,7 +138,6 @@ 5338F754263B65E10014BF09 /* SwiftyRequest in Frameworks */, 53352571265EA0A0006CCA86 /* Introspect in Frameworks */, 621C638026672A30004216EA /* NukeUI in Frameworks */, - 5302F82A2658791C00647A2E /* Sentry in Frameworks */, 5389277A263CBFE70035E14B /* SwiftyJSON in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -298,7 +296,6 @@ 5338F753263B65E10014BF09 /* SwiftyRequest */, 5338F756263B7E2E0014BF09 /* KeychainSwift */, 53892779263CBFE70035E14B /* SwiftyJSON */, - 5302F8292658791C00647A2E /* Sentry */, 53352570265EA0A0006CCA86 /* Introspect */, 6273DD42265F4195009C1D0B /* Moya */, 6273DD44265F4195009C1D0B /* CombineMoya */, @@ -338,7 +335,6 @@ 5338F752263B65E10014BF09 /* XCRemoteSwiftPackageReference "SwiftyRequest" */, 5338F755263B7E2E0014BF09 /* XCRemoteSwiftPackageReference "keychain-swift" */, 53892778263CBFE70035E14B /* XCRemoteSwiftPackageReference "SwiftyJSON" */, - 5302F8282658791C00647A2E /* XCRemoteSwiftPackageReference "sentry-cocoa" */, 5335256F265EA0A0006CCA86 /* XCRemoteSwiftPackageReference "SwiftUI-Introspect" */, 6273DD41265F4195009C1D0B /* XCRemoteSwiftPackageReference "Moya" */, 621C637E26672A30004216EA /* XCRemoteSwiftPackageReference "NukeUI" */, @@ -608,14 +604,6 @@ /* End XCConfigurationList section */ /* Begin XCRemoteSwiftPackageReference section */ - 5302F8282658791C00647A2E /* XCRemoteSwiftPackageReference "sentry-cocoa" */ = { - isa = XCRemoteSwiftPackageReference; - repositoryURL = "https://github.com/getsentry/sentry-cocoa"; - requirement = { - kind = upToNextMajorVersion; - minimumVersion = 7.1.0; - }; - }; 5335256F265EA0A0006CCA86 /* XCRemoteSwiftPackageReference "SwiftUI-Introspect" */ = { isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/siteline/SwiftUI-Introspect"; @@ -667,11 +655,6 @@ /* End XCRemoteSwiftPackageReference section */ /* Begin XCSwiftPackageProductDependency section */ - 5302F8292658791C00647A2E /* Sentry */ = { - isa = XCSwiftPackageProductDependency; - package = 5302F8282658791C00647A2E /* XCRemoteSwiftPackageReference "sentry-cocoa" */; - productName = Sentry; - }; 53352570265EA0A0006CCA86 /* Introspect */ = { isa = XCSwiftPackageProductDependency; package = 5335256F265EA0A0006CCA86 /* XCRemoteSwiftPackageReference "SwiftUI-Introspect" */; diff --git a/JellyfinPlayer.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/JellyfinPlayer.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index f76f72c3..b776b9e0 100644 --- a/JellyfinPlayer.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/JellyfinPlayer.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -100,15 +100,6 @@ "version": "5.1.2" } }, - { - "package": "Sentry", - "repositoryURL": "https://github.com/getsentry/sentry-cocoa", - "state": { - "branch": null, - "revision": "5275a1ef438774f5e8a5ce8a5577771aa028ecc1", - "version": "7.1.0" - } - }, { "package": "swift-log", "repositoryURL": "https://github.com/apple/swift-log.git", diff --git a/JellyfinPlayer/ConnectToServerView.swift b/JellyfinPlayer/ConnectToServerView.swift index 28495931..9b312dba 100644 --- a/JellyfinPlayer/ConnectToServerView.swift +++ b/JellyfinPlayer/ConnectToServerView.swift @@ -11,7 +11,6 @@ import SwiftyRequest import SwiftyJSON import CoreData import KeychainSwift -import Sentry import NukeUI class publicUser: ObservableObject { @@ -156,13 +155,11 @@ struct ConnectToServerView: View { jsi.did = true } } catch { - SentrySDK.capture(error: error) } } catch { } - case .failure(let error): - SentrySDK.capture(error: error) + case .failure(_): _isSignInErrored.wrappedValue = true; } _isWorking.wrappedValue = false; diff --git a/JellyfinPlayer/ContentView.swift b/JellyfinPlayer/ContentView.swift index 93582613..03209ca3 100644 --- a/JellyfinPlayer/ContentView.swift +++ b/JellyfinPlayer/ContentView.swift @@ -8,7 +8,6 @@ import SwiftUI import KeychainSwift -import Sentry import SwiftyJSON import SwiftyRequest import Nuke @@ -68,14 +67,7 @@ struct ContentView: View { } _viewDidLoad.wrappedValue = true - SentrySDK.start { options in - options.dsn = "https://75ac77d6af4d406eb989f3d8ef0f119f@o513670.ingest.sentry.io/5778242" - options.debug = false // Enabled debug when first installing is always helpful - options.tracesSampleRate = 1.0 - options.releaseName = "ios-" + (Bundle.main.infoDictionary?["CFBundleVersion"] as! String) - options.enableOutOfMemoryTracking = true - } - + ImageCache.shared.costLimit = 125 * 1024 * 1024 // 125MB memory DataLoader.sharedUrlCache.diskCapacity = 1000 * 1024 * 1024 // 1000MB disk @@ -163,8 +155,8 @@ struct ContentView: View { dump(_librariesShowRecentlyAdded.wrappedValue) dump(_library_names.wrappedValue) } catch {} - case let .failure(error): - SentrySDK.capture(error: error) + case .failure(_): + break } let defaults = UserDefaults.standard if defaults.integer(forKey: "InNetworkBandwidth") == 0 { @@ -181,7 +173,6 @@ struct ContentView: View { _isLoading.wrappedValue = false _isSignInErrored.wrappedValue = true } else { - SentrySDK.capture(error: error) _isLoading.wrappedValue = false _isNetworkErrored.wrappedValue = true } diff --git a/JellyfinPlayer/Views/VideoPlayer.swift b/JellyfinPlayer/Views/VideoPlayer.swift index 35d0cb7b..18484676 100644 --- a/JellyfinPlayer/Views/VideoPlayer.swift +++ b/JellyfinPlayer/Views/VideoPlayer.swift @@ -197,6 +197,10 @@ class PlayerViewController: UIViewController, VLCMediaDelegate, VLCMediaPlayerDe super.viewDidLoad() //View has loaded. + + //Rotate to landscape only if necessary + UIViewController.attemptRotationToDeviceOrientation(); + //Show loading screen mediaPlayer.perform(Selector(("setTextRendererFontSize:")), with: 14) diff --git a/JellyfinPlayer/Views/VideoPlayerSettingsView.swift b/JellyfinPlayer/Views/VideoPlayerSettingsView.swift index 7b744ef0..f3906ec8 100644 --- a/JellyfinPlayer/Views/VideoPlayerSettingsView.swift +++ b/JellyfinPlayer/Views/VideoPlayerSettingsView.swift @@ -72,7 +72,7 @@ struct VideoPlayerSettings: View { } } } - }.offset(y: 14) + }.offset(y: UIDevice.current.userInterfaceIdiom == .pad ? 14 : 0) .onAppear(perform: { _captionTrack.wrappedValue = self.delegate.selectedCaptionTrack _audioTrack.wrappedValue = self.delegate.selectedAudioTrack