Replaced MobileProvision header + added the usableDeviceToken method

Author: JKalash

iOS_SDK/Framework/OneSignal.framework/Versions/A/OneSignal

@@ -292,9 +292,9 @@ + (void)registerForPushNotifications {
 + (void)IdsAvailable:(OSIdsAvailableBlock)idsAvailableBlock {
 
     if (mUserId)
-        idsAvailableBlock(mUserId, mDeviceToken);
+        idsAvailableBlock(mUserId, [self getUsableDeviceToken]);
 
-    if (!mUserId || !mDeviceToken)
+    if (!mUserId || ![self getUsableDeviceToken])
         idsAvailableBlockWhenReady = idsAvailableBlock;
 }
 
@@ -540,8 +540,8 @@ + (void)updateDeviceToken:(NSString*)deviceToken onSuccess:(OSResultSuccessBlock
 
     if (idsAvailableBlockWhenReady) {
         mNotificationTypes = [self getNotificationTypes];
-        if (mDeviceToken) {
-            idsAvailableBlockWhenReady(mUserId, mDeviceToken);
+        if ([self getUsableDeviceToken]) {
+            idsAvailableBlockWhenReady(mUserId, [self getUsableDeviceToken]);
             idsAvailableBlockWhenReady = nil;
         }
     }
@@ -683,7 +683,7 @@ + (void)registerUser {
             }
 
             if (idsAvailableBlockWhenReady) {
-                idsAvailableBlockWhenReady(mUserId, mDeviceToken);
+                idsAvailableBlockWhenReady(mUserId, [self getUsableDeviceToken]);
                 if (mDeviceToken)
                     idsAvailableBlockWhenReady = nil;
             }
@@ -697,6 +697,10 @@ + (void)registerUser {
     }];
 }
 
++(NSString*) getUsableDeviceToken {
+    return (mNotificationTypes > 0) ? mDeviceToken : NULL;
+}
+
 //Updates the server with the new user's notification Types
 + (void) sendNotificationTypesUpdate:(BOOL)isNewType {
 
@@ -715,8 +719,8 @@ + (void) sendNotificationTypesUpdate:(BOOL)isNewType {
 
         [OneSignalHelper enqueueRequest:request onSuccess:nil onFailure:nil];
 
-        if (mDeviceToken && idsAvailableBlockWhenReady) {
-            idsAvailableBlockWhenReady(mUserId, mDeviceToken);
+        if ([self getUsableDeviceToken] && idsAvailableBlockWhenReady) {
+            idsAvailableBlockWhenReady(mUserId, [self getUsableDeviceToken]);
             idsAvailableBlockWhenReady = nil;
         }
     }
@@ -926,8 +930,8 @@ + (void) updateNotificationTypes:(int)notificationTypes {
     else if (mDeviceToken)
         [self sendNotificationTypesUpdate:changed];
 
-    if (idsAvailableBlockWhenReady && mUserId && mDeviceToken)
-        idsAvailableBlockWhenReady(mUserId, mDeviceToken);
+    if (idsAvailableBlockWhenReady && mUserId && [self getUsableDeviceToken])
+        idsAvailableBlockWhenReady(mUserId, [self getUsableDeviceToken]);
 }
 
 + (void)didRegisterForRemoteNotifications:(UIApplication*)app deviceToken:(NSData*)inDeviceToken {

iOS_SDK/Framework/OneSignal.framework/Versions/B/OneSignal

@@ -1,29 +1,10 @@
-/**
- * Modified MIT License
- *
- * Copyright 2016 OneSignal
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * 1. The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * 2. All copies of substantial portions of the Software may only be used in connection
- * with services provided by OneSignal.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
+//
+//  OneSignalMobileProvision.h
+//  Renamed from UIApplication+BSMobileProvision.h to prevent conflicts
+//
+//  Created by kaolin fire on 2013-06-24.
+//  Copyright (c) 2013 The Blindsight Corporation. All rights reserved.
+//  Released under the BSD 2-Clause License (see LICENSE)
 
 typedef NS_ENUM(NSInteger, UIApplicationReleaseMode) {
     UIApplicationReleaseUnknown,

iOS_SDK/OneSignal/OneSignal.m

@@ -1,29 +1,10 @@
-/**
- * Modified MIT License
- *
- * Copyright 2016 OneSignal
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * 1. The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * 2. All copies of substantial portions of the Software may only be used in connection
- * with services provided by OneSignal.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
+//
+//  OneSignalMobileProvision.m
+//  Renamed from UIApplication+BSMobileProvision.m to prevent conflicts
+//
+//  Created by kaolin fire on 2013-06-24.
+//  Copyright (c) 2013 The Blindsight Corporation. All rights reserved.
+//  Released under the BSD 2-Clause License (see LICENSE)
 
 #import "OneSignalMobileProvision.h"
 #import "TargetConditionals.h"