coding

Nextcloud.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -6,8 +6,8 @@
         "repositoryURL": "https://github.com/firebase/abseil-cpp-SwiftPM.git",
         "state": {
           "branch": null,
-          "revision": "ff5f5f0a3d3266836b9d722bb73cabdf7057482e",
-          "version": "0.20200225.3"
+          "revision": "fffc3c2729be5747390ad02d5100291a0d9ad26a",
+          "version": "0.20200225.4"
         }
       },
       {
@@ -15,8 +15,8 @@
         "repositoryURL": "https://github.com/Alamofire/Alamofire",
         "state": {
           "branch": null,
-          "revision": "f96b619bcb2383b43d898402283924b80e2c4bae",
-          "version": "5.4.3"
+          "revision": "d120af1e8638c7da36c8481fd61a66c0c08dc4fc",
+          "version": "5.4.4"
         }
       },
       {
@@ -24,8 +24,8 @@
         "repositoryURL": "https://github.com/firebase/boringssl-SwiftPM.git",
         "state": {
           "branch": null,
-          "revision": "15889fadef7078dfa1392b0e2b08f3d0e9797104",
-          "version": "0.7.1"
+          "revision": "734a8247442fde37df4364c21f6a0085b6a36728",
+          "version": "0.7.2"
         }
       },
       {
@@ -33,8 +33,8 @@
         "repositoryURL": "https://github.com/CocoaLumberjack/CocoaLumberjack.git",
         "state": {
           "branch": null,
-          "revision": "b06614d2373a9830c87817144d47ce654980a2d7",
-          "version": "3.7.0"
+          "revision": "e518eb6e362df327574ba5e04269cd6d29f40aec",
+          "version": "3.7.2"
         }
       },
       {
@@ -96,8 +96,8 @@
         "repositoryURL": "https://github.com/google/gtm-session-fetcher.git",
         "state": {
           "branch": null,
-          "revision": "91ed3d188eb95705fef3c249453b81f32dc557d1",
-          "version": "1.5.0"
+          "revision": "bc6a19702ac76ac4e488b68148710eb815f9bc56",
+          "version": "1.7.0"
         }
       },
       {
@@ -159,8 +159,8 @@
         "repositoryURL": "https://github.com/google/promises.git",
         "state": {
           "branch": null,
-          "revision": "afa9a1ace74e116848d4f743599ab83e584ff8cb",
-          "version": "1.2.12"
+          "revision": "611337c330350c9c1823ad6d671e7f936af5ee13",
+          "version": "2.0.0"
         }
       },
       {
@@ -204,7 +204,7 @@
         "repositoryURL": "https://github.com/SVGKit/SVGKit.git",
         "state": {
           "branch": "3.x",
-          "revision": "11b6d774d2710a8b1c0493146be5d56e56961946",
+          "revision": "e9bc636845fb4d6d5d8e25a9bd08e75c5cf92de9",
           "version": null
         }
       },
@@ -213,8 +213,8 @@
         "repositoryURL": "https://github.com/apple/swift-log.git",
         "state": {
           "branch": null,
-          "revision": "173f567a2dfec11d74588eea82cecea555bdc0bc",
-          "version": "1.4.0"
+          "revision": "5d66f7ba25daf4f94100e7022febf3c75e37a6c7",
+          "version": "1.4.2"
         }
       },
       {
@@ -222,8 +222,8 @@
         "repositoryURL": "https://github.com/apple/swift-protobuf.git",
         "state": {
           "branch": null,
-          "revision": "bfe4255ff60f22a41cafa113059668571ed5d461",
-          "version": "1.16.0"
+          "revision": "7e2c5f3cbbeea68e004915e3a8961e20bd11d824",
+          "version": "1.18.0"
         }
       },
       {
@@ -258,8 +258,8 @@
         "repositoryURL": "https://github.com/yahoojapan/SwiftyXMLParser",
         "state": {
           "branch": null,
-          "revision": "ec7f183642adf429babd867d1a38c5c6912408ba",
-          "version": "5.3.0"
+          "revision": "ad5eeeaf7797f69e26943aaa53c81c6a9fdaa516",
+          "version": "5.5.0"
         }
       }
     ]

iOSClient/Viewer/NCViewerMedia/NCPlayer/NCPlayer.swift

@@ -79,56 +79,56 @@ class NCPlayer: NSObject {
             }
         }
         
-        appDelegate.player?.currentItem?.asset.loadValuesAsynchronously(forKeys: ["duration", "playable"], completionHandler: {
-            if let durationTime: CMTime = (self.appDelegate.player?.currentItem?.asset.duration) {
-                var error: NSError? = nil
-                let status = self.appDelegate.player?.currentItem?.asset.statusOfValue(forKey: "playable", error: &error)
-                switch status {
-                case .loaded:
-                    DispatchQueue.main.async {
-                        if let imageVideoContainer = imageVideoContainer {
-                            
-                            self.imageVideoContainer = imageVideoContainer
-                            self.videoLayer = AVPlayerLayer(player: self.appDelegate.player)
-                            self.videoLayer!.frame = imageVideoContainer.bounds
-                            self.videoLayer!.videoGravity = .resizeAspect
-                            
-                            if metadata.classFile != NCCommunicationCommon.typeClassFile.audio.rawValue {
-                            
-                                if !metadata.livePhoto {
-                                    imageVideoContainer.image = imageVideoContainer.image?.image(alpha: 0)
-                                }
-                                imageVideoContainer.layer.addSublayer(self.videoLayer!)
-                                imageVideoContainer.playerLayer = self.videoLayer
-                                imageVideoContainer.metadata = self.metadata
-                                // PiP
-                                if let playerLayer = self.videoLayer {
-                                    self.pictureInPictureController = AVPictureInPictureController(playerLayer: playerLayer)
-                                    self.pictureInPictureController?.delegate = self
-                                }
+        appDelegate.player?.currentItem?.asset.loadValuesAsynchronously(forKeys: ["playable"], completionHandler: {
+            var error: NSError? = nil
+            let status = self.appDelegate.player?.currentItem?.asset.statusOfValue(forKey: "playable", error: &error)
+            switch status {
+            case .loaded:
+                DispatchQueue.main.async {
+                    if let imageVideoContainer = imageVideoContainer {
+                        
+                        self.imageVideoContainer = imageVideoContainer
+                        self.videoLayer = AVPlayerLayer(player: self.appDelegate.player)
+                        self.videoLayer!.frame = imageVideoContainer.bounds
+                        self.videoLayer!.videoGravity = .resizeAspect
+                        
+                        if metadata.classFile != NCCommunicationCommon.typeClassFile.audio.rawValue {
+                        
+                            if !metadata.livePhoto {
+                                imageVideoContainer.image = imageVideoContainer.image?.image(alpha: 0)
+                            }
+                            imageVideoContainer.layer.addSublayer(self.videoLayer!)
+                            imageVideoContainer.playerLayer = self.videoLayer
+                            imageVideoContainer.metadata = self.metadata
+                            // PiP
+                            if let playerLayer = self.videoLayer {
+                                self.pictureInPictureController = AVPictureInPictureController(playerLayer: playerLayer)
+                                self.pictureInPictureController?.delegate = self
                             }
-                        }
-                        NCManageDatabase.shared.addVideoTime(metadata: metadata, time: nil, durationTime: durationTime)
-                        self.playerToolBar?.setBarPlayer(ncplayer: self, timeSeek: timeSeek, metadata: metadata)
-                        self.generatorImagePreview()
-                        if !(detailView?.isShow() ?? false) {
-                            NotificationCenter.default.postOnMainThread(name: NCGlobal.shared.notificationCenterShowPlayerToolBar, userInfo: ["ocId":metadata.ocId, "enableTimerAutoHide": false])
                         }
                     }
-                    break
-                case .failed:
-                    DispatchQueue.main.async {
-                        NCContentPresenter.shared.messageNotification("_error_", description: "_error_something_wrong_", delay: NCGlobal.shared.dismissAfterSecond, type: NCContentPresenter.messageType.info, errorCode: NCGlobal.shared.errorGeneric, forced: false)
+                    if let durationTime: CMTime = (self.appDelegate.player?.currentItem?.asset.duration) {
+                        NCManageDatabase.shared.addVideoTime(metadata: metadata, time: nil, durationTime: durationTime)
                     }
-                    break
-                case .cancelled:
-                    DispatchQueue.main.async {
-                        //do something, show alert, put a placeholder image etc.
+                    self.playerToolBar?.setBarPlayer(ncplayer: self, timeSeek: timeSeek, metadata: metadata)
+                    self.generatorImagePreview()
+                    if !(detailView?.isShow() ?? false) {
+                        NotificationCenter.default.postOnMainThread(name: NCGlobal.shared.notificationCenterShowPlayerToolBar, userInfo: ["ocId":metadata.ocId, "enableTimerAutoHide": false])
                     }
-                    break
-                default:
-                    break
                 }
+                break
+            case .failed:
+                DispatchQueue.main.async {
+                    NCContentPresenter.shared.messageNotification("_error_", description: "_error_something_wrong_", delay: NCGlobal.shared.dismissAfterSecond, type: NCContentPresenter.messageType.info, errorCode: NCGlobal.shared.errorGeneric, forced: false)
+                }
+                break
+            case .cancelled:
+                DispatchQueue.main.async {
+                    //do something, show alert, put a placeholder image etc.
+                }
+                break
+            default:
+                break
             }
         })