Merge branch 'revert-412-dynamic_framework'

* revert-412-dynamic_framework:
  Revert "Dynamic framework (#412)"
  Revert "2.8.8 Release"
  Revert "Request reattempt fix (#418)"

# Conflicts:
#	OneSignal.podspec
#	OneSignalDynamic.podspec
#	iOS_SDK/OneSignalSDK/Framework/Dynamic/OneSignal.framework/OneSignal
#	iOS_SDK/OneSignalSDK/Source/OneSignal.m
#	iOS_SDK/OneSignalSDK/UnitTests/UnitTests.m

NOTE: Mistakes during a merge from branch `dynamic_framework` to `master` led to some previous bug fixes being reverted.
• Using a partial revert merge to undo these reversions

Author: Nightsd01

iOS_SDK/OneSignalSDK/Source/OSNotificationPayload.m

@@ -154,9 +154,18 @@ -(void)parseRemoteSlient:(NSDictionary*)payload {
 -(void)parseActionButtons:(NSArray<NSDictionary*>*)buttons {
     NSMutableArray *buttonArray = [NSMutableArray new];
     for (NSDictionary *button in buttons) {
-        [buttonArray addObject: @{@"text" : button[@"n"],
-                                  @"id" : (button[@"i"] ?: button[@"n"])
-                                 }];
+        
+        // check to ensure the button object has the correct
+        // format before adding it to the array
+        if (!button[@"n"] ||
+            (!button[@"i"] && !button[@"n"])) {
+            continue;
+        }
+        
+        [buttonArray addObject: @{
+            @"text" : button[@"n"],
+            @"id" : (button[@"i"] ?: button[@"n"])
+        }];
     }
 
     _actionButtons = buttonArray;

iOS_SDK/OneSignalSDK/Source/OneSignal.m

@@ -423,7 +423,7 @@ + (id)initWithLaunchOptions:(NSDictionary*)launchOptions appId:(NSString*)appId
     if (!success)
         return self;
 
-    if (mShareLocation)
+    if (appId && mShareLocation)
        [OneSignalLocation getLocation:false];
 
     if (self) {

iOS_SDK/OneSignalSDK/Source/OneSignalHelper.m

@@ -376,7 +376,7 @@ + (NSMutableDictionary*)formatApsPayloadIntoStandard:(NSDictionary*)remoteUserIn
         additionalData = nil;
     else if (remoteUserInfo[@"os_data"]) {
         [userInfo addEntriesFromDictionary:additionalData];
-        if (!is2dot4Format)
+        if (!is2dot4Format && userInfo[@"os_data"][@"buttons"])
             userInfo[@"aps"] = @{@"alert" : userInfo[@"os_data"][@"buttons"][@"m"]};
     }
 

iOS_SDK/OneSignalSDK/Source/OneSignalNotificationSettingsIOS10.m

@@ -34,12 +34,14 @@
 
 #import "OneSignalHelper.h"
 
-@implementation OneSignalNotificationSettingsIOS10 {
+@interface OneSignalNotificationSettingsIOS10 ()
 
 // Used as both an optimization and to prevent queue deadlocks.
-// This doesn't seem to be required for the latter at this time. (2.4.3)
-BOOL useCachedStatus;
-}
+@property (atomic) BOOL useCachedStatus;
+
+@end
+
+@implementation OneSignalNotificationSettingsIOS10
 
 // Used to run all calls to getNotificationSettingsWithCompletionHandler sequentially
 //   This prevents any possible deadlocks due to race condiditions.
@@ -54,7 +56,7 @@ - (instancetype)init {
 }
 
 - (void)getNotificationPermissionState:(void (^)(OSPermissionState *subcscriptionStatus))completionHandler {
-    if (useCachedStatus) {
+    if (self.useCachedStatus) {
         completionHandler(OneSignal.currentPermissionState);
         return;
     }
@@ -68,18 +70,32 @@ - (void)getNotificationPermissionState:(void (^)(OSPermissionState *subcscriptio
             status.accepted = settings.authorizationStatus == UNAuthorizationStatusAuthorized;
             status.answeredPrompt = settings.authorizationStatus != UNAuthorizationStatusNotDetermined;
             status.notificationTypes = (settings.badgeSetting == UNNotificationSettingEnabled ? 1 : 0)
-                                     + (settings.soundSetting == UNNotificationSettingEnabled ? 2 : 0)
-                                     + (settings.alertSetting == UNNotificationSettingEnabled ? 4 : 0)
-                                     + (settings.lockScreenSetting == UNNotificationSettingEnabled ? 8 : 0);
-            useCachedStatus = true;
+            + (settings.soundSetting == UNNotificationSettingEnabled ? 2 : 0)
+            + (settings.alertSetting == UNNotificationSettingEnabled ? 4 : 0)
+            + (settings.lockScreenSetting == UNNotificationSettingEnabled ? 8 : 0);
+            self.useCachedStatus = true;
             completionHandler(status);
-            useCachedStatus = false;
+            self.useCachedStatus = false;
         }];
     });
 }
 
+// used only in cases where UNUserNotificationCenter getNotificationSettingsWith...
+// callback does not get executed in a timely fashion. Rather than returning nil,
+- (OSPermissionState *)defaultPermissionState {
+    if (OneSignal.currentPermissionState != nil) {
+        return OneSignal.currentPermissionState;
+    }
+    
+    OSPermissionState *defaultState = [OSPermissionState new];
+    
+    defaultState.notificationTypes = 0;
+    
+    return defaultState;
+}
+
 - (OSPermissionState*)getNotificationPermissionState {
-    if (useCachedStatus)
+    if (self.useCachedStatus)
         return OneSignal.currentPermissionState;
 
     __block OSPermissionState* returnStatus = OneSignal.currentPermissionState;
@@ -90,9 +106,10 @@ - (OSPermissionState*)getNotificationPermissionState {
             dispatch_semaphore_signal(semaphore);
         }];
     });
-    dispatch_semaphore_wait(semaphore, DISPATCH_TIME_FOREVER);
 
-    return returnStatus;
+    dispatch_semaphore_wait(semaphore, dispatch_time(DISPATCH_TIME_NOW, (int64_t)(100 * NSEC_PER_MSEC)));
+    
+    return returnStatus ?: self.defaultPermissionState;
 }
 
 - (int)getNotificationTypes {

iOS_SDK/OneSignalSDK/UnitTests/UnitTests.m

@@ -2093,4 +2093,22 @@ - (void)testHTTPClientTimeout {
     [OneSignalClientOverrider disableExecuteRequestOverride:false];
 }
 
+// Regression test to ensure improper button JSON format
+// does not cause a crash (iOS SDK issue #401)
+- (void)testInvalidButtonFormat {
+    NSDictionary *newFormat = @{@"aps": @{
+                             @"mutable-content": @1,
+                             @"alert": @"Message Body"
+                             },
+                     @"os_data": @{
+                             @"i": @"b2f7f966-d8cc-11e4-bed1-df8f05be55ba",
+                             @"buttons": @[@{@"i": @"id1", @"title": @"text1"}],
+                             @"att": @{ @"id": @"http://domain.com/file.jpg" }
+                             }};
+    
+    let notification = [OSNotificationPayload parseWithApns:newFormat];
+    
+    XCTAssertTrue(notification.actionButtons.count == 0);
+}
+
 @end