Browse Source

fix proxy

marinofaggiana 3 years ago
parent
commit
ec627e93c3

+ 1 - 1
iOSClient/Viewer/NCViewerVideo/NCKTVHTTPCache.swift

@@ -45,7 +45,7 @@ class NCKTVHTTPCache: NSObject {
         }
     }
     
-    func startProxy(user: String, password: String, metadata: tableMetadata) {
+    func startProxy(user: String, password: String) {
         
         guard let authData = (user + ":" + password).data(using: .utf8) else { return }
         

+ 11 - 6
iOSClient/Viewer/NCViewerVideo/NCViewerVideo.swift

@@ -52,6 +52,9 @@ class NCViewerVideo: NSObject {
     }
     
     func initVideoPlayer(imageView: UIImageView?, viewerVideoToolBar: NCViewerVideoToolBar?, metadata: tableMetadata) {
+        
+        NCKTVHTTPCache.shared.startProxy(user: appDelegate.user, password: appDelegate.password)
+        
         guard let imageView = imageView else { return }
         if self.metadata == metadata { return }
         
@@ -93,15 +96,15 @@ class NCViewerVideo: NSObject {
             self.imageView = imageView
             self.viewerVideoToolBar = viewerVideoToolBar
             self.metadata = metadata
-            
+
             initPlayer(url: url)
         }        
     }
     
     func videoPlay() {
-        guard let metadata = self.metadata else { return }
         
-        NCKTVHTTPCache.shared.startProxy(user: appDelegate.user, password: appDelegate.password, metadata: metadata)
+        NCKTVHTTPCache.shared.startProxy(user: appDelegate.user, password: appDelegate.password)
+        
         self.player?.play()
     }
     
@@ -109,7 +112,6 @@ class NCViewerVideo: NSObject {
         guard let metadata = self.metadata else { return }
         
         self.player?.pause()
-        NCKTVHTTPCache.shared.stopProxy(metadata: metadata)
         if let time = self.player?.currentTime() {
             NCManageDatabase.shared.addVideoTime(metadata: metadata, time: time, durationSeconds: nil)
         }
@@ -123,9 +125,12 @@ class NCViewerVideo: NSObject {
     }
     
     func videoRemoved() {
-        
+        guard let metadata = self.metadata else { return }
+
         videoPause()
-                       
+                  
+        NCKTVHTTPCache.shared.stopProxy(metadata: metadata)
+        
         self.videoLayer?.removeFromSuperlayer()
     }