setPassword

iOSClient/AppDelegate.swift

@@ -624,7 +624,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
 
         NCKeychain().clearAllKeysEndToEnd(account: account)
         CCUtility.clearAllKeysPushNotification(account)
-        CCUtility.setPassword(account, password: nil)
+        NCKeychain().setPassword(account: account, password: nil)
 
         self.account = ""
         self.urlBase = ""

iOSClient/Data/NCManageDatabase+Account.swift

@@ -106,7 +106,7 @@ extension NCManageDatabase {
                     addObject.autoUploadWWAnVideo = true
                 }
 
-                CCUtility.setPassword(account, password: password)
+                NCKeychain().setPassword(account: account, password: password)
 
                 addObject.urlBase = urlBase
                 addObject.user = user

iOSClient/Networking/NCNetworkingCheckRemoteUser.swift

@@ -52,7 +52,7 @@ class NCNetworkingCheckRemoteUser {
                         let description = String.localizedStringWithFormat(NSLocalizedString("_error_check_remote_user_", comment: ""), tableAccount.user, tableAccount.urlBase)
                         let error = NKError(errorCode: error.errorCode, errorDescription: description)
                         NCContentPresenter.shared.showError(error: error, priority: .max)
-                        CCUtility.setPassword(account, password: nil)
+                        NCKeychain().setPassword(account: account, password: nil)
                         NextcloudKit.shared.nkCommonInstance.writeLog("[INFO] Password removed.")
                     }
                 }
@@ -64,7 +64,7 @@ class NCNetworkingCheckRemoteUser {
                 let description = String.localizedStringWithFormat(NSLocalizedString("_error_check_remote_user_", comment: ""), tableAccount.user, tableAccount.urlBase)
                 let error = NKError(errorCode: error.errorCode, errorDescription: description)
                 NCContentPresenter.shared.showError(error: error, priority: .max)
-                CCUtility.setPassword(account, password: nil)
+                NCKeychain().setPassword(account: account, password: nil)
             }
         }
     }

iOSClient/Utility/CCUtility.h

@@ -64,9 +64,6 @@
 + (BOOL)getDisableCrashservice;
 + (void)setDisableCrashservice:(BOOL)disable;
 
-+ (void)setPassword:(NSString *)account password:(NSString *)password;
-//+ (NSString *)getPassword:(NSString *)account;
-
 + (void)setHCBusinessType:(NSString *)professions;
 + (NSString *)getHCBusinessType;
 

iOSClient/Utility/CCUtility.m

@@ -171,20 +171,6 @@
     [UICKeyChainStore setString:sDisable forKey:@"crashservice" service:NCGlobal.shared.serviceShareKeyChain];
 }
 
-+ (void)setPassword:(NSString *)account password:(NSString *)password
-{
-    NSString *key = [@"password" stringByAppendingString:account];
-    [UICKeyChainStore setString:password forKey:key service:NCGlobal.shared.serviceShareKeyChain];
-}
-
-+ (NSString *)getPassword:(NSString *)account
-{
-    NSString *key = [@"password" stringByAppendingString:account];
-    NSString *result = [UICKeyChainStore stringForKey:key service:NCGlobal.shared.serviceShareKeyChain];
-    if (result == nil) { result = @""; }
-    return result;
-}
-
 + (void)setHCBusinessType:(NSString *)professions
 {
     [UICKeyChainStore setString:professions forKey:@"businessType" service:NCGlobal.shared.serviceShareKeyChain];

iOSClient/Utility/NCKeychain.swift

@@ -169,6 +169,11 @@ import KeychainAccess
         return (try? keychain.get(key)) ?? ""
     }
 
+    @objc func setPassword(account: String, password: String?) {
+        let key = "password" + account
+        keychain[key] = password
+    }
+
     @objc func getOriginalFileName(key: String) -> Bool {
         migrate(key: key)
         if let value = try? keychain.get(key), let result = Bool(value) {