marinofaggiana 4 years ago
parent
commit
b02e541a71

+ 2 - 0
iOSClient/CCGlobal.h

@@ -315,6 +315,8 @@
 #define k_notificationCenter_closeRichWorkspaceWebView  @"closeRichWorkspaceWebView"
 
 #define k_notificationCenter_reloadDataSource           @"reloadDataSource"                 // userInfo: ocId?, serverUrl?
+#define k_notificationCenter_reloadDataSourceNetwork    @"reloadDataSourceNetwork"          // userInfo: serverUrl
+
 #define k_notificationCenter_mediaFileNotFound          @"mediaFileNotFound"                // userInfo: metadata
 #define k_notificationCenter_changeStatusFolderE2EE     @"changeStatusFolderE2EE"           // userInfo: serverUrl
 

+ 4 - 4
iOSClient/Viewer/NCViewerNextcloudText/NCViewerNextcloudText.swift

@@ -82,8 +82,8 @@ class NCViewerNextcloudText: UIViewController, WKNavigationDelegate, WKScriptMes
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
 
-        let buttonMore = UIBarButtonItem.init(image: CCGraphics.changeThemingColorImage(UIImage(named: "more"), width: 50, height: 50, color: NCBrandColor.sharedInstance.textView), style: .plain, target: self, action: #selector(self.openMenuMore))
-        navigationItem.rightBarButtonItem = buttonMore
+        navigationItem.rightBarButtonItem = nil
+        navigationItem.leftBarButtonItem = nil
         
         navigationController?.navigationBar.prefersLargeTitles = true
         navigationItem.title = metadata.fileNameView
@@ -157,8 +157,8 @@ class NCViewerNextcloudText: UIViewController, WKNavigationDelegate, WKScriptMes
             
             if message.body as? String == "close" {
                                 
-                //appDelegate.activeDetail.viewUnload()
-                appDelegate.activeFiles.reloadDataSourceNetwork()
+                NotificationCenter.default.postOnMainThread(name: k_notificationCenter_reloadDataSourceNetwork, userInfo: ["serverUrl":metadata.serverUrl])
+                viewUnload()
             }
             
             if message.body as? String == "share" {