new settings for : preferred provider

iOSClient/AppDelegate.m

@@ -323,7 +323,7 @@
 
 - (void)openLoginView:(id)delegate loginType:(NSInteger)loginType selector:(NSInteger)selector
 {
-    BOOL loginWeb = NO;
+    BOOL loginWebFlow = NO;
     
     @synchronized (self) {
 
@@ -351,17 +351,22 @@
         if (loginType == k_login_Modify_Password) {
             tableAccount *account = [[NCManageDatabase sharedInstance] getAccountActive];
             if (account.loginFlow)
-                loginWeb = YES;
+                loginWebFlow = YES;
         }
             
-        if (loginWeb) {
+        if (loginWebFlow || selector == k_intro_signup) {
             
             if (_activeLoginWeb == nil) {
                 
                 _activeLoginWeb = [CCLoginWeb new];
                 _activeLoginWeb.delegate = delegate;
                 _activeLoginWeb.loginType = loginType;
-                _activeLoginWeb.urlBase = self.activeUrl;
+                
+                if (selector == k_intro_signup) {
+                    _activeLoginWeb.urlBase = [[NCBrandOptions sharedInstance] loginPreferredProviders];
+                } else {
+                    _activeLoginWeb.urlBase = self.activeUrl;
+                }
 
                 dispatch_async(dispatch_get_main_queue(), ^ {
                     [_activeLoginWeb presentModalWithDefaultTheme:delegate];
@@ -382,6 +387,8 @@
             }
         }
         
+        
+        
     }
 }
 

iOSClient/Brand/NCBrand.swift

@@ -68,41 +68,42 @@ class NCBrandColor: NSObject {
         return instance
     }()
     
-    @objc public let brand:                           String = "Nextcloud"
-    @objc public let mailMe:                          String = "ios@nextcloud.com"
-    @objc public let textCopyrightNextcloudiOS:       String = "Nextcloud for iOS %@ © 2018 T.W.S. Inc."
-    @objc public let textCopyrightNextcloudServer:    String = "Nextcloud Server %@"
-    @objc public let loginBaseUrl:                    String = "https://cloud.twsweb.it"
-    @objc public let pushNotificationServer:          String = "https://push-notifications.nextcloud.com"
-    @objc public let linkLoginProvider:               String = "https://nextcloud.com/providers"
-    @objc public let textLoginProvider:               String = "_login_bottom_label_"
-    @objc public let middlewarePingUrl:               String = ""
-    @objc public let webLoginAutenticationProtocol:   String = "nc://"                                          // example "abc://"
+    @objc public let brand:                             String = "Nextcloud"
+    @objc public let mailMe:                            String = "ios@nextcloud.com"
+    @objc public let textCopyrightNextcloudiOS:         String = "Nextcloud for iOS %@ © 2018 T.W.S. Inc."
+    @objc public let textCopyrightNextcloudServer:      String = "Nextcloud Server %@"
+    @objc public let loginBaseUrl:                      String = "https://cloud.twsweb.it"
+    @objc public let loginPreferredProviders:           String = "https://nextcloud.com/register";
+    @objc public let pushNotificationServer:            String = "https://push-notifications.nextcloud.com"
+    @objc public let linkLoginProvider:                 String = "https://nextcloud.com/providers"
+    @objc public let textLoginProvider:                 String = "_login_bottom_label_"
+    @objc public let middlewarePingUrl:                 String = ""
+    @objc public let webLoginAutenticationProtocol:     String = "nc://"                                          // example "abc://"
     // Personalized
-    @objc public let webCloseViewProtocolPersonalized:String = ""                                               // example "abc://change/plan"      Don't touch me !!
-    @objc public let folderBrandAutoUpload:           String = ""                                               // example "_auto_upload_folder_"   Don't touch me !!
+    @objc public let webCloseViewProtocolPersonalized:  String = ""                                               // example "abc://change/plan"      Don't touch me !!
+    @objc public let folderBrandAutoUpload:             String = ""                                               // example "_auto_upload_folder_"   Don't touch me !!
 
     // Auto Upload default folder
-    @objc public var folderDefaultAutoUpload:         String = "Photos"
+    @objc public var folderDefaultAutoUpload:           String = "Photos"
     
     // Capabilities Group
-    @objc public let capabilitiesGroups:              String = "group.it.twsweb.Crypto-Cloud"
+    @objc public let capabilitiesGroups:                String = "group.it.twsweb.Crypto-Cloud"
     
     // Options
-    @objc public let use_login_web_personalized:      Bool = false                                              // Don't touch me !!
-    @objc public let use_firebase:                    Bool = false
-    @objc public let use_default_auto_upload:         Bool = false
-    @objc public let use_themingColor:                Bool = true
-    @objc public let use_themingBackground:           Bool = true
-    @objc public let use_middlewarePing:              Bool = false
-    @objc public let use_storeLocalAutoUploadAll:     Bool = false
+    @objc public let use_login_web_personalized:        Bool = false                                              // Don't touch me !!
+    @objc public let use_firebase:                      Bool = false
+    @objc public let use_default_auto_upload:           Bool = false
+    @objc public let use_themingColor:                  Bool = true
+    @objc public let use_themingBackground:             Bool = true
+    @objc public let use_middlewarePing:                Bool = false
+    @objc public let use_storeLocalAutoUploadAll:       Bool = false
     
-    @objc public let disable_intro:                   Bool = false
-    @objc public let disable_linkLoginProvider:       Bool = false
-    @objc public let disable_request_login_url:       Bool = false
-    @objc public let disable_multiaccount:            Bool = false
-    @objc public let disable_manage_account:          Bool = false
-    @objc public let disable_more_external_site:      Bool = false
+    @objc public let disable_intro:                     Bool = false
+    @objc public let disable_linkLoginProvider:         Bool = false
+    @objc public let disable_request_login_url:         Bool = false
+    @objc public let disable_multiaccount:              Bool = false
+    @objc public let disable_manage_account:            Bool = false
+    @objc public let disable_more_external_site:        Bool = false
     
     override init() {
         

iOSClient/Login/CCLoginWeb.swift

@@ -47,7 +47,8 @@ public class CCLoginWeb: UIViewController {
             doneButtonVisible = true
         }
         
-        if (NCBrandOptions.sharedInstance.use_login_web_personalized == false) {
+        // ADD k_flowEndpoint for Web Flow
+        if (NCBrandOptions.sharedInstance.use_login_web_personalized == false && urlBase != NCBrandOptions.sharedInstance.loginPreferredProviders) {
             urlString =  urlBase+k_flowEndpoint
         }
         

iOSClient/Main/CCSplit.m

@@ -168,6 +168,9 @@
             break;
             
         case k_intro_signup:
+            {
+                [appDelegate openLoginView:self loginType:k_login_Add_Forced selector:k_intro_signup];
+            }
             break;
     }
 }