From e8c00296bd16cd06c4a9eb04fe39ceb1efeaa3c6 Mon Sep 17 00:00:00 2001 From: Maarten Billemont Date: Fri, 21 Sep 2012 10:26:53 +0200 Subject: [PATCH] TestFligt identifier + Localytics crash. [IMPROVED] Use correct device identifier for TestFlight depending on whether we're in AdHoc mode or not. [FIXED] Crash when sending nil config values to Localytics. --- MasterPassword-iOS.xcodeproj/project.pbxproj | 2 +- MasterPassword/iOS/MPAppDelegate.m | 62 +++++++++----------- 2 files changed, 29 insertions(+), 35 deletions(-) diff --git a/MasterPassword-iOS.xcodeproj/project.pbxproj b/MasterPassword-iOS.xcodeproj/project.pbxproj index 1f7c6097..e5a4c123 100644 --- a/MasterPassword-iOS.xcodeproj/project.pbxproj +++ b/MasterPassword-iOS.xcodeproj/project.pbxproj @@ -5310,7 +5310,7 @@ "\"$(SRCROOT)/External/Pearl/Pearl-Crypto\"", "\"$(SRCROOT)/External/google-plus-ios-sdk/lib\"", ); - "PROVISIONING_PROFILE[sdk=iphoneos*]" = "1D59446F-0568-458A-96A3-B4226BC94A20"; + "PROVISIONING_PROFILE[sdk=iphoneos*]" = "E0621374-3E4C-483D-A3F3-46D151712A4F"; SKIP_INSTALL = NO; TARGETED_DEVICE_FAMILY = 1; }; diff --git a/MasterPassword/iOS/MPAppDelegate.m b/MasterPassword/iOS/MPAppDelegate.m index c8ecff66..70b59feb 100644 --- a/MasterPassword/iOS/MPAppDelegate.m +++ b/MasterPassword/iOS/MPAppDelegate.m @@ -59,14 +59,17 @@ NSString *testFlightToken = [self testFlightToken]; if ([testFlightToken length]) { inf(@"Initializing TestFlight"); +#ifdef ADHOC [TestFlight setDeviceIdentifier:[(id)[UIDevice currentDevice] uniqueIdentifier]]; - //[TestFlight setDeviceIdentifier[PearlKeyChain deviceIdentifier]]; +#else + [TestFlight setDeviceIdentifier:[PearlKeyChain deviceIdentifier]]; +#endif [TestFlight addCustomEnvironmentInformation:@"Anonymous" forKey:@"username"]; [TestFlight addCustomEnvironmentInformation:[PearlKeyChain deviceIdentifier] forKey:@"deviceIdentifier"]; [TestFlight setOptions:[NSDictionary dictionaryWithObjectsAndKeys: - [NSNumber numberWithBool:NO], @"logToConsole", - [NSNumber numberWithBool:NO], @"logToSTDERR", - nil]]; + [NSNumber numberWithBool:NO], @"logToConsole", + [NSNumber numberWithBool:NO], @"logToSTDERR", + nil]]; [TestFlight takeOff:testFlightToken]; [[PearlLogger get] registerListener:^BOOL(PearlLogMessage *message) { PearlLogLevel level = PearlLogLevelWarn; @@ -120,9 +123,9 @@ if ([localyticsKey length]) { inf(@"Initializing Localytics"); [[LocalyticsSession sharedLocalyticsSession] LocalyticsSession:localyticsKey]; - [[LocalyticsSession sharedLocalyticsSession] open]; + [[LocalyticsSession sharedLocalyticsSession] open]; [LocalyticsSession sharedLocalyticsSession].enableHTTPS = YES; - [[LocalyticsSession sharedLocalyticsSession] upload]; + [[LocalyticsSession sharedLocalyticsSession] upload]; [[PearlLogger get] registerListener:^BOOL(PearlLogMessage *message) { if (message.level >= PearlLogLevelWarn) [[LocalyticsSession sharedLocalyticsSession] tagEvent:@"Problem" @@ -427,28 +430,19 @@ [TestFlight passCheckpoint:MPCheckpointConfig]; #endif - [[LocalyticsSession sharedLocalyticsSession] tagEvent:MPCheckpointConfig attributes: - @{ - @"rememberLogin": [[MPConfig get].rememberLogin boolValue] - ? @"YES": @"NO", - @"iCloud": [[MPConfig get].iCloud boolValue]? @"YES" - : @"NO", - @"iCloudDecided": [[MPConfig get].iCloudDecided boolValue] - ? @"YES": @"NO", - @"sendInfo": [[MPiOSConfig get].sendInfo boolValue] - ? @"YES": @"NO", - @"helpHidden": [[MPiOSConfig get].helpHidden boolValue] - ? @"YES": @"NO", - @"showQuickStart": [[MPiOSConfig get].showQuickStart boolValue] - ? @"YES": @"NO", - @"firstRun": [[PearlConfig get].firstRun boolValue] - ? @"YES": @"NO", - @"launchCount": [[PearlConfig get].launchCount description], - @"askForReviews": [[PearlConfig get].askForReviews boolValue] - ? @"YES": @"NO", - @"reviewAfterLaunches": [[PearlConfig get].reviewAfterLaunches description], - @"reviewedVersion": [PearlConfig get].reviewedVersion - }]; + [[LocalyticsSession sharedLocalyticsSession] tagEvent:MPCheckpointConfig attributes:@{ + @"rememberLogin": [[MPConfig get].rememberLogin boolValue]? @"YES": @"NO", + @"iCloud": [[MPConfig get].iCloud boolValue]? @"YES": @"NO", + @"iCloudDecided": [[MPConfig get].iCloudDecided boolValue]? @"YES": @"NO", + @"sendInfo": [[MPiOSConfig get].sendInfo boolValue]? @"YES": @"NO", + @"helpHidden": [[MPiOSConfig get].helpHidden boolValue]? @"YES": @"NO", + @"showQuickStart": [[MPiOSConfig get].showQuickStart boolValue]? @"YES": @"NO", + @"firstRun": [[PearlConfig get].firstRun boolValue]? @"YES": @"NO", + @"launchCount": NilToNSNull([[PearlConfig get].launchCount description]), + @"askForReviews": [[PearlConfig get].askForReviews boolValue]? @"YES": @"NO", + @"reviewAfterLaunches": NilToNSNull([[PearlConfig get].reviewAfterLaunches description]), + @"reviewedVersion": NilToNSNull([PearlConfig get].reviewedVersion) + }]; } } @@ -521,12 +515,12 @@ [PearlInfoPlist get].CFBundleVersion) attachments:(logs - ? [[PearlEMailAttachment alloc] initWithContent:[[[PearlLogger get] formatMessagesWithLevel:logLevel] dataUsingEncoding:NSUTF8StringEncoding] - mimeType:@"text/plain" - fileName:PearlString(@"%@-%@.log", - [[NSDateFormatter rfc3339DateFormatter] stringFromDate:[NSDate date]], - [PearlKeyChain deviceIdentifier])] - : nil), nil] + ? [[PearlEMailAttachment alloc] initWithContent:[[[PearlLogger get] formatMessagesWithLevel:logLevel] dataUsingEncoding:NSUTF8StringEncoding] + mimeType:@"text/plain" + fileName:PearlString(@"%@-%@.log", + [[NSDateFormatter rfc3339DateFormatter] stringFromDate:[NSDate date]], + [PearlKeyChain deviceIdentifier])] + : nil), nil] showComposerForVC:viewController]; }