Add location permissions not available alert dialog

   * Inform the user when using preview mode that location permissions are not configured

Author: Jeasmine

iOS_SDK/OneSignalSDK/Source/OSInAppMessageLocationPrompt.m

@@ -30,7 +30,7 @@
 
 @interface OneSignal ()
 
-+ (void)promptLocation:(void (^)(BOOL accepted))completionHandler;
++ (void)promptLocation:(void (^)(PromptActionResult result))completionHandler;
 
 @end
 
@@ -45,7 +45,7 @@ - (instancetype)init
     return self;
 }
 
-- (void)handlePrompt:(void (^)(BOOL accepted))completionHandler {
+- (void)handlePrompt:(void (^)(PromptActionResult result))completionHandler {
     [OneSignal promptLocation:completionHandler];
 }
 

iOS_SDK/OneSignalSDK/Source/OSInAppMessagePrompt.h

@@ -29,14 +29,15 @@
 #define OSInAppMessagingPrompt_h
 
 #import "OneSignal.h"
+#import "OneSignalCommonDefines.h"
 
 #import <Foundation/Foundation.h>
 
 @protocol OSInAppMessagePrompt <NSObject>
 
 @property (nonatomic) BOOL hasPrompted;
 
-- (void)handlePrompt:(void (^)(BOOL accepted))completionHandler;
+- (void)handlePrompt:(void (^)(PromptActionResult result))completionHandler;
 
 @end
 

iOS_SDK/OneSignalSDK/Source/OSInAppMessagePushPrompt.m

@@ -27,6 +27,7 @@
 
 #import "OSInAppMessagePushPrompt.h"
 #import "OneSignal.h"
+#import "OneSignalHelper.h"
 
 @implementation OSInAppMessagePushPrompt
 
@@ -39,8 +40,12 @@ - (instancetype)init
     return self;
 }
 
-- (void)handlePrompt:(void (^)(BOOL accepted))completionHandler {
-    [OneSignal promptForPushNotificationsWithUserResponse:completionHandler fallbackToSettings:YES];
+- (void)handlePrompt:(void (^)(PromptActionResult result))completionHandler {
+    let acceptedCompletionHandler = ^(BOOL accepted) {
+        let result = accepted ? PERMISSION_GRANTED : PERMISSION_DENIED;
+        completionHandler(result);
+    };
+    [OneSignal promptForPushNotificationsWithUserResponse:acceptedCompletionHandler fallbackToSettings:YES];
 }
 
 - (NSString *)description {

iOS_SDK/OneSignalSDK/Source/OSInAppMessageView.m

@@ -56,10 +56,10 @@ - (instancetype _Nonnull)initWithMessage:(OSInAppMessage *)inAppMessage withScri
 - (void)loadedHtmlContent:(NSString *)html withBaseURL:(NSURL *)url {
     // UI Update must be done on the main thread
     NSLog(@"11111 [self.webView loadHTMLString:html baseURL:url];");
-     dispatch_sync(dispatch_get_main_queue(), ^{
-         NSLog(@"222222 [self.webView loadHTMLString:html baseURL:url];");
-         [self.webView loadHTMLString:html baseURL:url];
-     });
+    dispatch_sync(dispatch_get_main_queue(), ^{
+        NSLog(@"222222 [self.webView loadHTMLString:html baseURL:url];");
+        [self.webView loadHTMLString:html baseURL:url];
+    });
 }
 
 - (void)setupWebviewWithMessageHandler:(id<WKScriptMessageHandler>)handler {

iOS_SDK/OneSignalSDK/Source/OSMessagingController.h

@@ -39,7 +39,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 @end
 
-@interface OSMessagingController : NSObject <OSInAppMessageViewControllerDelegate, OSTriggerControllerDelegate, OSMessagingControllerDelegate>
+@interface OSMessagingController : NSObject <OSInAppMessageViewControllerDelegate, OSTriggerControllerDelegate, OSMessagingControllerDelegate, UIAlertViewDelegate>
 
 @property (class, readonly) BOOL isInAppMessagingPaused;
 

iOS_SDK/OneSignalSDK/Source/OSMessagingController.m

@@ -34,6 +34,7 @@
 #import "OSInAppMessageAction.h"
 #import "OSInAppMessageController.h"
 #import "OSInAppMessagePrompt.h"
+#import "OneSignalCommonDefines.h"
 
 @interface OneSignal ()
 
@@ -72,6 +73,10 @@ @interface OSMessagingController ()
 
 @property (nonatomic, nullable) NSObject<OSInAppMessagePrompt>*currentPromptAction;
 
+@property (nonatomic, nullable) NSArray<NSObject<OSInAppMessagePrompt> *> *currentPromptActions;
+
+@property (nonatomic, nullable) OSInAppMessage *currentInAppMessage;
+
 @property (nonatomic) BOOL isAppInactive;
 
 @end
@@ -509,7 +514,8 @@ - (void)persistInAppMessageForRedisplay:(OSInAppMessage *)message {
     [OneSignal onesignal_Log:ONE_S_LL_VERBOSE message:[NSString stringWithFormat:@"persistInAppMessageForRedisplay saved redisplayedInAppMessages: %@", [redisplayedInAppMessages description]]];
 }
 
-- (void)handlePromptActions:(NSArray<NSObject<OSInAppMessagePrompt> *> *)promptActions {
+- (void)handlePromptActions:(NSArray<NSObject<OSInAppMessagePrompt> *> *)promptActions withMessage:(OSInAppMessage *)inAppMessage {
+    _currentPromptAction = nil;
     for (NSObject<OSInAppMessagePrompt> *promptAction in promptActions) {
         // Don't show prompt twice
         if (!promptAction.hasPrompted) {
@@ -521,17 +527,40 @@ - (void)handlePromptActions:(NSArray<NSObject<OSInAppMessagePrompt> *> *)promptA
     if (_currentPromptAction) {
         [OneSignal onesignal_Log:ONE_S_LL_VERBOSE message:[NSString stringWithFormat:@"IAM prompt to handle: %@", [_currentPromptAction description]]];
         _currentPromptAction.hasPrompted = YES;
-        [_currentPromptAction handlePrompt:^(BOOL accepted) {
-            _currentPromptAction = nil;
-            [OneSignal onesignal_Log:ONE_S_LL_VERBOSE message:[NSString stringWithFormat:@"IAM prompt to handle finished accepted: %@", accepted ? @"YES" : @"NO"]];
-            [self handlePromptActions:promptActions];
+        [_currentPromptAction handlePrompt:^(PromptActionResult result) {
+            [OneSignal onesignal_Log:ONE_S_LL_VERBOSE message:[NSString stringWithFormat:@"IAM prompt to handle finished accepted: %u", result]];
+            if (inAppMessage.isPreview && result == LOCATION_PERMISSIONS_MISSING_INFO_PLIST) {
+                [self showAlertDialogMessage:inAppMessage promptActions:promptActions];
+            } else {
+                [self handlePromptActions:promptActions withMessage:inAppMessage];
+            }
         }];
     } else if (!_viewController) { // IAM dismissed by action
         [OneSignal onesignal_Log:ONE_S_LL_VERBOSE message:@"IAM with prompt dismissed from actionTaken"];
+        _currentInAppMessage = nil;
+        _currentPromptActions = nil;
         [self evaluateMessageDisplayQueue];
     }
 }
 
+- (void)showAlertDialogMessage:(OSInAppMessage *)inAppMessage
+                 promptActions:(NSArray<NSObject<OSInAppMessagePrompt> *> *)promptActions  {
+    _currentInAppMessage = inAppMessage;
+    _currentPromptActions = promptActions;
+    let messageTitle = @"Location Not Available";
+    let message = @"Looks like this app doesn't have location services configured. Please see OneSignal docs for more information.";
+    UIAlertView *alert = [[UIAlertView alloc] initWithTitle:messageTitle
+                                                    message:message
+                                                   delegate:self
+                                          cancelButtonTitle:nil
+                                          otherButtonTitles:@"OK", nil];
+    [alert show];
+}
+
+- (void)alertView:(UIAlertView *)alertView clickedButtonAtIndex:(NSInteger)buttonIndex{
+    [self handlePromptActions:_currentPromptActions withMessage:_currentInAppMessage];
+}
+
 - (void)messageViewDidSelectAction:(OSInAppMessage *)message withAction:(OSInAppMessageAction *)action {
     // Assign firstClick BOOL based on message being clicked previously or not
     action.firstClick = [message takeActionAsUnique];
@@ -540,7 +569,7 @@ - (void)messageViewDidSelectAction:(OSInAppMessage *)message withAction:(OSInApp
         [self handleMessageActionWithURL:action];
 
     if (action.promptActions && action.promptActions.count > 0)
-        [self handlePromptActions:action.promptActions];
+        [self handlePromptActions:action.promptActions withMessage:message];
 
     if (self.actionClickBlock)
         self.actionClickBlock(action);

iOS_SDK/OneSignalSDK/Source/OneSignal.m

@@ -1397,7 +1397,7 @@ + (void)promptLocation {
     [self promptLocation:nil];
 }
 
-+ (void)promptLocation:(void (^)(BOOL accepted))completionHandler {
++ (void)promptLocation:(void (^)(PromptActionResult result))completionHandler {
     // return if the user has not granted privacy permissions
     if ([self shouldLogMissingPrivacyConsentErrorWithMethodName:@"promptLocation"])
         return;

iOS_SDK/OneSignalSDK/Source/OneSignalCommonDefines.h

@@ -145,6 +145,9 @@
 #define OS_SESSION_TO_STRING(enum) [OS_SESSION_STRINGS objectAtIndex:enum]
 #define OS_SESSION_FROM_STRING(string) [OS_SESSION_STRINGS indexOfObject:string]
 
+// OneSignal Prompt Action Result
+typedef enum {PERMISSION_GRANTED, PERMISSION_DENIED, LOCATION_PERMISSIONS_MISSING_INFO_PLIST, ERROR} PromptActionResult;
+
 // OneSignal App Entry Action Types
 typedef enum {NOTIFICATION_CLICK, APP_OPEN, APP_CLOSE} AppEntryAction;
 

iOS_SDK/OneSignalSDK/Source/OneSignalLocation.h

@@ -29,6 +29,7 @@
 #define OneSignalLocation_h
 
 #import <Foundation/Foundation.h>
+#import "OneSignalCommonDefines.h"
 
 typedef struct os_location_coordinate {
     double latitude;
@@ -47,7 +48,7 @@ typedef struct os_last_location {
 + (bool)started;
 + (void)internalGetLocation:(bool)prompt;
 - (void)locationManager:(id)manager didUpdateLocations:(NSArray *)locations;
-+ (void)getLocation:(bool)prompt withCompletionHandler:(void (^)(BOOL accepted))completionHandler;
++ (void)getLocation:(bool)prompt withCompletionHandler:(void (^)(PromptActionResult result))completionHandler;
 + (void)sendLocation;
 + (os_last_location*)lastLocation;
 + (void)clearLastLocation;

iOS_SDK/OneSignalSDK/Source/OneSignalLocation.m

@@ -104,7 +104,7 @@ + (void)clearLastLocation {
     }
 }
 
-+ (void)getLocation:(bool)prompt withCompletionHandler:(void (^)(BOOL accepted))completionHandler {
++ (void)getLocation:(bool)prompt withCompletionHandler:(void (^)(PromptActionResult result))completionHandler {
     if (completionHandler)
         [OneSignalLocation.locationListeners addObject:completionHandler];
 
@@ -173,10 +173,10 @@ + (void)endTask {
     fcTask = UIBackgroundTaskInvalid;
 }
 
-+ (void)sendAndClearLocationListener:(BOOL)accept {
++ (void)sendAndClearLocationListener:(PromptActionResult)result {
     onesignal_Log(ONE_S_LL_DEBUG, [NSString stringWithFormat:@"OneSignalLocation sendAndClearLocationListener listeners: %@", OneSignalLocation.locationListeners]);
     for (int i = 0; i < OneSignalLocation.locationListeners.count; i++) {
-        ((void (^)(BOOL accepted))[OneSignalLocation.locationListeners objectAtIndex:i])(accept);
+        ((void (^)(PromptActionResult result))[OneSignalLocation.locationListeners objectAtIndex:i])(result);
     }
     // We only call the listeners once
     [OneSignalLocation.locationListeners removeAllObjects];
@@ -190,7 +190,7 @@ + (void)sendCurrentAuthStatusToListeners {
 
     // If already given or denied the permission, listeners should have the response
     let denied = permissionStatus == kCLAuthorizationStatusRestricted || permissionStatus == kCLAuthorizationStatusDenied;
-    [self sendAndClearLocationListener:!denied];
+    [self sendAndClearLocationListener:denied ? PERMISSION_DENIED : PERMISSION_GRANTED];
 }
 
 + (void)internalGetLocation:(bool)prompt {
@@ -203,7 +203,7 @@ + (void)internalGetLocation:(bool)prompt {
 
     // Check for location in plist
     if (![clLocationManagerClass performSelector:@selector(locationServicesEnabled)]) {
-        [self sendAndClearLocationListener:false];
+        [self sendAndClearLocationListener:ERROR];
         return;
     }
 
@@ -229,13 +229,16 @@ + (void)internalGetLocation:(bool)prompt {
             if ([OneSignalHelper isIOSVersionGreaterThanOrEqual:@"9.0"])
                 [locationManager setValue:@YES forKey:@"allowsBackgroundLocationUpdates"];
         }
-        
+
         else if ([[NSBundle mainBundle] objectForInfoDictionaryKey:@"NSLocationWhenInUseUsageDescription"]) {
             if (permissionStatus == kCLAuthorizationStatusNotDetermined)
                 [locationManager performSelector:@selector(requestWhenInUseAuthorization)];
         }
-        
-        else onesignal_Log(ONE_S_LL_ERROR, @"Include a privacy NSLocationAlwaysUsageDescription or NSLocationWhenInUseUsageDescription in your info.plist to request location permissions.");
+
+        else {
+            onesignal_Log(ONE_S_LL_ERROR, @"Include a privacy NSLocationAlwaysUsageDescription or NSLocationWhenInUseUsageDescription in your info.plist to request location permissions.");
+            [self sendAndClearLocationListener:LOCATION_PERMISSIONS_MISSING_INFO_PLIST];
+        }
     }
 
     // For iOS 6 and 7, location services are prompted here
@@ -251,7 +254,7 @@ + (void)internalGetLocation:(bool)prompt {
 - (void)locationManager:(id)manager didUpdateLocations:(NSArray *)locations {
     // return if the user has not granted privacy permissions or location shared is false
     if ([OneSignal requiresUserPrivacyConsent] || ![OneSignal isLocationShared]) {
-        [OneSignalLocation sendAndClearLocationListener:false];
+        [OneSignalLocation sendAndClearLocationListener:PERMISSION_DENIED];
         return;
     }
 
@@ -283,12 +286,12 @@ - (void)locationManager:(id)manager didUpdateLocations:(NSArray *)locations {
     if (!initialLocationSent)
         [OneSignalLocation sendLocation];
 
-    [OneSignalLocation sendAndClearLocationListener:true];
+    [OneSignalLocation sendAndClearLocationListener:PERMISSION_GRANTED];
 }
 
 - (void)locationManager:(id)manager didFailWithError:(NSError *)error {
     [OneSignal onesignal_Log:ONE_S_LL_ERROR message:[NSString stringWithFormat:@"CLLocationManager did fail with error: %@", error]];
-    [OneSignalLocation sendAndClearLocationListener:false];
+    [OneSignalLocation sendAndClearLocationListener:ERROR];
 }
 
 + (void)resetSendTimer {