Merge pull request #389 from urbanairship/GHI-382

[GHI-382] Fix iOS behavior with auto launch message center

Author: Ulrico972

urbanairship-react-native/ios/UARCTModule.xcodeproj/project.pbxproj

@@ -14,7 +14,6 @@
 		6ED67C292318812700169F5C /* UARCTMessageView.m in Sources */ = {isa = PBXBuildFile; fileRef = 6ED67C252318812700169F5C /* UARCTMessageView.m */; };
 		6ED67C2A2318812700169F5C /* UARCTMessageViewManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 6ED67C282318812700169F5C /* UARCTMessageViewManager.m */; };
 		6ED701FA1F6C91A400E67C37 /* UARCTDeepLinkAction.m in Sources */ = {isa = PBXBuildFile; fileRef = 6ED701F91F6C91A400E67C37 /* UARCTDeepLinkAction.m */; };
-		F8A9D23B1F3CF8870087D225 /* UARCTMessageViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = F8A9D23A1F3CF8870087D225 /* UARCTMessageViewController.m */; };
 		F8AA2B681EEF04C0008653D8 /* UARCTMessageCenter.m in Sources */ = {isa = PBXBuildFile; fileRef = F8AA2B671EEF04C0008653D8 /* UARCTMessageCenter.m */; };
 /* End PBXBuildFile section */
 
@@ -46,8 +45,6 @@
 		6ED67C282318812700169F5C /* UARCTMessageViewManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = UARCTMessageViewManager.m; path = UARCTModule/UARCTMessageViewManager.m; sourceTree = "<group>"; };
 		6ED701F81F6C91A400E67C37 /* UARCTDeepLinkAction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = UARCTDeepLinkAction.h; path = UARCTModule/UARCTDeepLinkAction.h; sourceTree = "<group>"; };
 		6ED701F91F6C91A400E67C37 /* UARCTDeepLinkAction.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = UARCTDeepLinkAction.m; path = UARCTModule/UARCTDeepLinkAction.m; sourceTree = "<group>"; };
-		F8A9D23A1F3CF8870087D225 /* UARCTMessageViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = UARCTMessageViewController.m; path = UARCTModule/UARCTMessageViewController.m; sourceTree = "<group>"; };
-		F8A9D23C1F3CF8B90087D225 /* UARCTMessageViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = UARCTMessageViewController.h; path = UARCTModule/UARCTMessageViewController.h; sourceTree = "<group>"; };
 		F8AA2B661EEF04C0008653D8 /* UARCTMessageCenter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = UARCTMessageCenter.h; path = UARCTModule/UARCTMessageCenter.h; sourceTree = "<group>"; };
 		F8AA2B671EEF04C0008653D8 /* UARCTMessageCenter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = UARCTMessageCenter.m; path = UARCTModule/UARCTMessageCenter.m; sourceTree = "<group>"; };
 /* End PBXFileReference section */
@@ -82,8 +79,6 @@
 				457511B823A41C7900E4B1AD /* UARCTModuleVersion.m */,
 				6E42C7AD1EBA953100C85B3A /* UrbanAirshipReactModule.h */,
 				6E42C7AE1EBA953100C85B3A /* UrbanAirshipReactModule.m */,
-				F8A9D23A1F3CF8870087D225 /* UARCTMessageViewController.m */,
-				F8A9D23C1F3CF8B90087D225 /* UARCTMessageViewController.h */,
 			);
 			name = UARCTModule;
 			sourceTree = "<group>";
@@ -170,7 +165,6 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				F8A9D23B1F3CF8870087D225 /* UARCTMessageViewController.m in Sources */,
 				457511BA23A41C7A00E4B1AD /* UARCTModuleVersion.m in Sources */,
 				6E42C7AF1EBA953100C85B3A /* UARCTAutopilot.m in Sources */,
 				6ED67C292318812700169F5C /* UARCTMessageView.m in Sources */,

urbanairship-react-native/ios/UARCTModule/UARCTMessageCenter.m

@@ -52,7 +52,9 @@ - (void)displayMessageCenterForMessageID:(NSString *)messageID animated:(BOOL)an
 }
 
 - (void)dismissMessageCenterAnimated:(BOOL)animated {
-    // no-op
+    if ([[NSUserDefaults standardUserDefaults] boolForKey:UARCTAutoLaunchMessageCenterKey]) {
+        [[UAMessageCenter shared].defaultUI dismissMessageCenterAnimated:animated];
+    }
 }
 
 @end

urbanairship-react-native/ios/UARCTModule/UARCTMessageViewController.h

@@ -5,7 +5,6 @@
 #import "UARCTDeepLinkAction.h"
 #import "UARCTAutopilot.h"
 #import "UARCTMessageCenter.h"
-#import "UARCTMessageViewController.h"
 
 #if __has_include("AirshipLib.h")
 #import "UAInAppMessageHTMLAdapter.h"
@@ -16,7 +15,6 @@
 #endif
 
 @interface UrbanAirshipReactModule()
-@property (nonatomic, weak) UARCTMessageViewController *messageViewController;
 @end
 
 @implementation UrbanAirshipReactModule
@@ -491,24 +489,18 @@ + (BOOL)requiresMainQueueSetup {
                  messageId:(NSString *)messageId
                  displayMessage_resolver:(RCTPromiseResolveBlock)resolve
                  rejecter:(RCTPromiseRejectBlock)reject) {
-    UARCTMessageViewController *mvc = [[UARCTMessageViewController alloc] initWithNibName:@"UADefaultMessageCenterMessageViewController" bundle:[UAMessageCenterResources bundle]];
-    [mvc loadMessageForID:messageId];
 
-    UINavigationController *navController =  [[UINavigationController alloc] initWithRootViewController:mvc];
-    self.messageViewController = mvc;
-
-    dispatch_async(dispatch_get_main_queue(), ^{
-        [[UIApplication sharedApplication].keyWindow.rootViewController presentViewController:navController animated:YES completion:nil];
-    });
+        dispatch_async(dispatch_get_main_queue(), ^{
+            [[UAMessageCenter shared] displayMessageForID:messageId];
+        });
 }
 
 RCT_REMAP_METHOD(dismissMessage,
                  dismissMessage_resolver:(RCTPromiseResolveBlock)resolve
                  rejecter:(RCTPromiseRejectBlock)reject) {
 
     dispatch_async(dispatch_get_main_queue(), ^{
-        [self.messageViewController dismissViewControllerAnimated:YES completion:nil];
-        self.messageViewController = nil;
+        [[UAMessageCenter shared] dismiss:YES];
     });
 }