marinofaggiana преди 5 години
родител
ревизия
77522c480a
променени са 4 файла, в които са добавени 8 реда и са изтрити 19 реда
  1. 0 9
      iOSClient/Database/NCManageDatabase.swift
  2. 2 2
      iOSClient/Networking/NCService.swift
  3. 2 2
      iOSClient/Utility/CCUtility.h
  4. 4 6
      iOSClient/Utility/CCUtility.m

+ 0 - 9
iOSClient/Database/NCManageDatabase.swift

@@ -238,15 +238,6 @@ class NCManageDatabase: NSObject {
         }
         
         CCUtility.setPassword(account, password: password)
-        
-        // Third Parts:
-        //
-        // HC
-        //
-        let professions = CCUtility.getHCBusinessType(account)
-        if professions != nil && professions!.count > 0 {
-            CCUtility.setHCBusinessType(account, professions: professions)
-        }
     
         addObject.url = url
         addObject.user = user

+ 2 - 2
iOSClient/Networking/NCService.swift

@@ -319,11 +319,11 @@ class NCService: NSObject {
     
     private func requestHC() {
         
-        let professions = CCUtility.getHCBusinessType("")
+        let professions = CCUtility.getHCBusinessType()
         if professions != nil && professions!.count > 0 {
             OCNetworking.sharedManager()?.putHCUserProfile(withAccount: appDelegate.activeAccount, serverUrl: appDelegate.activeUrl, professions: professions, completion: { (account, message, errorCode) in
                 if errorCode == 0 && account == self.appDelegate.activeAccount {
-                    CCUtility.setHCBusinessType("", professions: nil)
+                    CCUtility.setHCBusinessType(nil)
                     OCNetworking.sharedManager()?.getHCUserProfile(withAccount: self.appDelegate.activeAccount, serverUrl: self.appDelegate.activeUrl, completion: { (account, userProfile, message, errorCode) in
                         if errorCode == 0 && account == self.appDelegate.activeAccount {
                             _ = NCManageDatabase.sharedInstance.setAccountUserProfile(userProfile!)

+ 2 - 2
iOSClient/Utility/CCUtility.h

@@ -156,8 +156,8 @@
 + (void)setPassword:(NSString *)account password:(NSString *)password;
 + (NSString *)getPassword:(NSString *)account;
 
-+ (void)setHCBusinessType:(NSString *)account professions:(NSString *)professions;
-+ (NSString *)getHCBusinessType:(NSString *)account;
++ (void)setHCBusinessType:(NSString *)professions;
++ (NSString *)getHCBusinessType;
 
 // ===== Varius =====
 

+ 4 - 6
iOSClient/Utility/CCUtility.m

@@ -591,16 +591,14 @@
     return [UICKeyChainStore stringForKey:key service:k_serviceShareKeyChain];
 }
 
-+ (void)setHCBusinessType:(NSString *)account professions:(NSString *)professions
++ (void)setHCBusinessType:(NSString *)professions
 {
-    NSString *key = [@"businessType" stringByAppendingString:account];
-    [UICKeyChainStore setString:professions forKey:key service:k_serviceShareKeyChain];
+    [UICKeyChainStore setString:professions forKey:@"businessType" service:k_serviceShareKeyChain];
 }
 
-+ (NSString *)getHCBusinessType:(NSString *)account
++ (NSString *)getHCBusinessType
 {
-    NSString *key = [@"businessType" stringByAppendingString:account];
-    return [UICKeyChainStore stringForKey:key service:k_serviceShareKeyChain];
+    return [UICKeyChainStore stringForKey:@"businessType" service:k_serviceShareKeyChain];
 }
 
 #pragma --------------------------------------------------------------------------------------------