marinofaggiana 5 years ago
parent
commit
e10d6310d1

+ 1 - 1
Cartfile.resolved

@@ -17,7 +17,7 @@ github "krzyzanowskim/OpenSSL" "1.0.218"
 github "malcommac/SwiftRichString" "3.7.1"
 github "marinofaggiana/AFNetworking" "2967678c3e0e98c9b8d7e06222ad12d1f49c26f2"
 github "marinofaggiana/FastScroll" "81967c2309d29bc2c330d422da612160a30bade8"
-github "nextcloud/ios-communication-library" "00c15550307962715fc611ca84f234778c09f506"
+github "nextcloud/ios-communication-library" "9e9201fff887af0908824db5fc304c5c3aaaa79f"
 github "realm/realm-cocoa" "v4.3.1"
 github "rechsteiner/Parchment" "v1.7.0"
 github "scenee/FloatingPanel" "v1.7.4"

+ 1 - 1
iOSClient/Main/Create cloud/NCCreateFormUploadDocuments.swift

@@ -265,8 +265,8 @@ class NCCreateFormUploadDocuments: XLFormViewController, NCSelectDelegate, UICol
             
             fileName = (fileNameForm as! NSString).deletingPathExtension + "." + fileNameExtension
             fileName = NCUtility.sharedInstance.createFileName(fileName, serverUrl: serverUrl, account: appDelegate.activeAccount)
-            fileName = CCUtility.returnFileNamePath(fromFileName: fileName, serverUrl: serverUrl, activeUrl: appDelegate.activeUrl)
             fileNameForm = fileName
+            fileName = CCUtility.returnFileNamePath(fromFileName: fileName, serverUrl: serverUrl, activeUrl: appDelegate.activeUrl)
         }
             
         if self.editorId == k_editor_text || self.editorId == k_editor_onlyoffice {

+ 4 - 0
iOSClient/Main/NCDetailViewController.swift

@@ -469,6 +469,10 @@ class NCDetailViewController: UIViewController {
                         
                     } else {
                         
+                        if editor == k_editor_onlyoffice {
+                            self.navigationController?.navigationBar.topItem?.title = ""
+                        } 
+                            
                         let frame = CGRect(x: 0, y: 0, width: self.backgroundView.frame.width, height: self.backgroundView.frame.height)
                         let nextcloudText = NCViewerNextcloudText.init(frame: frame, configuration: WKWebViewConfiguration())
                         nextcloudText.viewerAt(metadata.url, metadata: metadata, editor: editor, view: backgroundView, viewController: self)