Browse Source

SwiftWebVC modify

Marino Faggiana 8 years ago
parent
commit
92421aa467

+ 5 - 0
iOSClient/Library/SwiftWebVC/SwiftModalWebVC.swift

@@ -10,6 +10,7 @@ import UIKit
 
 public protocol SwiftModalWebVCDelegate: class {
     func didStartLoading()
+    func didReceiveServerRedirectForProvisionalNavigation(url: URL)
     func didFinishLoading(success: Bool, url: URL)
 }
 
@@ -111,6 +112,10 @@ extension SwiftModalWebVC: SwiftWebVCDelegate {
         self.delegateWeb?.didStartLoading()
     }
     
+    public func didReceiveServerRedirectForProvisionalNavigation(url: URL) {
+        self.delegateWeb?.didReceiveServerRedirectForProvisionalNavigation(url: url)
+    }
+    
     public func didFinishLoading(success: Bool) {
         print("Finished loading. Success: \(success).")
     }

+ 2 - 1
iOSClient/Library/SwiftWebVC/SwiftWebVC.swift

@@ -10,6 +10,7 @@ import WebKit
 
 public protocol SwiftWebVCDelegate: class {
     func didStartLoading()
+    func didReceiveServerRedirectForProvisionalNavigation(url: URL)
     func didFinishLoading(success: Bool)
     func didFinishLoading(success: Bool, url: URL)
 }
@@ -296,7 +297,7 @@ extension SwiftWebVC: WKNavigationDelegate {
     }
     
     public func webView(_ webView: WKWebView, didReceiveServerRedirectForProvisionalNavigation navigation: WKNavigation!) {
-        print(webView.url)
+        self.delegate?.didReceiveServerRedirectForProvisionalNavigation(url: webView.url!)
     }
     
     public func webView(_ webView: WKWebView, didFinish navigation: WKNavigation!) {

+ 4 - 0
iOSClient/Login/CCLoginWeb.swift

@@ -31,6 +31,10 @@ extension CCLoginWeb: SwiftModalWebVCDelegate {
     func didStartLoading() {
         print("Started loading.")
     }
+    
+    func didReceiveServerRedirectForProvisionalNavigation(url: URL) {
+        print(url)
+    }
 
     func didFinishLoading(success: Bool, url: URL) {
         print("Finished loading. Success: \(success).")