Coding

Signed-off-by: Marino Faggiana <marino@marinofaggiana.com>

iOSClient/BrowserWeb/NCBrowserWeb.storyboard

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="OOi-qQ-BCK">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="21507" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="OOi-qQ-BCK">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17703"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21505"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -17,12 +17,11 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Lht-2f-Ep4">
-                                <rect key="frame" x="10" y="54" width="30" height="30"/>
+                                <rect key="frame" x="10" y="58" width="30" height="30"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="30" id="ckh-Eb-Ze8"/>
                                     <constraint firstAttribute="width" constant="30" id="oHS-Ba-9eq"/>
                                 </constraints>
-                                <state key="normal" image="exit"/>
                                 <connections>
                                     <action selector="touchUpInsideButtonExit:" destination="OOi-qQ-BCK" eventType="touchUpInside" id="hcA-Hb-TJd"/>
                                 </connections>
@@ -44,7 +43,4 @@
             <point key="canvasLocation" x="4511.594202898551" y="-1210.0446428571429"/>
         </scene>
     </scenes>
-    <resources>
-        <image name="exit" width="300" height="300"/>
-    </resources>
 </document>

iOSClient/BrowserWeb/NCBrowserWeb.swift

@@ -30,8 +30,6 @@ import WebKit
 
 class NCBrowserWeb: UIViewController {
 
-    var webView: WKWebView?
-
     @objc var urlBase = ""
     @objc var isHiddenButtonExit = false
     @objc var titleBrowser: String?
@@ -44,16 +42,15 @@ class NCBrowserWeb: UIViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
 
-        webView = WKWebView(frame: CGRect.zero)
-        webView!.navigationDelegate = self
-        view.addSubview(webView!)
-        webView!.translatesAutoresizingMaskIntoConstraints = false
-        webView!.leadingAnchor.constraint(equalTo: view.leadingAnchor, constant: 0).isActive = true
-        webView!.rightAnchor.constraint(equalTo: view.rightAnchor, constant: 0).isActive = true
-        webView!.topAnchor.constraint(equalTo: view.topAnchor, constant: 0).isActive = true
-        webView!.bottomAnchor.constraint(equalTo: view.bottomAnchor, constant: 0).isActive = true
+        let webView = WKWebView(frame: CGRect.zero)
+        webView.navigationDelegate = self
+        view.addSubview(webView)
+        webView.translatesAutoresizingMaskIntoConstraints = false
+        webView.leadingAnchor.constraint(equalTo: view.leadingAnchor, constant: 0).isActive = true
+        webView.rightAnchor.constraint(equalTo: view.rightAnchor, constant: 0).isActive = true
+        webView.topAnchor.constraint(equalTo: view.topAnchor, constant: 0).isActive = true
+        webView.bottomAnchor.constraint(equalTo: view.bottomAnchor, constant: 0).isActive = true
 
-        // button exit
         if isHiddenButtonExit {
             buttonExit.isHidden = true
         } else {
@@ -63,13 +60,11 @@ class NCBrowserWeb: UIViewController {
         }
 
         if let url = URL(string: urlBase) {
-            loadWebPage(webView: webView!, url: url)
+            loadWebPage(webView: webView, url: url)
         } else {
             let url = URL(fileURLWithPath: urlBase)
-            loadWebPage(webView: webView!, url: url)
+            loadWebPage(webView: webView, url: url)
         }
-
-        // navigationItem.rightBarButtonItem = UIBarButtonItem.init(image: UIImage(named: "more")!.image(color: .label, size: 25), style: .plain, target: self, action: #selector(self.openMenuMore))
     }
 
     override func viewWillAppear(_ animated: Bool) {
@@ -92,8 +87,6 @@ class NCBrowserWeb: UIViewController {
         }
     }
 
-    //
-
     func loadWebPage(webView: WKWebView, url: URL) {
 
         let language = NSLocale.preferredLanguages[0] as String
@@ -101,8 +94,8 @@ class NCBrowserWeb: UIViewController {
 
         request.addValue("true", forHTTPHeaderField: "OCS-APIRequest")
         request.addValue(language, forHTTPHeaderField: "Accept-Language")
+        
         webView.customUserAgent = CCUtility.getUserAgent()
-
         webView.load(request)
     }
 }
@@ -120,18 +113,8 @@ extension NCBrowserWeb: WKNavigationDelegate {
     }
 
     public func webView(_ webView: WKWebView, decidePolicyFor navigationAction: WKNavigationAction, decisionHandler: @escaping (WKNavigationActionPolicy) -> Void) {
-        decisionHandler(.allow)
-    }
-
-    public func webView(_ webView: WKWebView, didStartProvisionalNavigation navigation: WKNavigation!) {
-        print("didStartProvisionalNavigation")
-    }
-
-    public func webView(_ webView: WKWebView, didFinish navigation: WKNavigation!) {
-        print("didFinishProvisionalNavigation")
-    }
-
-    public func webView(_ webView: WKWebView, didReceiveServerRedirectForProvisionalNavigation navigation: WKNavigation!) {
-        print("didReceiveServerRedirectForProvisionalNavigation")
+        DispatchQueue.global().async {
+            decisionHandler(.allow)
+        }
     }
 }