Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,4 @@ before_install:
- cd iOS_SDK/OneSignalSDK
script:
- xcodebuild -list
- xcodebuild build -scheme OneSignal-Dynamic
- xcodebuild -scheme UnitTests -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 8 Plus,OS=11.0' test
2 changes: 1 addition & 1 deletion iOS_SDK/OneSignalSDK/Source/OneSignal.m
Original file line number Diff line number Diff line change
Expand Up @@ -398,7 +398,7 @@ + (id)initWithLaunchOptions:(NSDictionary*)launchOptions appId:(NSString*)appId
// NOTE: Wrapper SDKs such as Unity3D will call this method with appId set to nil so open events are not lost.
// Ensure a 2nd call can be made later with the appId from the developer's code.
+ (id)initWithLaunchOptions:(NSDictionary*)launchOptions appId:(NSString*)appId handleNotificationReceived:(OSHandleNotificationReceivedBlock)receivedCallback handleNotificationAction:(OSHandleNotificationActionBlock)actionCallback settings:(NSDictionary*)settings {
NSLog(@"Called init with app ID: %@", appId);
[self onesignal_Log:ONE_S_LL_VERBOSE message:[NSString stringWithFormat:@"Called init with app ID: %@", appId]];

initializationTime = [NSDate date];

Expand Down
1 change: 0 additions & 1 deletion iOS_SDK/OneSignalSDK/Source/OneSignalClient.m
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,6 @@ - (BOOL)willReattemptRequest:(int)statusCode withRequest:(OneSignalRequest *)req
if (async) {
//retry again in 15 seconds
[OneSignal onesignal_Log:ONE_S_LL_DEBUG message:[NSString stringWithFormat:@"Re-scheduling request (%@) to be re-attempted in %.3f seconds due to failed HTTP request with status code %i", NSStringFromClass([request class]), REATTEMPT_DELAY, (int)statusCode]];
NSLog(@"Delay: %f", REATTEMPT_DELAY);

[OneSignalHelper performSelector:@selector(reattemptRequest:) onMainThreadOnObject:self withObject:reattempt afterDelay:REATTEMPT_DELAY];
} else {
Expand Down
16 changes: 13 additions & 3 deletions iOS_SDK/OneSignalSDK/Source/OneSignalMobileProvision.m
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,16 @@ + (NSDictionary*) getMobileProvision {

NSScanner *scanner = [NSScanner scannerWithString:binaryString];
BOOL ok = [scanner scanUpToString:@"<plist" intoString:nil];
if (!ok) { NSLog(@"unable to find beginning of plist"); return UIApplicationReleaseUnknown; }
if (!ok) {
[self logInvalidMobileProvisionError:@"unable to find beginning of plist"];
return UIApplicationReleaseUnknown;
}
NSString *plistString;
ok = [scanner scanUpToString:@"</plist>" intoString:&plistString];
if (!ok) { NSLog(@"unable to find end of plist"); return UIApplicationReleaseUnknown; }
if (!ok) {
[self logInvalidMobileProvisionError:@"unable to find end of plist"];
return UIApplicationReleaseUnknown;
}
plistString = [NSString stringWithFormat:@"%@</plist>",plistString];
// juggle latin1 back to utf-8!
NSData *plistdata_latin1 = [plistString dataUsingEncoding:NSISOLatin1StringEncoding];
Expand All @@ -63,13 +69,17 @@ + (NSDictionary*) getMobileProvision {
NSError *error = nil;
mobileProvision = [NSPropertyListSerialization propertyListWithData:plistdata_latin1 options:NSPropertyListImmutable format:NULL error:&error];
if (error) {
NSLog(@"error parsing extracted plist - %@",error);
[self logInvalidMobileProvisionError:[NSString stringWithFormat:@"error parsing extracted plist - %@",error]];
return nil;
}
}
return mobileProvision;
}

+ (void)logInvalidMobileProvisionError:(NSString *)message {
[OneSignal onesignal_Log:ONE_S_LL_ERROR message:message];
}

+ (UIApplicationReleaseMode) releaseMode {
NSDictionary *entitlements = nil;
NSDictionary *mobileProvision = [self getMobileProvision];
Expand Down