Misc bug fixes

iOS
  * Fixed bug where the notificationOpenedCallback would fire again if a page was reloaded/navigated to with OneSignal.init on it.
  * Launch url now opens Safari much quicker.

Android
  * Fixed bug with getIds where it could fire without a userId set and only a pushToken set on a device with intermittent connection issues.

Author: jkasten2

package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.9.0",
+  "version": "1.9.1",
   "name": "onesignal-cordova-plugin",
   "cordova_name": "OneSignal Push Notifications",
   "description": "OneSignal is a high volume Push Notification service for mobile apps. In addition to basic notification delivery, OneSignal also provides tools to localize, target, schedule, and automate notifications that you send.",

plugin.xml

@@ -2,7 +2,7 @@
 <plugin xmlns="http://www.phonegap.com/ns/plugins/1.0"
     xmlns:android="http://schemas.android.com/apk/res/android"
     id="onesignal-cordova-plugin"
-    version="1.9.0">
+    version="1.9.1">
 
   <name>OneSignal Push Notifications</name>
   <author>Josh Kasten</author>

src/android/libs/OneSignalSDK.jar

@@ -42,7 +42,7 @@ typedef void (^OneSignalHandleNotificationBlock)(NSString* message, NSDictionary
 
 @property(nonatomic, readonly, copy) NSString* app_id;
 
-extern NSString* const VERSION;
+extern NSString* const ONESIGNAL_VERSION;
 
 typedef NS_ENUM(NSUInteger, ONE_S_LOG_LEVEL) {
     ONE_S_LL_NONE, ONE_S_LL_FATAL, ONE_S_LL_ERROR, ONE_S_LL_WARN, ONE_S_LL_INFO, ONE_S_LL_DEBUG, ONE_S_LL_VERBOSE

src/ios/OneSignal.h

@@ -35,8 +35,6 @@
 
 #define DEFAULT_PUSH_HOST @"https://onesignal.com/api/v1/"
 
-NSString* const VERSION = @"011000";
-
 #define NOTIFICATION_TYPE_BADGE 1
 #define NOTIFICATION_TYPE_SOUND 2
 #define NOTIFICATION_TYPE_ALERT 4
@@ -62,6 +60,8 @@ @interface OneSignal ()
 
 @implementation OneSignal
 
+NSString* const ONESIGNAL_VERSION = @"011001";
+
 @synthesize app_id = _GT_publicKey;
 @synthesize httpClient = _GT_httpRequest;
 @synthesize lastMessageReceived;
@@ -174,6 +174,7 @@ - (id)initWithLaunchOptions:(NSDictionary*)launchOptions appId:(NSString*)appId
         else if ([[UIApplication sharedApplication] respondsToSelector:@selector(registerForRemoteNotifications)])
             [[UIApplication sharedApplication] registerForRemoteNotifications];
 
+        
         if (mUserId != nil)
             [self registerUser];
         else // Fall back incase Apple does not responsed in time.
@@ -371,7 +372,7 @@ - (void)registerUser {
                              [NSNumber numberWithInt:0], @"device_type",
                              [[[UIDevice currentDevice] identifierForVendor] UUIDString], @"ad_id",
                              [self getSoundFiles], @"sounds",
-                             VERSION, @"sdk",
+                             ONESIGNAL_VERSION, @"sdk",
                              mDeviceToken, @"identifier", // identifier MUST be at the end as it could be nil.
                              nil];
 
@@ -396,6 +397,8 @@ - (void)registerUser {
         id asIdManager = [ASIdentifierManagerClass valueForKey:@"sharedManager"];
         if ([[asIdManager valueForKey:@"advertisingTrackingEnabled"] isEqual:[NSNumber numberWithInt:1]])
             dataDic[@"as_id"] = [[asIdManager valueForKey:@"advertisingIdentifier"] UUIDString];
+        else
+            dataDic[@"as_id"] = @"OptedOut";
     }
 
     UIApplicationReleaseMode releaseMode = [OneSignalMobileProvision releaseMode];
@@ -770,7 +773,9 @@ - (void) handleNotificationOpened:(NSDictionary*)messageDict isActive:(BOOL)isAc
 
     if ([[UIApplication sharedApplication] applicationState] != UIApplicationStateActive && [customDict objectForKey:@"u"] != nil) {
         NSURL *url = [NSURL URLWithString:[customDict objectForKey:@"u"]];
-        [[UIApplication sharedApplication] openURL:url];
+        dispatch_async(dispatch_get_main_queue(), ^{
+            [[UIApplication sharedApplication] openURL:url];
+        });
     }
 
     self.lastMessageReceived = messageDict;
@@ -1144,12 +1149,18 @@ static Class getClassWithProtocolInHierarchy(Class searchClass, Protocol* protoc
     return searchClass;
 }
 
+
+
+
+
+
 static void injectSelector(Class newClass, SEL newSel, Class addToClass, SEL makeLikeSel) {
     Method newMeth = class_getInstanceMethod(newClass, newSel);
     IMP imp = method_getImplementation(newMeth);
     const char* methodTypeEncoding = method_getTypeEncoding(newMeth);
 
     BOOL successful = class_addMethod(addToClass, makeLikeSel, imp, methodTypeEncoding);
+    
     if (!successful) {
         class_addMethod(addToClass, newSel, imp, methodTypeEncoding);
         newMeth = class_getInstanceMethod(addToClass, newSel);
@@ -1252,6 +1263,7 @@ + (void)load {
 static Class delegateClass = nil;
 
 - (void) setOneSignalDelegate:(id<UIApplicationDelegate>)delegate {
+    
     if (delegateClass != nil) {
         [self setOneSignalDelegate:delegate];
         return;

src/ios/OneSignal.m

@@ -56,6 +56,7 @@ void failureCallback(NSString* callbackId, NSDictionary* data) {
 
 void processNotificationOpened(NSDictionary* launchOptions) {
     successCallback(notficationOpenedCallbackId, launchOptions);
+    launchDict = nil;
 }
 
 void initOneSignalObject(NSDictionary* launchOptions, const char* appId, BOOL autoRegister) {