From 50e1b8012bc68d90d1e009c975b5b1113b0ff03f Mon Sep 17 00:00:00 2001 From: Frederic Jacobs Date: Sun, 10 Aug 2014 01:27:16 +0200 Subject: [PATCH] Fixing localization and performance issues - Cleaning up unused VC xib - Optimization in Call Server Requests - Fixing localization issues in Registration flow - Changing order of labels for the Settings view //FREEBIE --- Signal.xcodeproj/project.pbxproj | 6 -- .../network/http/CallServerRequestsManager.m | 9 +-- Signal/src/phone/PhoneManager.m | 1 - .../view controllers/InCallViewController.m | 1 - .../view controllers/RegisterViewController.m | 7 ++- .../view controllers/SettingsViewController.m | 4 +- .../xibs/DowngradeCallViewController.xib | 63 ------------------- .../xibs/RegisterViewController.xib | 4 +- 8 files changed, 11 insertions(+), 84 deletions(-) delete mode 100644 Signal/src/view controllers/xibs/DowngradeCallViewController.xib diff --git a/Signal.xcodeproj/project.pbxproj b/Signal.xcodeproj/project.pbxproj index 906e30b11..923ecf130 100644 --- a/Signal.xcodeproj/project.pbxproj +++ b/Signal.xcodeproj/project.pbxproj @@ -306,7 +306,6 @@ 76EB066D18170B34006006FC /* ContactDetailTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 76EB051F18170B33006006FC /* ContactDetailTableViewCell.xib */; }; 76EB066F18170B34006006FC /* ContactDetailViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 76EB052018170B33006006FC /* ContactDetailViewController.xib */; }; 76EB067118170B34006006FC /* DialerViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 76EB052118170B33006006FC /* DialerViewController.xib */; }; - 76EB067318170B34006006FC /* DowngradeCallViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 76EB052218170B33006006FC /* DowngradeCallViewController.xib */; }; 76EB067518170B34006006FC /* FavouritesViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 76EB052318170B33006006FC /* FavouritesViewController.xib */; }; 76EB067718170B34006006FC /* InboxFeedViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 76EB052418170B33006006FC /* InboxFeedViewController.xib */; }; 76EB067918170B34006006FC /* InCallViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 76EB052518170B33006006FC /* InCallViewController.xib */; }; @@ -550,7 +549,6 @@ E148750418A06966002CC4F3 /* ContactDetailViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 76EB052018170B33006006FC /* ContactDetailViewController.xib */; }; E148750518A06966002CC4F3 /* CountryCodeViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = B97CBFA718860EA3008E0DE9 /* CountryCodeViewController.xib */; }; E148750618A06966002CC4F3 /* DialerViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 76EB052118170B33006006FC /* DialerViewController.xib */; }; - E148750718A06966002CC4F3 /* DowngradeCallViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 76EB052218170B33006006FC /* DowngradeCallViewController.xib */; }; E148750818A06966002CC4F3 /* FavouritesViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 76EB052318170B33006006FC /* FavouritesViewController.xib */; }; E148750918A06966002CC4F3 /* InboxFeedViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 76EB052418170B33006006FC /* InboxFeedViewController.xib */; }; E148750A18A06966002CC4F3 /* InCallViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 76EB052518170B33006006FC /* InCallViewController.xib */; }; @@ -992,7 +990,6 @@ 76EB051F18170B33006006FC /* ContactDetailTableViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = ContactDetailTableViewCell.xib; sourceTree = ""; }; 76EB052018170B33006006FC /* ContactDetailViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = ContactDetailViewController.xib; sourceTree = ""; }; 76EB052118170B33006006FC /* DialerViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = DialerViewController.xib; sourceTree = ""; }; - 76EB052218170B33006006FC /* DowngradeCallViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = DowngradeCallViewController.xib; sourceTree = ""; }; 76EB052318170B33006006FC /* FavouritesViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = FavouritesViewController.xib; sourceTree = ""; }; 76EB052418170B33006006FC /* InboxFeedViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = InboxFeedViewController.xib; sourceTree = ""; }; 76EB052518170B33006006FC /* InCallViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = InCallViewController.xib; sourceTree = ""; }; @@ -2161,7 +2158,6 @@ 76EB052018170B33006006FC /* ContactDetailViewController.xib */, B97CBFA718860EA3008E0DE9 /* CountryCodeViewController.xib */, 76EB052118170B33006006FC /* DialerViewController.xib */, - 76EB052218170B33006006FC /* DowngradeCallViewController.xib */, 76EB052318170B33006006FC /* FavouritesViewController.xib */, 76EB052418170B33006006FC /* InboxFeedViewController.xib */, 76EB052518170B33006006FC /* InCallViewController.xib */, @@ -3153,7 +3149,6 @@ E148750418A06966002CC4F3 /* ContactDetailViewController.xib in Resources */, E148750518A06966002CC4F3 /* CountryCodeViewController.xib in Resources */, E148750618A06966002CC4F3 /* DialerViewController.xib in Resources */, - E148750718A06966002CC4F3 /* DowngradeCallViewController.xib in Resources */, E148750818A06966002CC4F3 /* FavouritesViewController.xib in Resources */, E148750918A06966002CC4F3 /* InboxFeedViewController.xib in Resources */, E148750A18A06966002CC4F3 /* InCallViewController.xib in Resources */, @@ -3324,7 +3319,6 @@ 765052B3182BF839008313E1 /* HelveticaNeueLTStd-Th.otf in Resources */, 76B818A1182C39460088060E /* PreferenceListViewController.xib in Resources */, 76EB066D18170B34006006FC /* ContactDetailTableViewCell.xib in Resources */, - 76EB067318170B34006006FC /* DowngradeCallViewController.xib in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/Signal/src/network/http/CallServerRequestsManager.m b/Signal/src/network/http/CallServerRequestsManager.m index e738ecd40..356dac790 100644 --- a/Signal/src/network/http/CallServerRequestsManager.m +++ b/Signal/src/network/http/CallServerRequestsManager.m @@ -33,16 +33,13 @@ MacrosSingletonImplemention NSURL *endPointURL = [NSURL URLWithString:[NSString stringWithFormat:@"https://%@:%hu", endpoint.hostname, endpoint.port]]; NSURLSessionConfiguration *sessionConf = [NSURLSessionConfiguration ephemeralSessionConfiguration]; self.operationManager = [[AFHTTPSessionManager alloc] initWithBaseURL:endPointURL sessionConfiguration:sessionConf]; - [self.operationManager setSecurityPolicy:[AFSecurityPolicy policyWithPinningMode:AFSSLPinningModePublicKey]]; - + self.operationManager.responseSerializer = [AFJSONResponseSerializer serializer]; + self.operationManager.securityPolicy.allowInvalidCertificates = YES; NSString *certPath = [[NSBundle mainBundle] pathForResource:@"whisperReal" ofType:@"cer"]; NSData *certData = [NSData dataWithContentsOfFile:certPath]; - SecCertificateRef cert = SecCertificateCreateWithData(NULL, (__bridge CFDataRef)(certData)); - self.operationManager.securityPolicy.pinnedCertificates = @[(__bridge_transfer NSData *)SecCertificateCopyData(cert)]; - self.operationManager.securityPolicy.allowInvalidCertificates = YES; // We use a custom certificate, not signed by a CA. - self.operationManager.responseSerializer = [AFJSONResponseSerializer serializer]; + self.operationManager.securityPolicy.SSLPinningMode = AFSSLPinningModePublicKey; } return self; } diff --git a/Signal/src/phone/PhoneManager.m b/Signal/src/phone/PhoneManager.m index 5be92b525..45b180e58 100644 --- a/Signal/src/phone/PhoneManager.m +++ b/Signal/src/phone/PhoneManager.m @@ -88,7 +88,6 @@ return; } - // @todo: maybe a more general mechanism, so other things can watch? [[[Environment getCurrent] recentCallManager] addMissedCallDueToBusy:session]; [[CallConnectUtil asyncSignalTooBusyToAnswerCallWithSessionDescriptor:session] catchDo:^(id error) { diff --git a/Signal/src/view controllers/InCallViewController.m b/Signal/src/view controllers/InCallViewController.m index 8848451be..891280d3b 100644 --- a/Signal/src/view controllers/InCallViewController.m +++ b/Signal/src/view controllers/InCallViewController.m @@ -263,7 +263,6 @@ static NSInteger connectingFlashCounter = 0; if ([termination type] == CallTerminationType_ServerMessage) { CallFailedServerMessage* serverMessage = [termination messageInfo]; - // @todo: forcing it to be a prefix is not particularly localizable message = [message stringByAppendingString:[serverMessage text]]; } diff --git a/Signal/src/view controllers/RegisterViewController.m b/Signal/src/view controllers/RegisterViewController.m index 105325168..ae0f4e023 100644 --- a/Signal/src/view controllers/RegisterViewController.m +++ b/Signal/src/view controllers/RegisterViewController.m @@ -38,6 +38,7 @@ - (void)viewDidLoad { [super viewDidLoad]; + [self localizeButtonText]; DDLogInfo(@"Opened Registration View"); @@ -186,6 +187,8 @@ if ([badResponse getStatusCode] == 401) { UIAlertView *incorrectChallengeCodeAV = [[UIAlertView alloc]initWithTitle:REGISTER_CHALLENGE_ALERT_VIEW_TITLE message:REGISTER_CHALLENGE_ALERT_VIEW_BODY delegate:nil cancelButtonTitle:REGISTER_CHALLENGE_ALERT_DISMISS otherButtonTitles:nil, nil]; [incorrectChallengeCodeAV show]; + _challengeButton.enabled = YES; + [_challengeActivityIndicator stopAnimating]; return; } } @@ -202,10 +205,8 @@ [[PushManager sharedManager] askForPushRegistrationWithSuccess:^{ [Environment setRegistered:YES]; [registered trySetResult:@YES]; - [self dismissView]; - _challengeButton.enabled = YES; - [_challengeActivityIndicator stopAnimating]; [[[Environment getCurrent] phoneDirectoryManager] forceUpdate]; + [self dismissView]; } failure:^{ UIAlertView *alertView = [[UIAlertView alloc] initWithTitle:REGISTER_ERROR_ALERT_VIEW_TITLE message:REGISTER_ERROR_ALERT_VIEW_BODY delegate:nil cancelButtonTitle:REGISTER_ERROR_ALERT_VIEW_DISMISS otherButtonTitles:nil, nil]; [alertView show]; diff --git a/Signal/src/view controllers/SettingsViewController.m b/Signal/src/view controllers/SettingsViewController.m index f79935302..4a517adfd 100644 --- a/Signal/src/view controllers/SettingsViewController.m +++ b/Signal/src/view controllers/SettingsViewController.m @@ -136,9 +136,9 @@ static NSString *const CHECKBOX_EMPTY_IMAGE_NAME = @"checkbox_empty"; - (NSArray *)privacyAndSecurityCells { return @[_hideContactImagesCell, - _disableHistoryCell, - _disableAutocorrectCell, _enableScreenSecurityCell, + _disableAutocorrectCell, + _disableHistoryCell, _clearHistoryLogCell]; } diff --git a/Signal/src/view controllers/xibs/DowngradeCallViewController.xib b/Signal/src/view controllers/xibs/DowngradeCallViewController.xib deleted file mode 100644 index 0babfcc55..000000000 --- a/Signal/src/view controllers/xibs/DowngradeCallViewController.xib +++ /dev/null @@ -1,63 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Signal/src/view controllers/xibs/RegisterViewController.xib b/Signal/src/view controllers/xibs/RegisterViewController.xib index 6615fe04f..adc05608e 100644 --- a/Signal/src/view controllers/xibs/RegisterViewController.xib +++ b/Signal/src/view controllers/xibs/RegisterViewController.xib @@ -61,7 +61,7 @@ - + @@ -169,7 +169,7 @@ - +