Enforce lock option for MDM

Brand/NCBrand.swift

@@ -72,6 +72,7 @@ let userAgent: String = {
     var disable_show_more_nextcloud_apps_in_settings: Bool = false
     var doNotAskPasscodeAtStartup: Bool = false
     var disable_source_code_in_settings: Bool = false
+    var enforce_protection = true
 
     // (name: "Name 1", url: "https://cloud.nextcloud.com"),(name: "Name 2", url: "https://cloud.nextcloud.com")
     var enforce_servers: [(name: String, url: String)] = []
@@ -117,6 +118,9 @@ let userAgent: String = {
             if let str = configurationManaged[NCGlobal.shared.configuration_disable_openin_file] as? String {
                 disable_openin_file = (str as NSString).boolValue
             }
+            if let str = configurationManaged[NCGlobal.shared.configuration_enforce_protection] as? String {
+                enforce_protection = (str as NSString).boolValue
+            }
         }
     }
 

iOSClient/Main/NCMainTabBarController.swift

@@ -22,6 +22,7 @@
 //
 
 import UIKit
+import SwiftUI
 
 struct NavigationCollectionViewCommon {
     var serverUrl: String
@@ -55,6 +56,13 @@ class NCMainTabBarController: UITabBarController {
     override func viewDidAppear(_ animated: Bool) {
         super.viewDidAppear(animated)
         previousIndex = selectedIndex
+
+        if NCBrandOptions.shared.enforce_protection && NCKeychain().passcode.isEmptyOrNil {
+            let vc = UIHostingController(rootView: SetupPasscodeView(isLockActive: .constant(false)))
+            vc.isModalInPresentation = true
+
+            present(vc, animated: true)
+        }
     }
 
     @objc func changeTheming(_ notification: NSNotification) {

iOSClient/NCGlobal.swift

@@ -379,6 +379,7 @@ class NCGlobal: NSObject {
     let configuration_disable_log                               = "disable_log"
     let configuration_disable_more_external_site                = "disable_more_external_site"
     let configuration_disable_openin_file                       = "disable_openin_file"
+    let configuration_enforce_protection                        = "enforce_protection"
 
     // MORE NEXTCLOUD APPS
     //

iOSClient/SceneDelegate.swift

@@ -26,6 +26,7 @@ import UIKit
 import NextcloudKit
 import WidgetKit
 import SwiftEntryKit
+import SwiftUI
 
 class SceneDelegate: UIResponder, UIWindowSceneDelegate {
     var window: UIWindow?

iOSClient/Settings/Settings/NCSettingsModel.swift

@@ -53,6 +53,8 @@ class NCSettingsModel: ObservableObject, ViewOnAppearHandling {
         NCSession.shared.getSession(controller: controller)
     }
 
+    var changePasscode = false
+
     /// Initializes the view model with default values.
     init(controller: NCMainTabBarController?) {
         self.controller = controller
@@ -112,13 +114,14 @@ class NCSettingsModel: ObservableObject, ViewOnAppearHandling {
     }
 }
 
-struct PasscodeView: UIViewControllerRepresentable {
+struct SetupPasscodeView: UIViewControllerRepresentable {
     @Binding var isLockActive: Bool
+    var changePasscode = false
 
     func makeUIViewController(context: Context) -> UIViewController {
         let laContext = LAContext()
         var error: NSError?
-        if NCKeychain().passcode != nil {
+        if NCKeychain().passcode != nil, !changePasscode {
             let passcodeViewController = TOPasscodeViewController(passcodeType: .sixDigits, allowCancel: true)
             passcodeViewController.keypadButtonShowLettering = false
             if NCKeychain().touchFaceID && laContext.canEvaluatePolicy(.deviceOwnerAuthenticationWithBiometrics, error: &error) {
@@ -138,6 +141,13 @@ struct PasscodeView: UIViewControllerRepresentable {
             }
             passcodeViewController.delegate = context.coordinator
             return passcodeViewController
+        } else if changePasscode {
+            let passcodeSettingsViewController = TOPasscodeSettingsViewController()
+            passcodeSettingsViewController.hideOptionsButton = true
+//            passcodeSettingsViewController.requireCurrentPasscode = true
+            passcodeSettingsViewController.passcodeType = .sixDigits
+            passcodeSettingsViewController.delegate = context.coordinator
+            return passcodeSettingsViewController
         } else {
             let passcodeSettingsViewController = TOPasscodeSettingsViewController()
             passcodeSettingsViewController.hideOptionsButton = true
@@ -157,8 +167,8 @@ struct PasscodeView: UIViewControllerRepresentable {
     }
 
     class Coordinator: NSObject, TOPasscodeSettingsViewControllerDelegate, TOPasscodeViewControllerDelegate {
-        var parent: PasscodeView
-        init(_ parent: PasscodeView) {
+        var parent: SetupPasscodeView
+        init(_ parent: SetupPasscodeView) {
             self.parent = parent
         }
 

iOSClient/Settings/Settings/NCSettingsView.swift

@@ -31,6 +31,8 @@ struct NCSettingsView: View {
     @State private var showAcknowledgements = false
     /// State to control the visibility of the passcode view
     @State private var showPasscode = false
+    /// State to contorl the visibility of the change passcode view
+    @State private var showChangePasscode = false
     /// State to control the visibility of the Policy view
     @State private var showBrowser = false
     /// State to control the visibility of the Source Code  view
@@ -57,7 +59,6 @@ struct NCSettingsView: View {
                     }
                     .font(.system(size: 16))
                 }
-            }, header: {
             }, footer: {
                 Text(NSLocalizedString("_autoupload_description_", comment: ""))
             })
@@ -73,49 +74,69 @@ struct NCSettingsView: View {
                             .font(Font.system(.body).weight(.light))
                             .foregroundColor(Color(NCBrandColor.shared.iconImageColor))
                             .frame(width: 20, height: 20)
+                            .opacity(NCBrandOptions.shared.enforce_protection ? 0.5 : 1)
                         Text(model.isLockActive ? NSLocalizedString("_lock_active_", comment: "") : NSLocalizedString("_lock_not_active_", comment: ""))
                     }
                     .font(.system(size: 16))
                 })
                 .tint(Color(NCBrandColor.shared.textColor))
-                .sheet(isPresented: $showPasscode) {
-                    PasscodeView(isLockActive: $model.isLockActive)
+                .disabled(NCBrandOptions.shared.enforce_protection)
+            }, header: {
+                Text(NSLocalizedString("_privacy_", comment: ""))
+            }, footer: {
+                if NCBrandOptions.shared.enforce_protection {
+                    Text(NSLocalizedString("_lock_cannot_disable_mdm_", comment: ""))
                 }
-                /// Enable Touch ID
-                Toggle(NSLocalizedString("_enable_touch_face_id_", comment: ""), isOn: $model.enableTouchID)
-                    .tint(Color(NCBrandColor.shared.getElement(account: model.session.account)))
-                    .font(.system(size: 16))
-                    .onChange(of: model.enableTouchID) { _ in
-                        model.updateTouchIDSetting()
-                    }
-                /// Lock no screen
-                Toggle(NSLocalizedString("_lock_protection_no_screen_", comment: ""), isOn: $model.lockScreen)
-                    .tint(Color(NCBrandColor.shared.getElement(account: model.session.account)))
-                    .font(.system(size: 16))
-                    .onChange(of: model.lockScreen) { _ in
-                        model.updateLockScreenSetting()
+            })
+
+            if model.isLockActive {
+                Section(content: {
+                    Group {
+                        // Change passcode
+                        Button(action: {
+                            showChangePasscode.toggle()
+                        }, label: {
+                            VStack {
+                                Text(NSLocalizedString("_change_lock_passcode_", comment: ""))
+                                    .tint(Color(NCBrandColor.shared.textColor))
+                            }
+                            .font(.system(size: 16))
+                        })
+                        /// Enable Touch ID
+                        Toggle(NSLocalizedString("_enable_touch_face_id_", comment: ""), isOn: $model.enableTouchID)
+                            .onChange(of: model.enableTouchID) { _ in
+                                model.updateTouchIDSetting()
+                            }
+                        /// Lock no screen
+                        Toggle(NSLocalizedString("_lock_protection_no_screen_", comment: ""), isOn: $model.lockScreen)
+                            .onChange(of: model.lockScreen) { _ in
+                                model.updateLockScreenSetting()
+                            }
+
+                        /// Reset app wrong attempts
+                        Toggle(NSLocalizedString("_reset_wrong_passcode_", comment: ""), isOn: $model.resetWrongAttempts)
+                            .onChange(of: model.resetWrongAttempts) { _ in
+                                model.updateResetWrongAttemptsSetting()
+                            }
+                            .font(.system(size: 16))
                     }
+                }, footer: {
+                    Text(NSLocalizedString("_lock_protection_no_screen_footer_", comment: "") + "\n" + String(format: NSLocalizedString("_reset_wrong_passcode_desc_", comment: ""), NCBrandOptions.shared.resetAppPasscodeAttempts))
+                        .font(.system(size: 12))
+                        .lineSpacing(1)
+                })
+                .tint(Color(NCBrandColor.shared.getElement(account: model.session.account)))
+            }
+
+            Section {
                 /// Privacy screen
                 Toggle(NSLocalizedString("_privacy_screen_", comment: ""), isOn: $model.privacyScreen)
-                    .tint(Color(NCBrandColor.shared.getElement(account: model.session.account)))
-                    .font(.system(size: 16))
                     .onChange(of: model.privacyScreen) { _ in
                         model.updatePrivacyScreenSetting()
                     }
-                /// Reset app wrong attempts
-                Toggle(NSLocalizedString("_reset_wrong_passcode_", comment: ""), isOn: $model.resetWrongAttempts)
-                    .tint(Color(NCBrandColor.shared.getElement(account: model.session.account)))
-                    .font(.system(size: 16))
-                    .onChange(of: model.resetWrongAttempts) { _ in
-                        model.updateResetWrongAttemptsSetting()
-                    }
-            }, header: {
-                Text(NSLocalizedString("_privacy_", comment: ""))
-            }, footer: {
-                Text(NSLocalizedString("_lock_protection_no_screen_footer_", comment: "") + "\n" + String(format: NSLocalizedString("_reset_wrong_passcode_desc_", comment: ""), NCBrandOptions.shared.resetAppPasscodeAttempts))
-                    .font(.system(size: 12))
-                    .lineSpacing(1)
-            })
+            }
+            .tint(Color(NCBrandColor.shared.getElement(account: model.session.account)))
+
             /// Display
             Section(header: Text(NSLocalizedString("_display_", comment: "")), content: {
                 NavigationLink(destination: LazyView {
@@ -266,6 +287,12 @@ struct NCSettingsView: View {
                 Text(model.footerApp + model.footerServer + model.footerSlogan)
             })
         }
+        .sheet(isPresented: $showPasscode) {
+            SetupPasscodeView(isLockActive: $model.isLockActive)
+        }
+        .sheet(isPresented: $showChangePasscode) {
+            SetupPasscodeView(isLockActive: $model.isLockActive, changePasscode: true)
+        }
         .navigationBarTitle(NSLocalizedString("_settings_", comment: ""))
         .defaultViewModifier(model)
     }