فهرست منبع

MDM

Signed-off-by: Marino Faggiana <marino@marinofaggiana.com>
Marino Faggiana 2 سال پیش
والد
کامیت
c9b723ff1c
3فایلهای تغییر یافته به همراه2 افزوده شده و 14 حذف شده
  1. 1 12
      iOSClient/AppDelegate.swift
  2. 0 1
      iOSClient/Brand/NCBrand.swift
  3. 1 1
      iOSClient/Login/NCAppConfigView.swift

+ 1 - 12
iOSClient/AppDelegate.swift

@@ -42,7 +42,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
     @objc var password: String = ""
 
     var deletePasswordSession: Bool = false
-    var activeAppConfigView: NCAppConfigView?
     var activeLogin: NCLogin?
     var activeLoginWeb: NCLoginWeb?
     var activeServerUrl: String = ""
@@ -476,17 +475,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
 
     @objc func openLogin(viewController: UIViewController?, selector: Int, openLoginWeb: Bool) {
 
-        // use appConfig [MDM]
-        if NCBrandOptions.shared.use_configuration {
-
-            if activeAppConfigView?.view.window == nil {
-                activeAppConfigView = UIStoryboard(name: "NCLogin", bundle: nil).instantiateViewController(withIdentifier: "NCAppConfigView") as? NCAppConfigView
-                showLoginViewController(activeAppConfigView, contextViewController: viewController)
-            }
-            return
-        }
-
-        // only for personalized LoginWeb [customer]
+        // only for personalized LoginWeb [customer] [AppConfig]
         if NCBrandOptions.shared.use_login_web_personalized {
 
             if activeLoginWeb?.view.window == nil {

+ 0 - 1
iOSClient/Brand/NCBrand.swift

@@ -31,7 +31,6 @@ import UIKit
         return instance
     }()
 
-    @objc public let configuration_bundleId: String = "com.apple.configuration.managed"
     @objc public let configuration_serverUrl: String = "serverUrl"
     @objc public let configuration_username: String = "username"
     @objc public let configuration_password: String = "password"

+ 1 - 1
iOSClient/Login/NCAppConfigView.swift

@@ -45,7 +45,7 @@ class NCAppConfigView: UIViewController {
 
         titleLabel.text = NSLocalizedString("_appconfig_view_title_", comment: "")
 
-        if let serverConfig = UserDefaults.standard.dictionary(forKey: NCBrandConfiguration.shared.configuration_bundleId) {
+        if let serverConfig = UserDefaults.standard.dictionary(forKey: "com.apple.configuration.managed") {
             serverUrl = serverConfig[NCBrandConfiguration.shared.configuration_serverUrl] as? String
             username = serverConfig[NCBrandConfiguration.shared.configuration_username] as? String
             password = serverConfig[NCBrandConfiguration.shared.configuration_password] as? String