Merge branch 'master' of https://github.com/OneSignal/OneSignal-iOS-SDK

Author: jkasten2

iOS_SDK/OneSignal/OneSignal.h

@@ -150,7 +150,7 @@ typedef OSNotificationDisplayType OSInFocusDisplayOption;
  requires remote-notification within UIBackgroundModes array of the Info.plist */
 @property(readonly, getter=isSilentNotification)BOOL silentNotification;
 
-/* iOS 10+: Indicates wether or not the received notification has mutableContent : 1 assigned to its payload
+/* iOS 10+: Indicates whether or not the received notification has mutableContent : 1 assigned to its payload
  Used for UNNotificationServiceExtension to launch extension.
 */
 #if XC8_AVAILABLE
@@ -177,7 +177,7 @@ typedef OSNotificationDisplayType OSInFocusDisplayOption;
 typedef void (^OSResultSuccessBlock)(NSDictionary* result);
 typedef void (^OSFailureBlock)(NSError* error);
 
-/*Block for notifying avalability of the User's ID and push token*/
+/*Block for notifying availability of the User's ID and push token*/
 typedef void (^OSIdsAvailableBlock)(NSString* userId, NSString* pushToken);
 
 /*Block for handling the reception of a remote notification */
@@ -186,9 +186,9 @@ typedef void (^OSHandleNotificationReceivedBlock)(OSNotification* notification);
 /*Block for handling a user reaction to a notification*/
 typedef void (^OSHandleNotificationActionBlock)(OSNotificationOpenedResult * result);
 
-/*Dictionary of keys to pass alongside the init serttings*/
+/*Dictionary of keys to pass alongside the init settings*/
 
-/*Let OneSignal directly promt for push notifications on init*/
+/*Let OneSignal directly prompt for push notifications on init*/
 extern NSString * const kOSSettingsKeyAutoPrompt;
 
 /*Enable the default in-app alerts*/
@@ -198,7 +198,7 @@ extern NSString * const kOSSettingsKeyInAppAlerts;
 extern NSString * const kOSSettingsKeyInAppLaunchURL;
 
 /* iOS10+ - 
- Set notificaion's in-focus display option.
+ Set notification's in-focus display option.
  Value must be an OSNotificationDisplayType enum
 */
 extern NSString * const kOSSettingsKeyInFocusDisplayOption;

iOS_SDK/OneSignal/OneSignal.m

@@ -240,14 +240,14 @@ + (id)initWithLaunchOptions:(NSDictionary*)launchOptions appId:(NSString*)appId
 
         if (mUserId != nil)
             [self registerUser];
-        else // Fall back incase Apple does not responsed in time.
+        else // Fall back in case Apple does not responds in time.
             [self performSelector:@selector(registerUser) withObject:nil afterDelay:30.0f];
 
         [OneSignalTracker onFocus:NO];
     }
 
     /*
-     * No need to call the handleNotificationOpened:userInfo as it will be called from one of the folloing selectors
+     * No need to call the handleNotificationOpened:userInfo as it will be called from one of the following selectors
      *  - application:didReceiveRemoteNotification:fetchCompletionHandler
      *  - userNotificationCenter:didReceiveNotificationResponse:withCompletionHandler (iOS10)
      */
@@ -627,8 +627,8 @@ + (void)updateDeviceToken:(NSString*)deviceToken onSuccess:(OSResultSuccessBlock
         tokenUpdateSuccessBlock = successBlock;
         tokenUpdateFailureBlock = failureBlock;
 
-        // iOS 8 - We get a token right away but give the user 30 sec to responsed to the system prompt.
-        // Also check notifiation types so there is no waiting if user has already answered the system prompt.
+        // iOS 8 - We get a token right away but give the user 30 sec to respond to the system prompt.
+        // Also check notification types so there is no waiting if user has already answered the system prompt.
         // The goal is to only have 1 server call.
         if ([OneSignalHelper isCapableOfGettingNotificationTypes] && [[UIApplication sharedApplication] currentUserNotificationSettings].types == 0) {
             [NSObject cancelPreviousPerformRequestsWithTarget:self selector:@selector(registerUser) object:nil];
@@ -819,7 +819,7 @@ + (void)registerUser {
         waitingForOneSReg = false;
         [OneSignal onesignal_Log:ONE_S_LL_ERROR message:[NSString stringWithFormat: @"Error registering with OneSignal: %@", error]];
 
-        //If the failed regiatration is priority, force the next one to be a high priority
+        //If the failed registration is priority, force the next one to be a high priority
         nextRegistrationIsHighPriority = YES;
     }];
 }
@@ -945,7 +945,7 @@ + (void)notificationOpened:(NSDictionary*)messageDict isActive:(BOOL)isActive {
         // Call Received Block
         [OneSignalHelper handleNotificationReceived:iaaoption];
 
-        // Notify backend that user opened the notifiation
+        // Notify backend that user opened the notification
         NSString* messageId = [customDict objectForKey:@"i"];
         [OneSignal submitNotificationOpened:messageId];
     }
@@ -994,7 +994,7 @@ + (void) handleNotificationOpened:(NSDictionary*)messageDict isActive:(BOOL)isAc
     if (customDict == nil)
         customDict = [messageDict objectForKey:@"custom"];
 
-    // Notify backend that user opened the notifiation
+    // Notify backend that user opened the notification
     NSString* messageId = [customDict objectForKey:@"i"];
     [OneSignal submitNotificationOpened:messageId];
 
@@ -1019,8 +1019,8 @@ + (void)launchWebURL:(NSString*)openUrl {
 
     if (openUrl && [OneSignalHelper verifyURL:openUrl]) {
         NSURL *url = [NSURL URLWithString:openUrl];
-        // Give the app resume animation time to finish when tapping on a notificaion from the notificaiton center.
-        // Isn't a requiremnt but improves visual flow.
+        // Give the app resume animation time to finish when tapping on a notification from the notification center.
+        // Isn't a requirement but improves visual flow.
         [OneSignalHelper performSelector:@selector(displayWebView:) withObject:url afterDelay:0.5];
     }
 
@@ -1063,9 +1063,9 @@ + (BOOL) clearBadgeCount:(BOOL)fromNotifOpened {
     bool wasBadgeSet = [UIApplication sharedApplication].applicationIconBadgeNumber > 0;
 
     if ((!(NSFoundationVersionNumber > NSFoundationVersionNumber_iOS_7_1) && fromNotifOpened) || wasBadgeSet) {
-        // Clear badges and nofiications from this app.
+        // Clear badges and notifications from this app.
         // Setting to 1 then 0 was needed to clear the notifications on iOS 6 & 7. (Otherwise you can click the notification multiple times.)
-        // iOS 8+ auto dismisses the notificaiton you tap on so only clear the badge (and notifications [side-effect]) if it was set.
+        // iOS 8+ auto dismisses the notification you tap on so only clear the badge (and notifications [side-effect]) if it was set.
         [[UIApplication sharedApplication] setApplicationIconBadgeNumber:1];
         [[UIApplication sharedApplication] setApplicationIconBadgeNumber:0];
     }
@@ -1133,7 +1133,7 @@ + (BOOL) remoteSilentNotification:(UIApplication*)application UserInfo:(NSDictio
     if (userInfo[@"os_data"][@"buttons"] || userInfo[@"at"] || userInfo[@"o"])
         data = userInfo;
 
-    // Genergate local notification for action button and/or attachments.
+    // Generate local notification for action button and/or attachments.
     if (data) {
         if (NSClassFromString(@"UNUserNotificationCenter")) {
             startedBackgroundJob = true;
@@ -1166,7 +1166,7 @@ + (BOOL) remoteSilentNotification:(UIApplication*)application UserInfo:(NSDictio
     return startedBackgroundJob;
 }
 
-// iOS 8-9 - Entry point when OneSignal action button notifiation is displayed or opened.
+// iOS 8-9 - Entry point when OneSignal action button notification is displayed or opened.
 + (void)processLocalActionBasedNotification:(UILocalNotification*) notification identifier:(NSString*)identifier {
     if (notification.userInfo) {
 
@@ -1232,9 +1232,9 @@ + (void)syncHashedEmail:(NSString *)email {
 //        - For iOS 10 only, swizzle all UNUserNotificationCenterDelegate selectors on the passed in class.
 //         -  This may or may not be set so we set our own now in registerAsUNNotificationCenterDelegate to an empty class.
 //
-//  Note1: Do NOT move this category to it's own file. This is requried so when the app developer calls OneSignal.initWithLaunchOptions this load+
+//  Note1: Do NOT move this category to it's own file. This is required so when the app developer calls OneSignal.initWithLaunchOptions this load+
 //            will fire along with it. This is due to how iOS loads .m files into memory instead of classes.
-//  Note2: Do NOT directly add swizzled selectors to this category as if this class is loaded into the runtime twice unexpected results will orcur.
+//  Note2: Do NOT directly add swizzled selectors to this category as if this class is loaded into the runtime twice unexpected results will occur.
 //            The oneSignalLoadedTagSelector: selector is used a flag to prevent double swizzling if this library is loaded twice.
 @implementation UIApplication (OneSignal)
 #define SYSTEM_VERSION_LESS_THAN_OR_EQUAL_TO(v)     ([[[UIDevice currentDevice] systemVersion] compare:v options:NSNumericSearch] != NSOrderedDescending)

iOS_SDK/OneSignal/OneSignalTrackIAP.m

@@ -57,6 +57,12 @@ - (id)init {
     return self;
 }
 
+- (void)dealloc {
+  if (skPaymentQueue) {
+    [[skPaymentQueue performSelector:@selector(defaultQueue)] performSelector:@selector(removeTransactionObserver:) withObject:self];
+  }
+}
+
 - (void)paymentQueue:(id)queue updatedTransactions:(NSArray*)transactions {
     skusToTrack = [NSMutableDictionary new];
     id skPayment;