build 6

Signed-off-by: Marino Faggiana <marino@marinofaggiana.com>

Nextcloud.xcodeproj/project.pbxproj

@@ -3958,7 +3958,7 @@
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 5;
+				CURRENT_PROJECT_VERSION = 6;
 				DEVELOPMENT_TEAM = NKUJUXUJ3B;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
@@ -4021,7 +4021,7 @@
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 5;
+				CURRENT_PROJECT_VERSION = 6;
 				DEVELOPMENT_TEAM = NKUJUXUJ3B;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;

iOSClient/Viewer/NCViewerMedia/NCPlayer/NCPlayer.swift

@@ -112,6 +112,13 @@ class NCPlayer: NSObject {
             pauseAfterPlay = true
             player.play()
         }
+
+        if position == 0 {
+            let fileNamePreviewLocalPath = CCUtility.getDirectoryProviderStoragePreviewOcId(metadata.ocId, etag: metadata.etag)!
+            imageVideoContainer?.image = UIImage(contentsOfFile: fileNamePreviewLocalPath)
+        } else {
+            imageVideoContainer?.image = nil
+        }
     }
 
     // MARK: - UIGestureRecognizerDelegate
@@ -199,7 +206,6 @@ extension NCPlayer: VLCMediaPlayerDelegate {
             print("Played mode: STOPPED")
             break
         case .opening:
-            playerToolBar?.playButtonPause()
             print("Played mode: OPENING")
             break
         case .buffering:
@@ -224,6 +230,8 @@ extension NCPlayer: VLCMediaPlayerDelegate {
                 player.pause()
                 pauseAfterPlay = false
                 print(player.position)
+            } else {
+                playerToolBar?.playButtonPause()
             }
             let size = player.videoSize
             if let mediaLength = player.media?.length.intValue {
@@ -233,7 +241,6 @@ extension NCPlayer: VLCMediaPlayerDelegate {
             self.height = Int(size.height)
             playerToolBar?.updateTopToolBar(videoSubTitlesIndexes: player.videoSubTitlesIndexes, audioTrackIndexes: player.audioTrackIndexes)
             NCManageDatabase.shared.addVideo(metadata: metadata, width: self.width, height: self.height, length: self.length)
-            playerToolBar?.playButtonPause()
             print("Played mode: PLAYING")
             break
         case .paused:

iOSClient/Viewer/NCViewerMedia/NCViewerMedia.swift

@@ -125,9 +125,7 @@ class NCViewerMedia: UIViewController {
         self.image = nil
         self.imageVideoContainer.image = nil
 
-        if metadata.isImage || metadata.isAudio {
-            loadImage()
-        }
+        loadImage()
     }
 
     override func viewWillAppear(_ animated: Bool) {
@@ -263,7 +261,7 @@ class NCViewerMedia: UIViewController {
 
             NCNetworking.shared.download(metadata: metadata, selector: "") { _, _ in
                 let image = getImageMetadata(metadata)
-                if self.metadata.ocId == metadata.ocId && self.imageVideoContainer.layer.sublayers?.count == nil {
+                if self.metadata.ocId == metadata.ocId {
                     self.image = image
                     self.imageVideoContainer.image = image
                 }
@@ -272,7 +270,7 @@ class NCViewerMedia: UIViewController {
 
         // Get image
         let image = getImageMetadata(metadata)
-        if self.metadata.ocId == metadata.ocId && self.imageVideoContainer.layer.sublayers?.count == nil {
+        if self.metadata.ocId == metadata.ocId {
             self.image = image
             self.imageVideoContainer.image = image
         }