Swizzle fixes, type build fixes, disable hang timer for debug builds.
This commit is contained in:
parent
d509c01572
commit
35e64ea9cf
2
platform-darwin/External/Pearl
vendored
2
platform-darwin/External/Pearl
vendored
@ -1 +1 @@
|
||||
Subproject commit 2f28a807d215d022026265e583311f4b68c92e75
|
||||
Subproject commit 80733afc7a3ea25e3684840d59350ed533ce8634
|
@ -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 );
|
||||
|
@ -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;
|
||||
|
@ -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 );
|
||||
|
Loading…
Reference in New Issue
Block a user