Merge pull request #1079 from Infomaniak/fix-webpersonalized

Fix web personalized

iOSClient/Brand/NCBrand.swift

@@ -71,7 +71,7 @@ import UIKit
     @objc public var userAgent:                         String = "Nextcloud-iOS"                                    // Don't touch me !!
     
     // Options
-    @objc public var use_login_web_personalized:        Bool = false                                                // Don't touch me !!
+    @objc public var use_login_web_personalized:        Bool = false
     @objc public var use_default_auto_upload:           Bool = false
     @objc public var use_themingColor:                  Bool = true
     @objc public var use_themingBackground:             Bool = true

iOSClient/Login/NCLoginWeb.swift

@@ -34,6 +34,14 @@ class NCLoginWeb: UIViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
         
+        if (NCBrandOptions.sharedInstance.use_login_web_personalized) {
+            if let accountCount = NCManageDatabase.sharedInstance.getAccounts()?.count {
+                if(accountCount > 0) {
+                    self.navigationItem.leftBarButtonItem = UIBarButtonItem.init(barButtonSystemItem: .stop, target: self, action: #selector(self.closeView(sender:)))
+                }
+            }
+        }
+        
         let config = WKWebViewConfiguration()
         config.websiteDataStore = WKWebsiteDataStore.nonPersistent()
 
@@ -47,7 +55,7 @@ class NCLoginWeb: UIViewController {
         webView!.bottomAnchor.constraint(equalTo: view.bottomAnchor, constant: 0).isActive = true
         
         // ADD k_flowEndpoint for Web Flow
-        if NCBrandOptions.sharedInstance.use_login_web_personalized == false && urlBase != NCBrandOptions.sharedInstance.linkloginPreferredProviders {
+        if urlBase != NCBrandOptions.sharedInstance.linkloginPreferredProviders {
             urlBase =  urlBase + k_flowEndpoint
         }
         
@@ -85,6 +93,10 @@ class NCLoginWeb: UIViewController {
         webView.load(request)
     }
     
+    @objc func closeView(sender: UIBarButtonItem) {
+        self.dismiss(animated: true, completion: nil)
+    }
+    
 }
 
 extension NCLoginWeb: WKNavigationDelegate {