Brion VIBBER has submitted this change and it was merged.
Change subject: Fix for iOS 6 account creation crash.
......................................................................
Fix for iOS 6 account creation crash.
Change-Id: I817ff71a9529fd173e0717c757dfe74ac87ac0f7
---
M Wikipedia-iOS/Data/Operations/AccountCreationOp.m
M Wikipedia-iOS/Keychain/KeychainCredentials.m
2 files changed, 10 insertions(+), 10 deletions(-)
Approvals:
Brion VIBBER: Verified; Looks good to me, approved
diff --git a/Wikipedia-iOS/Data/Operations/AccountCreationOp.m
b/Wikipedia-iOS/Data/Operations/AccountCreationOp.m
index ae24440..2cb1a71 100644
--- a/Wikipedia-iOS/Data/Operations/AccountCreationOp.m
+++ b/Wikipedia-iOS/Data/Operations/AccountCreationOp.m
@@ -67,14 +67,14 @@
self = [super init];
if (self) {
- self.domain = domain;
- self.userName = userName;
- self.password = password;
- self.realName = realName;
- self.email = email;
- self.token = token;
- self.captchaId = captchaId;
- self.captchaWord = captchaWord;
+ self.domain = domain ? domain : @"";
+ self.userName = userName ? userName : @"";
+ self.password = password ? password : @"";
+ self.realName = realName ? realName : @"";
+ self.email = email ? email : @"";
+ self.token = token ? token : @"";
+ self.captchaId = captchaId ? captchaId : @"";
+ self.captchaWord = captchaWord ? captchaWord : @"";
__weak AccountCreationOp *weakSelf = self;
self.aboutToStart = ^{
diff --git a/Wikipedia-iOS/Keychain/KeychainCredentials.m
b/Wikipedia-iOS/Keychain/KeychainCredentials.m
index 326cd9a..70b2643 100644
--- a/Wikipedia-iOS/Keychain/KeychainCredentials.m
+++ b/Wikipedia-iOS/Keychain/KeychainCredentials.m
@@ -104,7 +104,7 @@
if (status == errSecSuccess) {
return YES;
} else {
- NSLog(@"Keychain: SecItemUpdate returned %i", (int)status);
+ //NSLog(@"Keychain: SecItemUpdate returned %i", (int)status);
return NO;
}
}
@@ -128,7 +128,7 @@
NSData *result = (__bridge_transfer NSData *)found;
return [[NSString alloc] initWithData: result
encoding:NSUTF8StringEncoding];
} else {
- NSLog(@"Keychain: SecItemCopyMatching returned %i", (int)status);
+ //NSLog(@"Keychain: SecItemCopyMatching returned %i", (int)status);
return nil;
}
}
--
To view, visit https://gerrit.wikimedia.org/r/115950
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I817ff71a9529fd173e0717c757dfe74ac87ac0f7
Gerrit-PatchSet: 2
Gerrit-Project: apps/ios/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Mhurd <mh...@wikimedia.org>
Gerrit-Reviewer: Brion VIBBER <br...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
