Merge pull request #907 from iAugux/master

Fix Dialog Issue

Author: emawby

iOS_SDK/OneSignalSDK/OneSignal.xcodeproj/project.pbxproj

@@ -374,7 +374,6 @@
 		CA1A6E7020DC2E73001C41B9 /* OneSignalDialogRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = CA1A6E6E20DC2E73001C41B9 /* OneSignalDialogRequest.m */; };
 		CA1A6E7120DC2E73001C41B9 /* OneSignalDialogRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = CA1A6E6E20DC2E73001C41B9 /* OneSignalDialogRequest.m */; };
 		CA1A6E7220DC2E73001C41B9 /* OneSignalDialogRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = CA1A6E6E20DC2E73001C41B9 /* OneSignalDialogRequest.m */; };
-		CA1A6E7520DC2F04001C41B9 /* OneSignalDialogControllerOverrider.h in Headers */ = {isa = PBXBuildFile; fileRef = CA1A6E7320DC2F04001C41B9 /* OneSignalDialogControllerOverrider.h */; };
 		CA1A6E7820DC2F04001C41B9 /* OneSignalDialogControllerOverrider.m in Sources */ = {isa = PBXBuildFile; fileRef = CA1A6E7420DC2F04001C41B9 /* OneSignalDialogControllerOverrider.m */; };
 		CA36A42C208FDEFB003EFA9A /* NSURL+OneSignal.h in Headers */ = {isa = PBXBuildFile; fileRef = CA36A42A208FDEFB003EFA9A /* NSURL+OneSignal.h */; };
 		CA36A42D208FDEFB003EFA9A /* NSURL+OneSignal.m in Sources */ = {isa = PBXBuildFile; fileRef = CA36A42B208FDEFB003EFA9A /* NSURL+OneSignal.m */; };
@@ -1538,7 +1537,6 @@
 				CACBAAA0218A6243000ACAA5 /* OSInAppMessage.h in Headers */,
 				91C7725E1E7CCE1000D612D0 /* OneSignalInternal.h in Headers */,
 				CAB269DF21B2038B00F8A43C /* OSInAppMessageBridgeEvent.h in Headers */,
-				CA1A6E7520DC2F04001C41B9 /* OneSignalDialogControllerOverrider.h in Headers */,
 				9129C6BD1E89E7AB009CB6A0 /* OSSubscription.h in Headers */,
 				CA7FC89F21927229002C4FD9 /* OSDynamicTriggerController.h in Headers */,
 				DE98773C2591656A00DE07D5 /* NSDateFormatter+OneSignal.h in Headers */,

iOS_SDK/OneSignalSDK/Source/OneSignalDialogController.m

@@ -90,8 +90,8 @@ - (void)presentDialogWithTitle:(NSString * _Nonnull)title withMessage:(NSString
 }
 
 - (void)displayDialog:(OSDialogRequest * _Nonnull)request {
-    let rootViewController = [[[UIApplication sharedApplication] keyWindow] rootViewController];
-    
+    let visibleViewController = [OneSignalDialogController visibleViewController];
+
     let controller = [UIAlertController alertControllerWithTitle:request.title message:request.message preferredStyle:UIAlertControllerStyleAlert];
 
     [controller addAction:[UIAlertAction actionWithTitle:request.cancelTitle style:UIAlertActionStyleCancel handler:^(UIAlertAction * _Nonnull action) {
@@ -106,8 +106,8 @@ - (void)displayDialog:(OSDialogRequest * _Nonnull)request {
             }]];
         }
     }
-    
-    [rootViewController presentViewController:controller animated:true completion:nil];
+
+    [visibleViewController presentViewController:controller animated:true completion:nil];
 }
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdeprecated"
@@ -139,4 +139,23 @@ - (void)clearQueue {
     self.queue = [NSMutableArray new];
 }
 
++ (UIViewController *)visibleViewController {
+    let rootViewController = [[[UIApplication sharedApplication] keyWindow] rootViewController];
+    return [OneSignalDialogController getVisibleViewControllerFrom:rootViewController];
+}
+
++ (UIViewController *)getVisibleViewControllerFrom:(UIViewController *) vc {
+    if ([vc isKindOfClass:[UINavigationController class]]) {
+        return [OneSignalDialogController getVisibleViewControllerFrom:[((UINavigationController *) vc) visibleViewController]];
+    } else if ([vc isKindOfClass:[UITabBarController class]]) {
+        return [OneSignalDialogController getVisibleViewControllerFrom:[((UITabBarController *) vc) selectedViewController]];
+    } else {
+        if (vc.presentedViewController) {
+            return [OneSignalDialogController getVisibleViewControllerFrom:vc.presentedViewController];
+        } else {
+            return vc;
+        }
+    }
+}
+
 @end