Marino Faggiana 1 rok pred
rodič
commit
6cfdc53df5

+ 2 - 2
iOSClient/Menu/NCContextMenu.swift

@@ -158,7 +158,7 @@ class NCContextMenu: NSObject {
                     if error != .success {
                         NCContentPresenter.shared.showError(error: error)
                     }
-                    NotificationCenter.default.postOnMainThread(name: NCGlobal.shared.notificationCenterDeleteFile, userInfo: ["error": error])
+                    NotificationCenter.default.postOnMainThread(name: NCGlobal.shared.notificationCenterDeleteFile, userInfo: ["ocId": [metadata.ocId], "error": error])
                 }
             })
             alertController.addAction(UIAlertAction(title: NSLocalizedString("_cancel_", comment: ""), style: .cancel) { _ in })
@@ -172,7 +172,7 @@ class NCContextMenu: NSObject {
                 if error != .success {
                     NCContentPresenter.shared.showError(error: error)
                 }
-                NotificationCenter.default.postOnMainThread(name: NCGlobal.shared.notificationCenterDeleteFile, userInfo: ["error": error])
+                NotificationCenter.default.postOnMainThread(name: NCGlobal.shared.notificationCenterDeleteFile, userInfo: ["ocId": [metadata.ocId], "error": error])
             }
         }
 

+ 4 - 2
iOSClient/Menu/NCMenuAction.swift

@@ -144,7 +144,8 @@ extension NCMenuAction {
                             if error != .success {
                                 NCContentPresenter.shared.showError(error: error)
                             }
-                            NotificationCenter.default.postOnMainThread(name: NCGlobal.shared.notificationCenterDeleteFile, userInfo: ["error": error])
+                            let ocId = selectedMetadatas.map { $0.ocId }
+                            NotificationCenter.default.postOnMainThread(name: NCGlobal.shared.notificationCenterDeleteFile, userInfo: ["ocId": ocId, "error": error])
                         }
                         completion?()
                     })
@@ -161,7 +162,8 @@ extension NCMenuAction {
                             if error != .success {
                                 NCContentPresenter.shared.showError(error: error)
                             }
-                            NotificationCenter.default.postOnMainThread(name: NCGlobal.shared.notificationCenterDeleteFile, userInfo: ["error": error])
+                            let ocId = selectedMetadatas.map { $0.ocId }
+                            NotificationCenter.default.postOnMainThread(name: NCGlobal.shared.notificationCenterDeleteFile, userInfo: ["ocId": ocId, "error": error])
                         }
                         completion?()
                     })

+ 1 - 1
iOSClient/NCGlobal.swift

@@ -343,7 +343,7 @@ class NCGlobal: NSObject {
     let notificationCenterProgressTask                          = "progressTask"                    // userInfo: account, ocId, serverUrl, status, progress, totalBytes, totalBytesExpected
 
     let notificationCenterCreateFolder                          = "createFolder"                    // userInfo: ocId, serverUrl, account, e2ee, withPush
-    let notificationCenterDeleteFile                            = "deleteFile"                      // userInfo: error
+    let notificationCenterDeleteFile                            = "deleteFile"                      // userInfo: ocIds, error
     let notificationCenterRenameFile                            = "renameFile"                      // userInfo: ocId, account
     let notificationCenterMoveFile                              = "moveFile"                        // userInfo: ocId, account, serverUrlFrom
     let notificationCenterCopyFile                              = "copyFile"                        // userInfo: ocId, serverUrlTo

+ 15 - 11
iOSClient/Viewer/NCViewerMedia/NCViewerMediaPage.swift

@@ -365,20 +365,24 @@ class NCViewerMediaPage: UIViewController {
     @objc func deleteFile(_ notification: NSNotification) {
 
         guard let userInfo = notification.userInfo as NSDictionary?,
-              let ocId = userInfo["ocId"] as? String
+              let ocIds = userInfo["ocId"] as? [String],
+              let ocId = ocIds.first,
+              let error = userInfo["error"] as? NKError
         else { return }
 
-        // Stop media
-        if let ncplayer = currentViewController.ncplayer, ncplayer.isPlay() {
-            ncplayer.playerPause()
-        }
-        
-        let metadatas = self.metadatas.filter { $0.ocId != ocId }
-        if self.metadatas.count == metadatas.count { return }
-        self.metadatas = metadatas
+        if error == .success {
+            // Stop media
+            if let ncplayer = currentViewController.ncplayer, ncplayer.isPlay() {
+                ncplayer.playerPause()
+            }
 
-        if ocId == currentViewController.metadata.ocId {
-            shiftCurrentPage()
+            let metadatas = self.metadatas.filter { $0.ocId != ocId }
+            if self.metadatas.count == metadatas.count { return }
+            self.metadatas = metadatas
+            
+            if ocId == currentViewController.metadata.ocId {
+                shiftCurrentPage()
+            }
         }
     }