Marino Faggiana 6 anos atrás
pai
commit
b3e5e18995

+ 2 - 2
iOSClient/AppDelegate.m

@@ -336,7 +336,7 @@
                 _activeLoginWeb.urlBase = [[NCBrandOptions sharedInstance] loginBaseUrl];
                 
                 dispatch_async(dispatch_get_main_queue(), ^ {
-                    [_activeLoginWeb presentModalWithDefaultTheme:delegate];
+                    [_activeLoginWeb open:delegate];
                 });
             }
             return;
@@ -367,7 +367,7 @@
                 }
 
                 dispatch_async(dispatch_get_main_queue(), ^ {
-                    [_activeLoginWeb presentModalWithDefaultTheme:delegate];
+                    [_activeLoginWeb open:delegate];
                 });
             }
             

+ 1 - 1
iOSClient/Login/CCLogin.m

@@ -222,7 +222,7 @@
             appDelegate.activeLoginWeb.delegate = self;
             appDelegate.activeLoginWeb.urlBase = self.baseUrl.text;
             
-            [appDelegate.activeLoginWeb presentModalWithDefaultTheme:self];
+            [appDelegate.activeLoginWeb open:self];
         }
         
         // NO Login Flow available

+ 2 - 7
iOSClient/Login/CCLoginWeb.swift

@@ -36,23 +36,18 @@ public class CCLoginWeb: UIViewController {
     
     var viewController: UIViewController?
     let appDelegate = UIApplication.shared.delegate as! AppDelegate
-    var doneButtonVisible: Bool = false
     
-    @objc func presentModalWithDefaultTheme(_ vc: UIViewController) {
+    @objc func open(_ vc: UIViewController) {
         
         var urlString = urlBase
         self.viewController = vc
         
-        if (loginType == k_login_Add || loginType == k_login_Modify_Password) {
-            doneButtonVisible = true
-        }
-        
         // ADD k_flowEndpoint for Web Flow
         if (NCBrandOptions.sharedInstance.use_login_web_personalized == false && urlBase != NCBrandOptions.sharedInstance.linkloginPreferredProviders) {
             urlString =  urlBase+k_flowEndpoint
         }
         
-        let webVC = SwiftModalWebVC(urlString: urlString, colorText: NCBrandColor.sharedInstance.nextcloud, doneButtonVisible: doneButtonVisible, hideToolbar: true)
+        let webVC = SwiftModalWebVC(urlString: urlString, colorText: NCBrandColor.sharedInstance.nextcloud, doneButtonVisible: true, hideToolbar: true)
         webVC.delegateWeb = self
 
         vc.present(webVC, animated: false, completion: nil)