marinofaggiana 4 years ago
parent
commit
01013be8ab

+ 1 - 1
Nextcloud.xcodeproj/project.pbxproj

@@ -2905,7 +2905,7 @@
 			repositoryURL = "https://github.com/nextcloud/ios-communication-library/";
 			requirement = {
 				kind = revision;
-				revision = 4440691dcb1b9302047d4312c0eeb3634501013c;
+				revision = c491246737f0acd5d62c568f193f51482ca1bc19;
 			};
 		};
 		F788ECC5263AAAF900ADC67F /* XCRemoteSwiftPackageReference "MarkdownKit" */ = {

+ 1 - 1
Nextcloud.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -105,7 +105,7 @@
         "repositoryURL": "https://github.com/nextcloud/ios-communication-library/",
         "state": {
           "branch": null,
-          "revision": "4440691dcb1b9302047d4312c0eeb3634501013c",
+          "revision": "c491246737f0acd5d62c568f193f51482ca1bc19",
           "version": null
         }
       },

+ 6 - 1
iOSClient/BrowserWeb/NCBrowserWeb.swift

@@ -63,7 +63,12 @@ class NCBrowserWeb: UIViewController {
             buttonExit.setImage(image, for: .normal)
         }
         
-        loadWebPage(webView: webView!, url: URL(string: urlBase)!)
+        if let url = URL(string: urlBase) {
+            loadWebPage(webView: webView!, url: url)
+        } else {
+            let url = URL(fileURLWithPath: urlBase)
+            loadWebPage(webView: webView!, url: url)
+        }
     }
     
     override func viewWillAppear(_ animated: Bool) {

+ 14 - 0
iOSClient/Viewer/NCViewer.swift

@@ -187,6 +187,20 @@ class NCViewer: NSObject {
                 
                 return
             }
+            
+            if metadata.contentType == "text/html" {
+                
+                if let navigationController = viewController.navigationController {
+                    
+                    let viewController = UIStoryboard(name: "NCBrowserWeb", bundle: nil).instantiateInitialViewController() as! NCBrowserWeb
+                    viewController.urlBase = CCUtility.getDirectoryProviderStorageOcId(metadata.ocId, fileNameView: metadata.fileNameView)
+                    viewController.isHiddenButtonExit = true
+
+                    navigationController.pushViewController(viewController, animated: true)
+                }
+
+                return
+            }
         }
         
         // OTHER