coding

iOSClient/AppDelegate.h

@@ -98,7 +98,6 @@
 @property (nonatomic, retain) NCFavorite *activeFavorite;
 @property (nonatomic, retain) NCRecent *activeRecent;
 @property (nonatomic, retain) NCMedia *activeMedia;
-@property (nonatomic, retain) NCDetailViewController *activeDetail;
 @property (nonatomic, retain) NCTransfers *activeTransfers;
 @property (nonatomic, retain) CCLogin *activeLogin;
 @property (nonatomic, retain) NCLoginWeb *activeLoginWeb;

iOSClient/Detail/NCDetailViewController.swift

@@ -49,7 +49,6 @@ class NCDetailViewController: UIViewController {
     required init?(coder: NSCoder) {
         super.init(coder: coder)
         
-        appDelegate.activeDetail = self
     }
     
     override func viewDidLoad() {

iOSClient/Main/Menu/NCViewer+Menu.swift

@@ -168,7 +168,7 @@ extension NCViewer {
                     let navigationController = storyboard.instantiateInitialViewController() as! UINavigationController
                     let viewController = navigationController.topViewController as! NCSelect
                     
-                    viewController.delegate = self.appDelegate.activeDetail
+                    viewController.delegate = NCViewer.shared
                     viewController.hideButtonCreateFolder = false
                     viewController.selectFile = false
                     viewController.includeDirectoryE2EEncryption = false

iOSClient/Viewer/NCViewer.swift

@@ -83,3 +83,28 @@ class NCViewer: NSObject {
         return nil
     }
 }
+
+//MARK: -
+
+extension NCViewer: NCSelectDelegate {
+    
+    func dismissSelect(serverUrl: String?, metadata: tableMetadata?, type: String, items: [Any], buttonType: String, overwrite: Bool) {
+        if let metadata = metadata, let serverUrl = serverUrl {
+            if buttonType == "done" {
+                NCNetworking.shared.moveMetadata(metadata, serverUrlTo: serverUrl, overwrite: overwrite) { (errorCode, errorDescription) in
+                    if errorCode != 0 {
+                        NCContentPresenter.shared.messageNotification("_error_", description: errorDescription, delay: TimeInterval(k_dismissAfterSecond), type: NCContentPresenter.messageType.error, errorCode: errorCode)
+                    }
+                }
+            } else {
+                NCNetworking.shared.copyMetadata(metadata, serverUrlTo: serverUrl, overwrite: overwrite) { (errorCode, errorDescription) in
+                    if errorCode != 0 {
+                        NCContentPresenter.shared.messageNotification("_error_", description: errorDescription, delay: TimeInterval(k_dismissAfterSecond), type: NCContentPresenter.messageType.error, errorCode: errorCode)
+                    }
+                }
+            }
+        }
+    }
+}
+
+

iOSClient/Viewer/NCViewerNextcloudText.swift

@@ -97,7 +97,7 @@ class NCViewerNextcloudText: WKWebView, WKNavigationDelegate, WKScriptMessageHan
             
             if message.body as? String == "close" {
                                 
-                appDelegate.activeDetail.viewUnload()
+                //appDelegate.activeDetail.viewUnload()
                 appDelegate.activeFiles.reloadDataSourceNetwork()
             }
             

iOSClient/Viewer/NCViewerRichdocument.swift

@@ -96,7 +96,7 @@ class NCViewerRichdocument: WKWebView, WKNavigationDelegate, WKScriptMessageHand
             
             if message.body as? String == "close" {
                 
-                appDelegate.activeDetail.viewUnload()                                
+                //appDelegate.activeDetail.viewUnload()                                
                 appDelegate.activeFiles.reloadDataSourceNetwork()
             }