skylab/MasterPassword
2
0
Fork 0
Code Releases Activity

Swizzle fixes, type build fixes, disable hang timer for debug builds.

Browse Source
This commit is contained in:
Maarten Billemont 2020-02-16 18:49:06 -06:00
parent d509c01572
commit 35e64ea9cf
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
platform-darwin/External/Pearl vendored

@ -1 +1 @@
Subproject commit 2f28a807d215d022026265e583311f4b68c92e75 Subproject commit 80733afc7a3ea25e3684840d59350ed533ce8634

2
platform-darwin/Source/iOS/MPSecrets.m
View File

@ -59,7 +59,7 @@ NSString *digest(NSString *value) {
if (!value) if (!value)
return nil; return nil;
size_t appSaltLength, valueLength; NSUInteger appSaltLength, valueLength;
const void *appSaltString = [decrypt( appSalt ) cStringUsingEncoding:NSUTF8StringEncoding length:&appSaltLength]; const void *appSaltString = [decrypt( appSalt ) cStringUsingEncoding:NSUTF8StringEncoding length:&appSaltLength];
const void *valueString = [value cStringUsingEncoding:NSUTF8StringEncoding length:&valueLength]; const void *valueString = [value cStringUsingEncoding:NSUTF8StringEncoding length:&valueLength];
const uint8_t *digest = mpw_hash_hmac_sha256( appSaltString, appSaltLength, valueString, valueLength ); const uint8_t *digest = mpw_hash_hmac_sha256( appSaltString, appSaltLength, valueString, valueLength );

2
platform-darwin/Source/iOS/MPStoreViewController.m
View File

@ -275,7 +275,7 @@ PearlEnum( MPDevelopmentFuelConsumption,
NSDate *now = [NSDate date], *checked = [MPiOSConfig get].developmentFuelChecked; NSDate *now = [NSDate date], *checked = [MPiOSConfig get].developmentFuelChecked;
if (!checked || 3600 < (fuelSecondsElapsed = [now timeIntervalSinceDate:checked])) { if (!checked || 3600 < (fuelSecondsElapsed = [now timeIntervalSinceDate:checked])) {
NSTimeInterval weeksElapsed = fuelSecondsElapsed / (3600 * 24 * 7 /* 1 week */); /* x weeks elapsed */ 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; fuelRemaining -= fuelConsumed;
fuelInvested += fuelConsumed; fuelInvested += fuelConsumed;
[MPiOSConfig get].developmentFuelChecked = now; [MPiOSConfig get].developmentFuelChecked = now;

4
platform-darwin/Source/iOS/MPiOSAppDelegate.m
View File

@ -42,7 +42,7 @@
[PearlLogger get].printLevel = [[MPiOSConfig get].traceMode boolValue]? PearlLogLevelDebug: PearlLogLevelInfo; [PearlLogger get].printLevel = [[MPiOSConfig get].traceMode boolValue]? PearlLogLevelDebug: PearlLogLevelInfo;
[PearlLogger get].historyLevel = [[MPiOSConfig get].traceMode boolValue]? PearlLogLevelTrace: PearlLogLevelInfo; [PearlLogger get].historyLevel = [[MPiOSConfig get].traceMode boolValue]? PearlLogLevelTrace: PearlLogLevelInfo;
#ifdef DEBUG #ifdef DEBUG
//[PearlLogger get].printLevel = PearlLogLevelTrace; [PearlLogger get].printLevel = PearlLogLevelDebug;
#endif #endif
} ); } );
} }
@ -119,11 +119,13 @@
countlyConfig.enableDebug = YES; countlyConfig.enableDebug = YES;
[Countly.sharedInstance startWithConfig:countlyConfig]; [Countly.sharedInstance startWithConfig:countlyConfig];
#if ! DEBUG
[self.hangDetector = [[PearlHangDetector alloc] initWithHangAction:^(NSTimeInterval hangTime) { [self.hangDetector = [[PearlHangDetector alloc] initWithHangAction:^(NSTimeInterval hangTime) {
MPError( [NSError errorWithDomain:MPErrorDomain code:MPErrorHangCode userInfo:@{ MPError( [NSError errorWithDomain:MPErrorDomain code:MPErrorHangCode userInfo:@{
@"time": @(hangTime) @"time": @(hangTime)
}], @"Timeout waiting for main thread after %fs.", hangTime ); }], @"Timeout waiting for main thread after %fs.", hangTime );
}] start]; }] start];
#endif
} }
@catch (id exception) { @catch (id exception) {
err( @"During Analytics Setup: %@", exception ); err( @"During Analytics Setup: %@", exception );