MDMMDM

Signed-off-by: Marino Faggiana <marino@marinofaggiana.com>

3 files changed, 42 insertions, 39 deletions

diff --git a/iOSClient/AppDelegate.swift b/iOSClient/AppDelegate.swift
index d44173083..23d60c9e7 100644
--- a/iOSClient/AppDelegate.swift
+++ b/iOSClient/AppDelegate.swift
@@ -475,10 +475,8 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
 
     @objc func openLogin(viewController: UIViewController?, selector: Int, openLoginWeb: Bool) {
 
-        
-        
-        // only for personalized LoginWeb [customer] [AppConfig]
-        if NCBrandOptions.shared.use_login_web_personalized {
+        // [Customers] [AppConfig]
+        if NCBrandOptions.shared.use_login_web_personalized || NCBrandOptions.shared.use_AppConfig {
 
             if activeLoginWeb?.view.window == nil {
                 activeLoginWeb = UIStoryboard(name: "NCLogin", bundle: nil).instantiateViewController(withIdentifier: "NCLoginWeb") as? NCLoginWeb
diff --git a/iOSClient/Brand/NCBrand.swift b/iOSClient/Brand/NCBrand.swift
index 4e8dbe737..a653cc52d 100755
--- a/iOSClient/Brand/NCBrand.swift
+++ b/iOSClient/Brand/NCBrand.swift
@@ -28,24 +28,6 @@ import UIKit
 @objc class NCBrandOptions: NSObject {
     @objc static let shared: NCBrandOptions = {
         let instance = NCBrandOptions()
-        // wrapper AppConfig
-        if let appconfig = UserDefaults.standard.dictionary(forKey: "com.apple.configuration.managed") {
-            if let str = appconfig[NCGlobal.shared.configuration_brand] as? String {
-                instance.brand = str
-            }
-            if let str = appconfig[NCGlobal.shared.configuration_disable_intro] as? String {
-                instance.disable_intro = (str as NSString).boolValue
-            }
-            if let str = appconfig[NCGlobal.shared.configuration_disable_multiaccount] as? String {
-                instance.disable_multiaccount = (str as NSString).boolValue
-            }
-            if let str = appconfig[NCGlobal.shared.configuration_disable_crash_service] as? String {
-                instance.disable_crash_service = (str as NSString).boolValue
-            }
-            if let str = appconfig[NCGlobal.shared.configuration_disable_log] as? String {
-                instance.disable_log = (str as NSString).boolValue
-            }
-        }
         return instance
     }()
 
@@ -75,6 +57,7 @@ import UIKit
 
     // BRAND ONLY
     @objc public var use_login_web_personalized:        Bool = false                                                // Don't touch me !!
+    @objc public var use_AppConfig:                     Bool = false                                                // Don't touch me !!
     
     // Options
     @objc public var use_default_auto_upload:           Bool = false
@@ -97,6 +80,27 @@ import UIKit
         if folderBrandAutoUpload != "" {
             folderDefaultAutoUpload = folderBrandAutoUpload
         }
+        
+        // wrapper AppConfig
+        if let appconfig = UserDefaults.standard.dictionary(forKey: "com.apple.configuration.managed"), use_AppConfig {
+            
+            if let str = appconfig[NCGlobal.shared.configuration_brand] as? String {
+                brand = str
+            }
+            if let str = appconfig[NCGlobal.shared.configuration_disable_intro] as? String {
+                disable_intro = (str as NSString).boolValue
+            }
+            if let str = appconfig[NCGlobal.shared.configuration_disable_multiaccount] as? String {
+                disable_multiaccount = (str as NSString).boolValue
+            }
+            if let str = appconfig[NCGlobal.shared.configuration_disable_crash_service] as? String {
+                disable_crash_service = (str as NSString).boolValue
+            }
+            if let str = appconfig[NCGlobal.shared.configuration_disable_log] as? String {
+                disable_log = (str as NSString).boolValue
+            }
+        }
+        
     }
 }
 
diff --git a/iOSClient/Login/NCLoginWeb.swift b/iOSClient/Login/NCLoginWeb.swift
index 230f16467..72c65303c 100644
--- a/iOSClient/Login/NCLoginWeb.swift
+++ b/iOSClient/Login/NCLoginWeb.swift
@@ -50,9 +50,25 @@ class NCLoginWeb: UIViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
 
+        // load AppConfig
+        if let serverConfig = UserDefaults.standard.dictionary(forKey: "com.apple.configuration.managed"), NCBrandOptions.shared.use_AppConfig {
+            if let serverUrl = serverConfig[NCGlobal.shared.configuration_serverUrl] as? String {
+                self.configServerUrl = serverUrl
+            }
+            if let username = serverConfig[NCGlobal.shared.configuration_username] as? String, !username.isEmpty, username.lowercased() != "username" {
+                self.configUsername = username
+            }
+            if let password = serverConfig[NCGlobal.shared.configuration_password] as? String, !password.isEmpty, password.lowercased() != "password" {
+                self.configPassword = password
+            }
+            if let apppassword = serverConfig[NCGlobal.shared.configuration_apppassword] as? String, !apppassword.isEmpty, apppassword.lowercased() != "apppassword" {
+                self.configAppPassword = apppassword
+            }
+        }
+        
         let accountCount = NCManageDatabase.shared.getAccounts()?.count ?? 0
         
-        if NCBrandOptions.shared.use_login_web_personalized  && accountCount > 0 {
+        if (NCBrandOptions.shared.use_login_web_personalized || NCBrandOptions.shared.use_AppConfig) && accountCount > 0 {
             navigationItem.leftBarButtonItem = UIBarButtonItem(barButtonSystemItem: .stop, target: self, action: #selector(self.closeView(sender:)))
         }
 
@@ -79,22 +95,7 @@ class NCLoginWeb: UIViewController {
         
         self.view.addSubview(activityIndicator)
         
-        // load AppConfig
-        if let serverConfig = UserDefaults.standard.dictionary(forKey: "com.apple.configuration.managed") {
-            if let serverUrl = serverConfig[NCGlobal.shared.configuration_serverUrl] as? String {
-                self.configServerUrl = serverUrl
-            }
-            if let username = serverConfig[NCGlobal.shared.configuration_username] as? String, !username.isEmpty, username.lowercased() != "username" {
-                self.configUsername = username
-            }
-            if let password = serverConfig[NCGlobal.shared.configuration_password] as? String, !password.isEmpty, password.lowercased() != "password" {
-                self.configPassword = password
-            }
-            if let apppassword = serverConfig[NCGlobal.shared.configuration_apppassword] as? String, !apppassword.isEmpty, apppassword.lowercased() != "apppassword" {
-                self.configAppPassword = apppassword
-            }
-        }
-        
+        // AppConfig
         if let serverUrl = configServerUrl {
             if let username = self.configUsername, let password = configAppPassword {
                 activityIndicator.stopAnimating()