clear code

iOSClient/CCGlobal.h

@@ -74,9 +74,6 @@
 // Passphrase test EndToEnd Encryption
 #define k_passphrase_test                               @"more over television factory tendency independence international intellectual impress interest sentence pony"
 
-// UUID
-#define k_UUID_SIM                                      @"4BACFE4A-61A6-44B1-9A85-13FD167565AB"
-
 #define k_dismissAfterSecond                            4
 
 #define k_daysOfActivity                                7

iOSClient/Utility/CCUtility.h

@@ -39,22 +39,11 @@
 
 // ===== KeyChainStore =====
 
-// ADMIN
-
-+ (void)adminRemoveIntro;
-+ (void)adminRemovePasscode;
-+ (void)adminRemoveVersion;
-
 // GET/SET
 
 + (void)deleteAllChainStore;
 + (void)storeAllChainInService;
 
-+ (NSString *)getUUID;
-
-+ (NSString *)getKeyChainPasscodeForUUID:(NSString *)uuid;
-+ (void)setKeyChainPasscodeForUUID:(NSString *)uuid conPasscode:(NSString *)passcode;
-
 + (NSString *)getVersion;
 + (NSString *)setVersion;
 

iOSClient/Utility/CCUtility.m

@@ -63,55 +63,8 @@
     }
 }
 
-#pragma ------------------------------ ADMIN
-
-+ (void)adminRemoveIntro
-{
-    NSString *version = [self getVersion];
-    [UICKeyChainStore setString:nil forKey:version service:k_serviceShareKeyChain];
-}
-
-+ (void)adminRemovePasscode
-{
-    NSString *uuid = [self getUUID];
-    [UICKeyChainStore setString:nil forKey:uuid service:k_serviceShareKeyChain];
-}
-
-+ (void)adminRemoveVersion
-{
-    [UICKeyChainStore setString:@"0.0" forKey:@"version" service:k_serviceShareKeyChain];
-}
-
 #pragma ------------------------------ GET/SET
 
-+ (NSString *)getUUID
-{
-#if TARGET_OS_SIMULATOR
-    NSUUID *deviceId = [[NSUUID alloc]initWithUUIDString:k_UUID_SIM];
-    return [deviceId UUIDString];
-#else
-    NSString *uuid = [[UIDevice currentDevice] identifierForVendor].UUIDString;
-    return uuid;
-#endif
-}
-
-+ (NSString *)getKeyChainPasscodeForUUID:(NSString *)uuid
-{
-    if (!uuid) return @"";
-    
-    NSString *passcode = [UICKeyChainStore stringForKey:uuid service:k_serviceShareKeyChain];
-    
-    if (!passcode)
-        passcode = @"";
-    
-    return passcode;
-}
-
-+ (void)setKeyChainPasscodeForUUID:(NSString *)uuid conPasscode:(NSString *)passcode
-{
-    [UICKeyChainStore setString:passcode forKey:uuid service:k_serviceShareKeyChain];
-}
-
 + (NSString *)getVersion
 {
     return [UICKeyChainStore stringForKey:@"version" service:k_serviceShareKeyChain];