diff --git a/platform-darwin/External/Pearl b/platform-darwin/External/Pearl index 2f28a807..80733afc 160000 --- a/platform-darwin/External/Pearl +++ b/platform-darwin/External/Pearl @@ -1 +1 @@ -Subproject commit 2f28a807d215d022026265e583311f4b68c92e75 +Subproject commit 80733afc7a3ea25e3684840d59350ed533ce8634 diff --git a/platform-darwin/Source/iOS/MPSecrets.m b/platform-darwin/Source/iOS/MPSecrets.m index ea37a7b0..3a80f10a 100644 --- a/platform-darwin/Source/iOS/MPSecrets.m +++ b/platform-darwin/Source/iOS/MPSecrets.m @@ -59,7 +59,7 @@ NSString *digest(NSString *value) { if (!value) return nil; - size_t appSaltLength, valueLength; + NSUInteger appSaltLength, valueLength; const void *appSaltString = [decrypt( appSalt ) cStringUsingEncoding:NSUTF8StringEncoding length:&appSaltLength]; const void *valueString = [value cStringUsingEncoding:NSUTF8StringEncoding length:&valueLength]; const uint8_t *digest = mpw_hash_hmac_sha256( appSaltString, appSaltLength, valueString, valueLength ); diff --git a/platform-darwin/Source/iOS/MPStoreViewController.m b/platform-darwin/Source/iOS/MPStoreViewController.m index da28da34..4c1b3cc8 100644 --- a/platform-darwin/Source/iOS/MPStoreViewController.m +++ b/platform-darwin/Source/iOS/MPStoreViewController.m @@ -275,7 +275,7 @@ PearlEnum( MPDevelopmentFuelConsumption, NSDate *now = [NSDate date], *checked = [MPiOSConfig get].developmentFuelChecked; if (!checked || 3600 < (fuelSecondsElapsed = [now timeIntervalSinceDate:checked])) { NSTimeInterval weeksElapsed = fuelSecondsElapsed / (3600 * 24 * 7 /* 1 week */); /* x weeks elapsed */ - NSTimeInterval fuelConsumed = MIN( fuelRemaining, weeklyFuelConsumption * weeksElapsed ); + CGFloat fuelConsumed = MIN( fuelRemaining, weeklyFuelConsumption * (CGFloat)weeksElapsed ); fuelRemaining -= fuelConsumed; fuelInvested += fuelConsumed; [MPiOSConfig get].developmentFuelChecked = now; diff --git a/platform-darwin/Source/iOS/MPiOSAppDelegate.m b/platform-darwin/Source/iOS/MPiOSAppDelegate.m index 77821ebe..1001ca51 100644 --- a/platform-darwin/Source/iOS/MPiOSAppDelegate.m +++ b/platform-darwin/Source/iOS/MPiOSAppDelegate.m @@ -42,7 +42,7 @@ [PearlLogger get].printLevel = [[MPiOSConfig get].traceMode boolValue]? PearlLogLevelDebug: PearlLogLevelInfo; [PearlLogger get].historyLevel = [[MPiOSConfig get].traceMode boolValue]? PearlLogLevelTrace: PearlLogLevelInfo; #ifdef DEBUG - //[PearlLogger get].printLevel = PearlLogLevelTrace; + [PearlLogger get].printLevel = PearlLogLevelDebug; #endif } ); } @@ -119,11 +119,13 @@ countlyConfig.enableDebug = YES; [Countly.sharedInstance startWithConfig:countlyConfig]; +#if ! DEBUG [self.hangDetector = [[PearlHangDetector alloc] initWithHangAction:^(NSTimeInterval hangTime) { MPError( [NSError errorWithDomain:MPErrorDomain code:MPErrorHangCode userInfo:@{ @"time": @(hangTime) }], @"Timeout waiting for main thread after %fs.", hangTime ); }] start]; +#endif } @catch (id exception) { err( @"During Analytics Setup: %@", exception );