marinofaggiana 4 år sedan
förälder
incheckning
851a294100
2 ändrade filer med 17 tillägg och 9 borttagningar
  1. 1 1
      iOSClient/Brand/NCBrand.swift
  2. 16 8
      iOSClient/Login/NCLoginWeb.swift

+ 1 - 1
iOSClient/Brand/NCBrand.swift

@@ -51,7 +51,7 @@ import UIKit
     @objc public var textCopyrightNextcloudServer:      String = "Nextcloud Server %@"
     @objc public var loginBaseUrl:                      String = "https://cloud.nextcloud.com"
     @objc public var pushNotificationServerProxy:       String = "https://push-notifications.nextcloud.com"
-    @objc public var linkLoginHost:                     String = "https://nextcloud.com/install-ios"
+    @objc public var linkLoginHost:                     String = "https://nextcloud.com/install"
     @objc public var linkloginPreferredProviders:       String = "https://nextcloud.com/signup-ios";
     @objc public var webLoginAutenticationProtocol:     String = "nc://"                                            // example "abc://"
     

+ 16 - 8
iOSClient/Login/NCLoginWeb.swift

@@ -161,9 +161,16 @@ extension NCLoginWeb: WKNavigationDelegate {
     
     func webView(_ webView: WKWebView, didFailProvisionalNavigation navigation: WKNavigation!, withError error: Error) {
         
-        let alertController = UIAlertController(title: NSLocalizedString("_error_", comment: ""), message: error.localizedDescription, preferredStyle: .alert)
+        var errorMessage = error.localizedDescription
+        
+        for (key, value) in (error as NSError).userInfo {
+            let message = "\(key) \(value)\n"
+            errorMessage = errorMessage + message
+        }
+        
+        let alertController = UIAlertController(title: NSLocalizedString("_error_", comment: ""), message: errorMessage, preferredStyle: .alert)
                     
-        alertController.addAction(UIAlertAction(title: NSLocalizedString("_yes_", comment: ""), style: .default, handler: { action in }))
+        alertController.addAction(UIAlertAction(title: NSLocalizedString("_ok_", comment: ""), style: .default, handler: { action in }))
         
         self.present(alertController, animated: true)
     }
@@ -178,15 +185,16 @@ extension NCLoginWeb: WKNavigationDelegate {
     
     func webView(_ webView: WKWebView, decidePolicyFor navigationAction: WKNavigationAction, decisionHandler: @escaping (WKNavigationActionPolicy) -> Void) {
         
-        if let data = navigationAction.request.httpBody {
-            let str = String(decoding: data, as: UTF8.self)
-            print(str)
-        }
-        
         decisionHandler(.allow)
 
         /* TEST NOT GOOD DON'T WORKS
-        guard let url = navigationAction.request.url else {
+        
+         if let data = navigationAction.request.httpBody {
+             let str = String(decoding: data, as: UTF8.self)
+             print(str)
+         }
+         
+         guard let url = navigationAction.request.url else {
             decisionHandler(.allow)
             return
         }