privacyScreen

iOSClient/AppDelegate.swift

@@ -230,7 +230,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
         NCNetworkingProcessUpload.shared.invalidateObserveTableMetadata()
         NCNetworkingProcessUpload.shared.stopTimer()
 
-        if CCUtility.getPrivacyScreenEnabled() {
+        if NCKeychain().privacyScreenEnabled {
             showPrivacyProtectionWindow()
         }
 

iOSClient/Settings/NCSettings.m

@@ -275,7 +275,7 @@
     
     if ([[NCKeychain alloc] init].touchFaceID) [rowEnableTouchDaceID setValue:@1]; else [rowEnableTouchDaceID setValue:@0];
     if ([[NCKeychain alloc] init].requestPasscodeAtStart) [rowNotPasscodeAtStart setValue:@0]; else [rowNotPasscodeAtStart setValue:@1];
-    if ([CCUtility getPrivacyScreenEnabled]) [rowPrivacyScreen setValue:@1]; else [rowPrivacyScreen setValue:@0];
+    if ([[NCKeychain alloc] init].privacyScreenEnabled) [rowPrivacyScreen setValue:@1]; else [rowPrivacyScreen setValue:@0];
 
 
     // -----------------------------------------------------------------
@@ -310,9 +310,9 @@
     if ([rowDescriptor.tag isEqualToString:@"privacyScreen"]) {
         
         if ([[rowDescriptor.value valueData] boolValue] == YES) {
-            [CCUtility setPrivacyScreenEnabled:true];
+            [[NCKeychain alloc] init].privacyScreenEnabled = true;
         } else {
-            [CCUtility setPrivacyScreenEnabled:false];
+            [[NCKeychain alloc] init].privacyScreenEnabled = false;
         }
     }
 }

iOSClient/Utility/CCUtility.h

@@ -73,9 +73,6 @@
 + (NSInteger)getCleanUpDay;
 + (void)setCleanUpDay:(NSInteger)days;
 
-+ (BOOL)getPrivacyScreenEnabled;
-+ (void)setPrivacyScreenEnabled:(BOOL)set;
-
 // ===== Varius =====
 
 + (BOOL)addSkipBackupAttributeToItemAtURL:(NSURL *)URL;

iOSClient/Utility/CCUtility.m

@@ -234,17 +234,6 @@
     [UICKeyChainStore setString:daysString forKey:@"cleanUpDay" service:NCGlobal.shared.serviceShareKeyChain];
 }
 
-+ (BOOL)getPrivacyScreenEnabled
-{
-    return [[UICKeyChainStore stringForKey:@"privacyScreen" service:NCGlobal.shared.serviceShareKeyChain] boolValue];
-}
-
-+ (void)setPrivacyScreenEnabled:(BOOL)set
-{
-    NSString *sSet = (set) ? @"true" : @"false";
-    [UICKeyChainStore setString:sSet forKey:@"privacyScreen" service:NCGlobal.shared.serviceShareKeyChain];
-}
-
 #pragma --------------------------------------------------------------------------------------------
 #pragma mark ===== Various =====
 #pragma --------------------------------------------------------------------------------------------

iOSClient/Utility/NCKeychain.swift

@@ -227,6 +227,19 @@ import KeychainAccess
         }
     }
 
+    @objc var privacyScreenEnabled: Bool {
+        get {
+            migrate(key: "privacyScreen")
+            if let value = try? keychain.get("privacyScreen"), let result = Bool(value) {
+                return result
+            }
+            return false
+        }
+        set {
+            keychain["privacyScreen"] = String(newValue)
+        }
+    }
+
     // MARK: -
 
     private func migrate(key: String) {