保存的时候漏了用户名，吓尿~

wanghengheng · wanghengheng · commit 539de1796e33 · 2015-07-10T15:45:27.000+08:00
diff --git a/Coding_iOS/Ease_2FA/Controllers/OTPListViewController.m b/Coding_iOS/Ease_2FA/Controllers/OTPListViewController.m
@@ -191,7 +191,7 @@ - (void)addOneAuthURL:(OTPAuthURL *)authURL{
         if ([authURL.name isEqualToString:item.name]) {
             alreadyHave = YES;
             if ([authURL.otpCode isEqualToString:item.otpCode]) {
-                kTipAlert(@"&#35813;&#20108;&#32500;&#30721;&#24050;&#34987;&#20445;&#23384;&#20026;&#36134;&#25143;&#21517;&#65306;%@", authURL.name);
+                kTipAlert(@"&#35813;&#20108;&#32500;&#30721;&#24050;&#34987;&#20445;&#23384;&#20026;&#36134;&#25143;&#21517;&#65306;\n%@", authURL.name);
             }else{
                 UIAlertView *alertV = [UIAlertView bk_alertViewWithTitle:@"&#25552;&#31034;" message:[NSString stringWithFormat:@"&#36134;&#25143;&#21517;&#65306;%@ &#24050;&#23384;&#22312;\n&#36873;&#25321; '&#26356;&#26032;' &#35206;&#30422;&#21407;&#36134;&#25143;&#12290;", authURL.name]];
                 [alertV bk_setCancelButtonWithTitle:@"&#21462;&#28040;" handler:nil];
@@ -217,7 +217,7 @@ - (void)addOneAuthURL:(OTPAuthURL *)authURL{
         [authURL saveToKeychain];
         [self.authURLs addObject:authURL];
         [self configUI];
-        kTipAlert(@"&#28155;&#21152;&#36134;&#25143;&#25104;&#21151;&#65306;%@", authURL.name);
+        kTipAlert(@"&#28155;&#21152;&#36134;&#25143;&#25104;&#21151;&#65306;\n%@", authURL.name);
     }
 }
 
diff --git a/Coding_iOS/Ease_2FA/GoogleOTP/OTPAuthURL.m b/Coding_iOS/Ease_2FA/GoogleOTP/OTPAuthURL.m
@@ -152,7 +152,7 @@ + (OTPAuthURL *)ease_authURLWithKeychainDictionary:(NSDictionary *)dict{
     OTPAuthURL *authURL = [self authURLWithKeychainDictionary:dict];
     if (authURL) {
         NSString *secAttrAccount = dict[(__bridge id)kSecAttrAccount];
-        if (![secAttrAccount isEqualToString:authURL.name]) {
+        if (secAttrAccount && ![secAttrAccount isEqualToString:authURL.name]) {
             authURL.name = secAttrAccount;
         }
     }
@@ -165,7 +165,7 @@ + (OTPAuthURL *)authURLWithKeychainDictionary:(NSDictionary *)dict {
   NSString *urlString = [[NSString alloc] initWithData:urlData
                                                encoding:NSUTF8StringEncoding];
     NSString *issuer = dict[(__bridge id)kSecAttrType];
-    if (issuer.length > 0) {
+    if (issuer) {
         urlString = [urlString stringByAppendingFormat:@"%@=%@", kQueryIssuerKey, issuer];
     }
   NSURL *url = [NSURL URLWithString:urlString];
@@ -211,11 +211,11 @@ - (BOOL)saveToKeychain {
     attributes[(__bridge id)kSecClass] = (__bridge id)kSecClassGenericPassword;
     attributes[(__bridge id)kSecReturnPersistentRef] = (id)kCFBooleanTrue;
     attributes[(__bridge id)kSecAttrService] = kOTPService;
-
+    attributes[(__bridge id)kSecAttrAccount] = self.name;
     
     attributes[(__bridge id)kSecAttrGeneric] = urlData;
     attributes[(__bridge id)kSecValueData] = self.generator.secret;
-    if (self.issuer.length > 0) {
+    if (self.issuer) {
         attributes[(__bridge id)kSecAttrType] = self.issuer;
     }
     
@@ -244,7 +244,7 @@ - (BOOL)hotpUpdateToKeychain{
 }
 
 - (BOOL)removeFromKeychain {
-    if (self.name.length > 0) {
+    if (self.name) {
         NSDictionary *query = [self keychainQuery];
         OSStatus status = SecItemDelete((__bridge CFDictionaryRef)query);
         OTPDevLog(@"SecItemDelete(%@) = %d", query, (int)status);

-Original file line number
+Diff line change
         if ([authURL.name isEqualToString:item.name]) {
             alreadyHave = YES;
             if ([authURL.otpCode isEqualToString:item.otpCode]) {
 -                kTipAlert(@"该二维码已被保存为账户名：%@", authURL.name);
 +                kTipAlert(@"该二维码已被保存为账户名：\n%@", authURL.name);
             }else{
                 UIAlertView *alertV = [UIAlertView bk_alertViewWithTitle:@"提示" message:[NSString stringWithFormat:@"账户名：%@ 已存在\n选择 '更新' 覆盖原账户。", authURL.name]];
                 [alertV bk_setCancelButtonWithTitle:@"取消" handler:nil];
         [authURL saveToKeychain];
         [self.authURLs addObject:authURL];
         [self configUI];
 -        kTipAlert(@"添加账户成功：%@", authURL.name);
 +        kTipAlert(@"添加账户成功：\n%@", authURL.name);
+    }
+}