accountsForService 里面的账号密码还需要在取一下

wanghengheng · wanghengheng · commit 908f5f1ee358 · 2015-07-08T14:46:01.000+08:00
diff --git a/Coding_iOS/Ease_2FA/Controllers/OTPListViewController.m b/Coding_iOS/Ease_2FA/Controllers/OTPListViewController.m
@@ -32,15 +32,43 @@ @interface OTPListViewController ()<UITableViewDataSource, UITableViewDelegate>
 
 @implementation OTPListViewController
 
++ (NSData *)passwordDataForService:(NSString *)serviceName account:(NSString *)account{
+    if (serviceName.length <= 0 || account.length <= 0) {
+        return nil;
+    }
+    SSKeychainQuery *query = [[SSKeychainQuery alloc] init];
+    query.service = serviceName;
+    query.account = account;
+    [query fetch:nil];
+    return query.passwordData;
+}
+
++ (NSMutableArray *)loadKeychainAuthURLs{
+    NSArray *otpAccountList = [SSKeychain accountsForService:kOTPService];
+    NSMutableArray *authURLs = [NSMutableArray arrayWithCapacity:otpAccountList.count];
+    for (NSDictionary *otpAccount in otpAccountList) {
+        NSData *passwordData = [self passwordDataForService:kOTPService account:otpAccount[(__bridge id)kSecAttrAccount]];
+        if (passwordData) {
+            NSMutableDictionary *tempDict = [otpAccount mutableCopy];
+            tempDict[(__bridge id)kSecValueData] = passwordData;
+            OTPAuthURL *authURL = [OTPAuthURL ease_authURLWithKeychainDictionary:tempDict];
+            if (authURL) {
+                [authURLs addObject:authURL];
+            }
+        }
+    }
+    return authURLs;
+}
+
 +(NSString *)otpCodeWithGK:(NSString *)global_key{
     NSString *otpCode = nil;
     if (global_key.length > 0) {
-        NSArray *otpAccountDictList = [SSKeychain accountsForService:kOTPService];
-        for (NSDictionary *obj in otpAccountDictList) {
-            NSString *name = obj[(__bridge id)kSecAttrAccount];
-            name = [[name componentsSeparatedByString:@"@"] firstObject];
-            if ([name isEqualToString:global_key]) {
-                OTPAuthURL *authURL = [OTPAuthURL ease_authURLWithKeychainDictionary:obj];
+        NSMutableArray *authURLs = [self loadKeychainAuthURLs];
+        for (OTPAuthURL *authURL in authURLs) {
+            NSString *cur_issure = authURL.issuer;
+            NSString *cur_global_key = [[authURL.name componentsSeparatedByString:@"@"] firstObject];
+            if ([cur_issure isEqualToString:@"Coding"] &&
+                [cur_global_key isEqualToString:global_key]) {
                 otpCode = authURL.otpCode;
                 break;
             }
@@ -52,18 +80,7 @@ +(NSString *)otpCodeWithGK:(NSString *)global_key{
 - (void)viewDidLoad{
     [super viewDidLoad];
     self.title = @"&#36523;&#20221;&#39564;&#35777;&#22120;";
-    [self loadKeychainArray];
-}
-
-- (void)loadKeychainArray{
-    NSArray *otpAccountDictList = [SSKeychain accountsForService:kOTPService];
-    self.authURLs = [NSMutableArray arrayWithCapacity:[otpAccountDictList count]];
-    for (NSDictionary *otpAccountDict in otpAccountDictList) {
-        OTPAuthURL *authURL = [OTPAuthURL ease_authURLWithKeychainDictionary:otpAccountDict];
-        if (authURL) {
-            [self.authURLs addObject:authURL];
-        }
-    }
+    self.authURLs = [[self class] loadKeychainAuthURLs];
 }
 
 - (void)viewWillAppear:(BOOL)animated{
diff --git a/Coding_iOS/Ease_2FA/Views/Cell/OTPTableViewCell.m b/Coding_iOS/Ease_2FA/Views/Cell/OTPTableViewCell.m
@@ -83,7 +83,7 @@ - (void)updateUI{
         }];
     }
     _issuerLabel.text = _authURL.issuer;
-    _passwordLabel.text = _authURL.otpCode;
+    _passwordLabel.text = _authURL.otpCode.length < 6? _authURL.otpCode: [_authURL.otpCode stringByReplacingCharactersInRange:NSMakeRange(3, 0) withString:@" "];
     _nameLabel.text = _authURL.name;
 }
 - (void)otpAuthURLDidGenerateNewOTP:(NSNotification *)notification{

Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ - (void)updateUI{`
`83`	`83`	`}];`
`84`	`84`	`}`
`85`	`85`	`_issuerLabel.text = _authURL.issuer;`
`86`		`- _passwordLabel.text = _authURL.otpCode;`
	`86`	`+ _passwordLabel.text = _authURL.otpCode.length < 6? _authURL.otpCode: [_authURL.otpCode stringByReplacingCharactersInRange:NSMakeRange(3, 0) withString:@" "];`
`87`	`87`	`_nameLabel.text = _authURL.name;`
`88`	`88`	`}`
`89`	`89`	`- (void)otpAuthURLDidGenerateNewOTP:(NSNotification *)notification{`