cod

iOSClient/Utility/CCUtility.m

@@ -63,27 +63,6 @@
 
 #pragma ------------------------------ GET/SET
 
-+ (NSString *)getPasscode
-{
-    return [UICKeyChainStore stringForKey:@"passcodeBlock" service:NCGlobal.shared.serviceShareKeyChain];
-}
-
-+ (void)setPasscode:(NSString *)passcode
-{
-    [UICKeyChainStore setString:passcode forKey:@"passcodeBlock" service:NCGlobal.shared.serviceShareKeyChain];
-}
-
-+ (BOOL)getNotPasscodeAtStart
-{
-    return [[UICKeyChainStore stringForKey:@"notPasscodeAtStart" service:NCGlobal.shared.serviceShareKeyChain] boolValue];
-}
-
-+ (void)setNotPasscodeAtStart:(BOOL)set
-{
-    NSString *sSet = (set) ? @"true" : @"false";
-    [UICKeyChainStore setString:sSet forKey:@"notPasscodeAtStart" service:NCGlobal.shared.serviceShareKeyChain];
-}
-
 + (BOOL)getEnableTouchFaceID
 {
     NSString *valueString = [UICKeyChainStore stringForKey:@"enableTouchFaceID" service:NCGlobal.shared.serviceShareKeyChain];

iOSClient/Utility/NCKeychain.swift

@@ -27,11 +27,12 @@ import KeychainAccess
 class NCKeychain {
 
     let keychain = Keychain(service: "com.nextcloud.keychain")
+    let keychainOLD = Keychain(service: NCGlobal.shared.serviceShareKeyChain)
 
     var typeFilterScanDocument: NCGlobal.TypeFilterScanDocument {
         get {
-            if let rawValue = try? keychain.get("ScanDocumentTypeFilter"), let result = NCGlobal.TypeFilterScanDocument(rawValue: rawValue) {
-                return result
+            if let rawValue = try? keychain.get("ScanDocumentTypeFilter"), let value = NCGlobal.TypeFilterScanDocument(rawValue: rawValue) {
+                return value
             } else {
                 return .original
             }
@@ -40,4 +41,22 @@ class NCKeychain {
             keychain["ScanDocumentTypeFilter"] = newValue.rawValue
         }
     }
+
+    var passcode: String {
+        get {
+            /* MIGRATION OLD */
+            if let value = keychainOLD["passcodeBlock"], !value.isEmpty {
+                keychain["passcodeBlock"] = value
+                keychainOLD["passcodeBlock"] = nil
+            }
+            if let value = try? keychain.get("passcodeBlock") {
+                return value
+            } else {
+                return ""
+            }
+        }
+        set {
+            keychain["passcodeBlock"] = newValue
+        }
+    }
 }