accountRequest

iOSClient/AppDelegate.swift

@@ -676,7 +676,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
     func requestAccount() {
 
         if isPasscodePresented() { return }
-        if !CCUtility.getAccountRequest() { return }
+        if !NCKeychain().accountRequest { return }
 
         let accounts = NCManageDatabase.shared.getAllAccount()
 

iOSClient/Settings/CCManageAccount.m

@@ -123,7 +123,7 @@
             [row.cellConfig setObject:[[UIImage imageNamed:@"users"] imageWithColor:UIColor.systemGrayColor size:25] forKey:@"imageView.image"];
             [row.cellConfig setObject:[UIFont systemFontOfSize:15.0] forKey:@"textLabel.font"];
             [row.cellConfig setObject:UIColor.labelColor forKey:@"textLabel.textColor"];
-            if ([CCUtility getAccountRequest]) row.value = @1;
+            if ([[NCKeychain alloc] init].accountRequest) row.value = @1;
             else row.value = @0;
             [section addFormRow:row];
         }
@@ -205,7 +205,6 @@
         [row.cellConfig setObject:UIColor.labelColor forKey:@"textLabel.textColor"];
         [row.cellConfig setObject:[[UIImage imageNamed:@"country"] imageWithColor:UIColor.systemGrayColor size:25] forKey:@"imageView.image"];
         row.value = [[NSLocale systemLocale] displayNameForKey:NSLocaleCountryCode value:activeAccount.country];
-        //NSArray *countryCodes = [NSLocale ISOCountryCodes];
         [section addFormRow:row];
     }
     
@@ -306,9 +305,9 @@
     if ([rowDescriptor.tag isEqualToString:@"accountRequest"]) {
         
         if ([[rowDescriptor.value valueData] boolValue] == YES) {
-            [CCUtility setAccountRequest:true];
+            [[NCKeychain alloc] init].accountRequest = true;
         } else {
-            [CCUtility setAccountRequest:false];
+            [[NCKeychain alloc] init].accountRequest = false;
         }
     }
     

iOSClient/Utility/CCUtility.h

@@ -70,9 +70,6 @@
 + (double)getQualityScanDocument;
 + (void)setQualityScanDocument:(double)value;
 
-+ (BOOL)getAccountRequest;
-+ (void)setAccountRequest:(BOOL)set;
-
 + (NSInteger)getCleanUpDay;
 + (void)setCleanUpDay:(NSInteger)days;
 

iOSClient/Utility/CCUtility.m

@@ -216,17 +216,6 @@
     [UICKeyChainStore setString:valueString forKey:@"qualityScanDocument" service:NCGlobal.shared.serviceShareKeyChain];
 }
 
-+ (BOOL)getAccountRequest
-{
-    return [[UICKeyChainStore stringForKey:@"accountRequest" service:NCGlobal.shared.serviceShareKeyChain] boolValue];
-}
-
-+ (void)setAccountRequest:(BOOL)set
-{
-    NSString *sSet = (set) ? @"true" : @"false";
-    [UICKeyChainStore setString:sSet forKey:@"accountRequest" service:NCGlobal.shared.serviceShareKeyChain];
-}
-
 + (NSInteger)getCleanUpDay
 {
     NSString *size = [UICKeyChainStore stringForKey:@"cleanUpDay" service:NCGlobal.shared.serviceShareKeyChain];

iOSClient/Utility/NCKeychain.swift

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