Marino Faggiana 1 year ago
parent
commit
d47a1b991a

+ 0 - 8
iOSClient/Networking/NCNetworking.swift

@@ -171,12 +171,8 @@ class NCNetworking: NSObject, NKCommonDelegate {
         let certificateSavedPath = directoryCertificate + "/" + host + ".der"
         var isTrusted: Bool
 
-        NextcloudKit.shared.nkCommonInstance.writeLog("[PINNING] Start")
-
         if let serverTrust: SecTrust = protectionSpace.serverTrust, let certificate = SecTrustGetCertificateAtIndex(serverTrust, 0) {
 
-            NextcloudKit.shared.nkCommonInstance.writeLog("[PINNING] Extarct certificate txt")
-
             // extarct certificate txt
             saveX509Certificate(certificate, host: host, directoryCertificate: directoryCertificate)
            
@@ -189,17 +185,13 @@ class NCNetworking: NSObject, NKCommonDelegate {
             certificateData.write(toFile: directoryCertificate + "/" + host + ".tmp", atomically: true)
             
             if isServerTrusted {
-                NextcloudKit.shared.nkCommonInstance.writeLog("[PINNING] Server trusted")
                 isTrusted = true
             } else if let certificateDataSaved = NSData(contentsOfFile: certificateSavedPath), certificateData.isEqual(to: certificateDataSaved as Data) {
-                NextcloudKit.shared.nkCommonInstance.writeLog("[PINNING] Server trusted (data saved)")
                 isTrusted = true
             } else {
-                NextcloudKit.shared.nkCommonInstance.writeLog("[PINNING] Server not trusted")
                 isTrusted = false
             }
         } else {
-            NextcloudKit.shared.nkCommonInstance.writeLog("[PINNING] not certificate, server not trusted ")
             isTrusted = false
         }
 

+ 4 - 4
iOSClient/Viewer/NCViewerMedia/NCPlayer/NCPlayer.swift

@@ -108,7 +108,7 @@ class NCPlayer: NSObject {
             player.media = VLCMedia(url: url)
             player.position = position
             playerToolBar?.setBarPlayer(position: position)
-            viewerMediaPage?.changeScreenMode(mode: .normal, isMovie: true)
+            viewerMediaPage?.changeScreenMode(mode: .normal)
             pauseAfterPlay = true
             player.play()
         }
@@ -129,12 +129,12 @@ class NCPlayer: NSObject {
 
     func changeScreenMode() {
 
-        guard let viewerMediaPage = viewerMediaPage, let playerToolBar = self.playerToolBar else { return }
+        guard let viewerMediaPage = viewerMediaPage else { return }
 
         if viewerMediaScreenMode == .full {
-            viewerMediaPage.changeScreenMode(mode: .normal, isMovie: true, fullscreen: playerToolBar.isFullscreen)
+            viewerMediaPage.changeScreenMode(mode: .normal)
         } else {
-            viewerMediaPage.changeScreenMode(mode: .full, isMovie: true, fullscreen: playerToolBar.isFullscreen)
+            viewerMediaPage.changeScreenMode(mode: .full)
         }
     }
 

+ 9 - 7
iOSClient/Viewer/NCViewerMedia/NCViewerMediaPage.swift

@@ -69,7 +69,7 @@ class NCViewerMediaPage: UIViewController {
     var timerAutoHideSeconds: Double {
         get {
             if NCUtility.shared.isSimulator() {
-                return 40
+                return 4
             } else {
                 return 4
             }
@@ -212,9 +212,10 @@ class NCViewerMediaPage: UIViewController {
         NCViewer.shared.toggleMenu(viewController: self, metadata: currentViewController.metadata, webView: false, imageIcon: imageIcon)
     }
 
-    func changeScreenMode(mode: ScreenMode, isMovie: Bool = false, fullscreen: Bool = false) {
+    func changeScreenMode(mode: ScreenMode) {
 
-        let metadata = metadatas[currentIndex]
+        let metadata = currentViewController.metadata
+        let fullscreen = currentViewController.playerToolBar?.isFullscreen ?? false
         NCUtility.shared.colorNavigationController(navigationController, backgroundColor: .systemBackground, titleColor: .label, tintColor: nil, withoutShadow: false)
 
         if mode == .normal {
@@ -229,7 +230,7 @@ class NCViewerMediaPage: UIViewController {
                 progressView.isHidden = false
             }
 
-            if metadata.isMovie || isMovie {
+            if metadata.isMovie {
                 currentViewController.playerToolBar?.show()
                 view.backgroundColor = .black
                 textColor = .white
@@ -244,7 +245,7 @@ class NCViewerMediaPage: UIViewController {
             hideStatusBar = true
             progressView.isHidden = true
 
-            if metadata.isMovie || isMovie {
+            if metadata.isMovie {
                 currentViewController.playerToolBar?.hide()
             }
 
@@ -275,7 +276,8 @@ class NCViewerMediaPage: UIViewController {
 
     @objc func autoHide() {
 
-        if metadatas[currentIndex].isMovie, viewerMediaScreenMode == .normal {
+        let metadata = currentViewController.metadata
+        if metadata.isMovie, viewerMediaScreenMode == .normal {
             changeScreenMode(mode: .full)
         }
     }
@@ -291,7 +293,7 @@ class NCViewerMediaPage: UIViewController {
         }
 
         progressView.progress = 0
-        let metadata = metadatas[currentIndex]
+        let metadata = currentViewController.metadata
 
         if metadata.ocId == ocId,
            metadata.isMovie,