Fetch view resource bundle in main thread for thread safety (#3616) (#3618)

Author: maksymmalyhin

Firebase/InAppMessagingDisplay/FIRIAMDefaultDisplayImpl.m

@@ -80,18 +80,18 @@ + (NSBundle *)getViewResourceBundle {
 
 + (void)displayCardViewWithMessageDefinition:(FIRInAppMessagingCardDisplay *)cardMessage
                              displayDelegate:(id<FIRInAppMessagingDisplayDelegate>)displayDelegate {
-  NSBundle *resourceBundle = [self getViewResourceBundle];
-
-  if (resourceBundle == nil) {
-    NSError *error =
-        [NSError errorWithDomain:kFirebaseInAppMessagingDisplayErrorDomain
-                            code:FIAMDisplayRenderErrorTypeUnspecifiedError
-                        userInfo:@{NSLocalizedDescriptionKey : @"Resource bundle is missing."}];
-    [displayDelegate displayErrorForMessage:cardMessage error:error];
-    return;
-  }
-
   dispatch_async(dispatch_get_main_queue(), ^{
+    NSBundle *resourceBundle = [self getViewResourceBundle];
+
+    if (resourceBundle == nil) {
+      NSError *error =
+          [NSError errorWithDomain:kFirebaseInAppMessagingDisplayErrorDomain
+                              code:FIAMDisplayRenderErrorTypeUnspecifiedError
+                          userInfo:@{NSLocalizedDescriptionKey : @"Resource bundle is missing."}];
+      [displayDelegate displayErrorForMessage:cardMessage error:error];
+      return;
+    }
+
     FIDTimerWithNSDate *timeFetcher = [[FIDTimerWithNSDate alloc] init];
     FIDCardViewController *cardVC =
         [FIDCardViewController instantiateViewControllerWithResourceBundle:resourceBundle
@@ -119,17 +119,17 @@ + (void)displayCardViewWithMessageDefinition:(FIRInAppMessagingCardDisplay *)car
 + (void)displayModalViewWithMessageDefinition:(FIRInAppMessagingModalDisplay *)modalMessage
                               displayDelegate:
                                   (id<FIRInAppMessagingDisplayDelegate>)displayDelegate {
-  NSBundle *resourceBundle = [self getViewResourceBundle];
+  dispatch_async(dispatch_get_main_queue(), ^{
+    NSBundle *resourceBundle = [self getViewResourceBundle];
 
-  if (resourceBundle == nil) {
-    NSError *error = [NSError errorWithDomain:kFirebaseInAppMessagingDisplayErrorDomain
-                                         code:FIAMDisplayRenderErrorTypeUnspecifiedError
-                                     userInfo:@{@"message" : @"resource bundle is missing"}];
-    [displayDelegate displayErrorForMessage:modalMessage error:error];
-    return;
-  }
+    if (resourceBundle == nil) {
+      NSError *error = [NSError errorWithDomain:kFirebaseInAppMessagingDisplayErrorDomain
+                                           code:FIAMDisplayRenderErrorTypeUnspecifiedError
+                                       userInfo:@{@"message" : @"resource bundle is missing"}];
+      [displayDelegate displayErrorForMessage:modalMessage error:error];
+      return;
+    }
 
-  dispatch_async(dispatch_get_main_queue(), ^{
     FIDTimerWithNSDate *timeFetcher = [[FIDTimerWithNSDate alloc] init];
     FIDModalViewController *modalVC =
         [FIDModalViewController instantiateViewControllerWithResourceBundle:resourceBundle
@@ -156,17 +156,17 @@ + (void)displayModalViewWithMessageDefinition:(FIRInAppMessagingModalDisplay *)m
 + (void)displayBannerViewWithMessageDefinition:(FIRInAppMessagingBannerDisplay *)bannerMessage
                                displayDelegate:
                                    (id<FIRInAppMessagingDisplayDelegate>)displayDelegate {
-  NSBundle *resourceBundle = [self getViewResourceBundle];
+  dispatch_async(dispatch_get_main_queue(), ^{
+    NSBundle *resourceBundle = [self getViewResourceBundle];
 
-  if (resourceBundle == nil) {
-    NSError *error = [NSError errorWithDomain:kFirebaseInAppMessagingDisplayErrorDomain
-                                         code:FIAMDisplayRenderErrorTypeUnspecifiedError
-                                     userInfo:@{}];
-    [displayDelegate displayErrorForMessage:bannerMessage error:error];
-    return;
-  }
+    if (resourceBundle == nil) {
+      NSError *error = [NSError errorWithDomain:kFirebaseInAppMessagingDisplayErrorDomain
+                                           code:FIAMDisplayRenderErrorTypeUnspecifiedError
+                                       userInfo:@{}];
+      [displayDelegate displayErrorForMessage:bannerMessage error:error];
+      return;
+    }
 
-  dispatch_async(dispatch_get_main_queue(), ^{
     FIDTimerWithNSDate *timeFetcher = [[FIDTimerWithNSDate alloc] init];
     FIDBannerViewController *bannerVC =
         [FIDBannerViewController instantiateViewControllerWithResourceBundle:resourceBundle
@@ -194,17 +194,17 @@ + (void)displayImageOnlyViewWithMessageDefinition:
             (FIRInAppMessagingImageOnlyDisplay *)imageOnlyMessage
                                   displayDelegate:
                                       (id<FIRInAppMessagingDisplayDelegate>)displayDelegate {
-  NSBundle *resourceBundle = [self getViewResourceBundle];
+  dispatch_async(dispatch_get_main_queue(), ^{
+    NSBundle *resourceBundle = [self getViewResourceBundle];
 
-  if (resourceBundle == nil) {
-    NSError *error = [NSError errorWithDomain:kFirebaseInAppMessagingDisplayErrorDomain
-                                         code:FIAMDisplayRenderErrorTypeUnspecifiedError
-                                     userInfo:@{}];
-    [displayDelegate displayErrorForMessage:imageOnlyMessage error:error];
-    return;
-  }
+    if (resourceBundle == nil) {
+      NSError *error = [NSError errorWithDomain:kFirebaseInAppMessagingDisplayErrorDomain
+                                           code:FIAMDisplayRenderErrorTypeUnspecifiedError
+                                       userInfo:@{}];
+      [displayDelegate displayErrorForMessage:imageOnlyMessage error:error];
+      return;
+    }
 
-  dispatch_async(dispatch_get_main_queue(), ^{
     FIDTimerWithNSDate *timeFetcher = [[FIDTimerWithNSDate alloc] init];
     FIDImageOnlyViewController *imageOnlyVC =
         [FIDImageOnlyViewController instantiateViewControllerWithResourceBundle:resourceBundle