Improvements

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

iOSClient/AppDelegate.swift

@@ -297,8 +297,8 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
        
     private func showPrivacyProtectionWindow() {
         
-        if isPasscodePresented() { return }
         if !CCUtility.getPrivacyScreen() { return }
+        if CCUtility.isPasscodeEnableAtStart() { return }
         
         privacyProtectionWindow = UIWindow(frame: UIScreen.main.bounds)
           
@@ -739,7 +739,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
         }
                 
         if account == "" { return }
-        if CCUtility.getPasscode().count == 0 || CCUtility.getNotPasscodeAtStart() { return }
+        if !CCUtility.isPasscodeEnableAtStart() { return }
                 
         // Dismiss present window?.rootViewController? [ONLY PASSCODE]
         let presentedViewController = window?.rootViewController?.presentedViewController
@@ -778,7 +778,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
         
         if account == "" { return }
         if !CCUtility.getEnableTouchFaceID() { return }
-        if CCUtility.getPasscode().count == 0 || CCUtility.getNotPasscodeAtStart() { return }
+        if !CCUtility.isPasscodeEnableAtStart() { return }
         guard let passcodeViewController = window?.rootViewController?.presentedViewController as? TOPasscodeViewController else { return }
 
         LAContext().evaluatePolicy(.deviceOwnerAuthenticationWithBiometrics, localizedReason: NCBrandOptions.shared.brand) { (success, error) in

iOSClient/Utility/CCUtility.h

@@ -51,6 +51,8 @@
 + (BOOL)getEnableTouchFaceID;
 + (void)setEnableTouchFaceID:(BOOL)set;
 
++ (BOOL)isPasscodeEnableAtStart;
+
 + (NSString *)getGroupBySettings;
 + (void)setGroupBySettings:(NSString *)groupby;
 

iOSClient/Utility/CCUtility.m

@@ -103,6 +103,12 @@
     [UICKeyChainStore setString:sSet forKey:@"enableTouchFaceID" service:NCGlobal.shared.serviceShareKeyChain];
 }
 
++ (BOOL)isPasscodeEnableAtStart
+{
+    if ([self getPasscode].length > 0 && ![self getNotPasscodeAtStart]) return true;
+    else return false;
+}
+
 + (NSString *)getGroupBySettings
 {
     NSString *groupby = [UICKeyChainStore stringForKey:@"groupby" service:NCGlobal.shared.serviceShareKeyChain];