Fixes nil appId handling, for wrapper SDKs

* Fixes firing of the handleNotificationAction event for some wrapper SDKs
   - Cordova, Unity, and possibly others
* When a nil appId is passed to OneSignal.initWithLaunchOptions a cached value will be used
  - Needed as the SDK needs to init on launch of the process but the appId is passed in from the wrapper runtime

Author: jkasten2

iOS_SDK/OneSignalSDK/Source/OneSignal.m

@@ -71,7 +71,7 @@
 #define ERROR_PUSH_CAPABLILITY_DISABLED    -13
 #define ERROR_PUSH_DELEGATE_NEVER_FIRED    -14
 #define ERROR_PUSH_SIMULATOR_NOT_SUPPORTED -15
-#define ERROR_PUSH_UNKNOWN_APNS_ERROR       -16
+#define ERROR_PUSH_UNKNOWN_APNS_ERROR      -16
 #define ERROR_PUSH_OTHER_3000_ERROR        -17
 #define ERROR_PUSH_NEVER_PROMPTED          -18
 #define ERROR_PUSH_PROMPT_NEVER_ANSWERED   -19
@@ -329,47 +329,19 @@ + (id)initWithLaunchOptions:(NSDictionary*)launchOptions appId:(NSString*)appId
 //         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 {
 
-    if (![[NSUUID alloc] initWithUUIDString:appId]) {
-        onesignal_Log(ONE_S_LL_FATAL, @"OneSignal AppId format is invalid.\nExample: 'b2f7f966-d8cc-11eg-bed1-df8f05be55ba'\n");
-        return self;
-    }
+    NSUserDefaults* userDefaults = [NSUserDefaults standardUserDefaults];
 
-    if ([@"b2f7f966-d8cc-11eg-bed1-df8f05be55ba" isEqualToString:appId] || [@"5eb5a37e-b458-11e3-ac11-000c2940e62c" isEqualToString:appId])
-        onesignal_Log(ONE_S_LL_WARN, @"OneSignal Example AppID detected, please update to your app's id found on OneSignal.com");
+    bool success = [self initAppId:appId withUserDefaults:userDefaults withSettings:settings];
+    
+    if (!success)
+        return self;
 
     if (mShareLocation)
        [OneSignalLocation getLocation:false];
 
     if (self) {
-        NSUserDefaults* userDefaults = [NSUserDefaults standardUserDefaults];
-        
         [OneSignalHelper notificationBlocks: receivedCallback : actionCallback];
 
-        if (appId)
-            app_id = appId;
-        else {
-            // Read from .plist if not passed in with this method call.
-            app_id = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"OneSignal_APPID"];
-            if (app_id == nil)
-                app_id = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"GameThrive_APPID"];
-        }
-        
-        // Handle changes to the app id. This might happen on a developer's device when testing.
-        if (app_id == nil)
-            app_id  = [userDefaults stringForKey:@"GT_APP_ID"];
-        else if (![app_id isEqualToString:[userDefaults stringForKey:@"GT_APP_ID"]]) {
-            // Will run the first time OneSignal is initialized or if the dev changes the app_id.
-            [userDefaults setObject:app_id forKey:@"GT_APP_ID"];
-            [userDefaults setObject:nil forKey:@"GT_PLAYER_ID"];
-            [userDefaults synchronize];
-        }
-        
-        if (!app_id) {
-            if (![settings[kOSSettingsKeyInOmitNoAppIdLogging] boolValue])
-                onesignal_Log(ONE_S_LL_FATAL, @"OneSignal AppId never set!");
-            return self;
-        }
-        
         if ([OneSignalHelper isIOSVersionGreaterOrEqual:8])
             registeredWithApple = self.currentPermissionState.accepted;
         else
@@ -447,6 +419,40 @@ + (id)initWithLaunchOptions:(NSDictionary*)launchOptions appId:(NSString*)appId
     return self;
 }
 
++(bool)initAppId:(NSString*)appId withUserDefaults:(NSUserDefaults*)userDefaults withSettings:(NSDictionary*)settings {
+    if (appId)
+        app_id = appId;
+    else {
+        // Read from .plist if not passed in with this method call.
+        app_id = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"OneSignal_APPID"];
+        if (app_id == nil)
+            app_id = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"GameThrive_APPID"];
+    }
+    
+    if (!app_id) {
+        if (![settings[kOSSettingsKeyInOmitNoAppIdLogging] boolValue])
+            onesignal_Log(ONE_S_LL_FATAL, @"OneSignal AppId never set!");
+        app_id  = [userDefaults stringForKey:@"GT_APP_ID"];
+    }
+    else if (![app_id isEqualToString:[userDefaults stringForKey:@"GT_APP_ID"]]) {
+        // Handle changes to the app id. This might happen on a developer's device when testing
+        // Will also run the first time OneSignal is initialized
+        [userDefaults setObject:app_id forKey:@"GT_APP_ID"];
+        [userDefaults setObject:nil forKey:@"GT_PLAYER_ID"];
+        [userDefaults synchronize];
+    }
+    
+    if (!app_id || ![[NSUUID alloc] initWithUUIDString:app_id]) {
+        onesignal_Log(ONE_S_LL_FATAL, @"OneSignal AppId format is invalid.\nExample: 'b2f7f966-d8cc-11e4-bed1-df8f05be55ba'\n");
+        return false;
+    }
+    
+    if ([@"b2f7f966-d8cc-11e4-bed1-df8f05be55ba" isEqualToString:appId] || [@"5eb5a37e-b458-11e3-ac11-000c2940e62c" isEqualToString:appId])
+        onesignal_Log(ONE_S_LL_WARN, @"OneSignal Example AppID detected, please update to your app's id found on OneSignal.com");
+    
+    return true;
+}
+
 + (void)setLogLevel:(ONE_S_LOG_LEVEL)nsLogLevel visualLevel:(ONE_S_LOG_LEVEL)visualLogLevel {
     NSLog(@"ONESIGNAL - Setting log level: %d", (int)nsLogLevel);
     _nsLogLevel = nsLogLevel; _visualLogLevel = visualLogLevel;

iOS_SDK/OneSignalSDK/UnitTests/UnitTests.m

@@ -156,6 +156,26 @@ + (void)runPendingSelectors {
 
 
 
+
+@interface NSUUIDOverrider : NSObject
+@end
+
+@implementation NSUUIDOverrider
++ (void)load {
+    // Swizzling initWithUUIDString: doesn't seem possible
+    injectToProperClass(@selector(overrideInitWithUUIDString:), @selector(initWithUUIDString:), @[], [NSUUIDOverrider class], [NSUUID class]);
+}
+
+- (id)overrideInitWithUUIDString:(NSString*)string {
+    // Mimic iOS 11 logic
+    if (!string)
+       return nil;
+    
+    return [self overrideInitWithUUIDString:string];
+}
+@end
+
+
 @interface NSUserDefaultsOverrider : NSObject
 @end
 
@@ -275,6 +295,15 @@ + (void)sizzleBundleIdentifier {
 - (NSString*)overrideBundleIdentifier {
     return @"com.onesignal.unittest";
 }
+                        
+- (NSURL*)overrideBundleURL {
+    NSURL* url = [NSURL URLWithString:@"file:///Users/hiro/Library/Developer/CoreSimulator/Devices/63A47DBE-D6F7-4BCF-82C4-5285C91CB22C/data/Containers/Bundle/Application/D5FDD051-990C-426E-89B1-E4C51429D29D/OneSignalDevApp.app/"];
+    
+ //   NSURL* url = [self overrideBundleURL];
+    NSLog(@"url: %@", url);
+    
+    return url;
+}
 
 - (nullable id)overrideObjectForInfoDictionaryKey:(NSString*)key {
     return nsbundleDictionary[key];
@@ -1663,6 +1692,34 @@ - (void)testNotificationOpen {
     XCTAssertEqual(networkRequestCount, 2);
 }
 
+
+
+// Wrapper SDKs may not have the app_id available on cold starts.
+// Open event should still fire however so the event is not missed.
+- (void)testNotificationOpenOn2ndColdStartWithoutAppId {
+    [self initOneSignal];
+    [self runBackgroundThreads];
+    
+    [self clearStateForAppRestart];
+    
+    __block BOOL openedWasFire = false;
+    [OneSignal initWithLaunchOptions:nil appId:nil handleNotificationAction:^(OSNotificationOpenedResult *result) {
+        openedWasFire = true;
+    }];
+    [self runBackgroundThreads];
+    
+    id notifResponse = [self createBasiciOSNotificationResponse];
+    UNUserNotificationCenter *notifCenter = [UNUserNotificationCenter currentNotificationCenter];
+    id notifCenterDelegate = notifCenter.delegate;
+    // UNUserNotificationCenterDelegate method iOS 10 calls directly when a notification is opened.
+    [notifCenterDelegate userNotificationCenter:notifCenter didReceiveNotificationResponse:notifResponse withCompletionHandler:^() {}];
+    
+    XCTAssertTrue(openedWasFire);
+}
+
+
+
+
 // Testing iOS 10 - old pre-2.4.0 button fromat - with original aps payload format
 - (void)testNotificationOpenFromButtonPress {
     __block BOOL openedWasFire = false;