diff --git a/.travis.yml b/.travis.yml index ff2a93520..95e978ab5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 diff --git a/iOS_SDK/OneSignalSDK/OneSignal.xcodeproj/xcshareddata/xcschemes/OneSignal-Dynamic.xcscheme b/iOS_SDK/OneSignalSDK/OneSignal.xcodeproj/xcshareddata/xcschemes/OneSignal-Static-Framework.xcscheme similarity index 100% rename from iOS_SDK/OneSignalSDK/OneSignal.xcodeproj/xcshareddata/xcschemes/OneSignal-Dynamic.xcscheme rename to iOS_SDK/OneSignalSDK/OneSignal.xcodeproj/xcshareddata/xcschemes/OneSignal-Static-Framework.xcscheme diff --git a/iOS_SDK/OneSignalSDK/Source/OneSignal.m b/iOS_SDK/OneSignalSDK/Source/OneSignal.m index 0d633e048..46c9066cb 100755 --- a/iOS_SDK/OneSignalSDK/Source/OneSignal.m +++ b/iOS_SDK/OneSignalSDK/Source/OneSignal.m @@ -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]; diff --git a/iOS_SDK/OneSignalSDK/Source/OneSignalClient.m b/iOS_SDK/OneSignalSDK/Source/OneSignalClient.m index ea0add11b..0997020de 100644 --- a/iOS_SDK/OneSignalSDK/Source/OneSignalClient.m +++ b/iOS_SDK/OneSignalSDK/Source/OneSignalClient.m @@ -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 { diff --git a/iOS_SDK/OneSignalSDK/Source/OneSignalMobileProvision.m b/iOS_SDK/OneSignalSDK/Source/OneSignalMobileProvision.m index 58160fa60..99776df07 100644 --- a/iOS_SDK/OneSignalSDK/Source/OneSignalMobileProvision.m +++ b/iOS_SDK/OneSignalSDK/Source/OneSignalMobileProvision.m @@ -51,10 +51,16 @@ + (NSDictionary*) getMobileProvision { NSScanner *scanner = [NSScanner scannerWithString:binaryString]; BOOL ok = [scanner scanUpToString:@"" 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:@"%@",plistString]; // juggle latin1 back to utf-8! NSData *plistdata_latin1 = [plistString dataUsingEncoding:NSISOLatin1StringEncoding]; @@ -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];