checking for 404 error after loadingMessageContent

Author: emawby

iOS_SDK/OneSignalSDK/Source/OSInAppMessageViewController.m

@@ -266,7 +266,7 @@ - (void)loadPreviewMessageContent {
 
 - (void)encounteredErrorLoadingMessageContent:(NSError * _Nullable)error {
     let message = [NSString stringWithFormat:@"An error occurred while attempting to load message content: %@", error.description ?: @"Unknown Error"];
-    if (error.code == 410 || [error.description containsString:@"In-App Message is not active"]) {
+    if (error.code == 410 || error.code == 404) {
         [self.delegate messageIsNotActive:self.message];
     }
     [OneSignal onesignal_Log:ONE_S_LL_ERROR message:message];

iOS_SDK/OneSignalSDK/UnitTests/UnitTestCommonMethods.m

@@ -157,28 +157,9 @@ + (void)runLongBackgroundThreads {
 
     [[NSRunLoop mainRunLoop] runUntilDate:[NSDate dateWithTimeIntervalSinceNow:0.05]];
 
-    // the httpQueue makes sure all HTTP request mocks are sync'ed
-    
-    dispatch_queue_t registerUserQueue, notifSettingsQueue;
     for(int i = 0; i < 10; i++) {
         [[NSRunLoop mainRunLoop] runUntilDate:[NSDate dateWithTimeIntervalSinceNow:0.1]];
-        [OneSignalHelperOverrider runBackgroundThreads];
-        
-        notifSettingsQueue = [OneSignalNotificationSettingsIOS10 getQueue];
-        if (notifSettingsQueue)
-            dispatch_sync(notifSettingsQueue, ^{});
-        
-        registerUserQueue = [OneSignal getRegisterQueue];
-        if (registerUserQueue)
-            dispatch_sync(registerUserQueue, ^{});
-        
-        [OneSignalClientOverrider runBackgroundThreads];
-        
-        [UNUserNotificationCenterOverrider runBackgroundThreads];
-        
-        dispatch_barrier_sync(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{});
-        
-        [UIApplicationOverrider runBackgroundThreads];
+        [UnitTestCommonMethods runThreadsOnEachQueue];
     }
 
     NSLog(@"END runLongBackgroundThreads");
@@ -192,32 +173,36 @@ + (void)runBackgroundThreads {
 
     [[NSRunLoop mainRunLoop] runUntilDate:[NSDate dateWithTimeIntervalSinceNow:0.05]];
 
-    // the httpQueue makes sure all HTTP request mocks are sync'ed
-    
-    dispatch_queue_t registerUserQueue, notifSettingsQueue;
     for(int i = 0; i < 10; i++) {
-        [OneSignalHelperOverrider runBackgroundThreads];
-        
-        notifSettingsQueue = [OneSignalNotificationSettingsIOS10 getQueue];
-        if (notifSettingsQueue)
-            dispatch_sync(notifSettingsQueue, ^{});
-        
-        registerUserQueue = [OneSignal getRegisterQueue];
-        if (registerUserQueue)
-            dispatch_sync(registerUserQueue, ^{});
-        
-        [OneSignalClientOverrider runBackgroundThreads];
-        
-        [UNUserNotificationCenterOverrider runBackgroundThreads];
-        
-        dispatch_barrier_sync(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{});
-        
-        [UIApplicationOverrider runBackgroundThreads];
+        [UnitTestCommonMethods runThreadsOnEachQueue];
     }
 
     NSLog(@"END runBackgroundThreads");
 }
 
++ (void)runThreadsOnEachQueue {
+    // the httpQueue makes sure all HTTP request mocks are sync'ed
+    dispatch_queue_t registerUserQueue, notifSettingsQueue;
+    
+    [OneSignalHelperOverrider runBackgroundThreads];
+    
+    notifSettingsQueue = [OneSignalNotificationSettingsIOS10 getQueue];
+    if (notifSettingsQueue)
+        dispatch_sync(notifSettingsQueue, ^{});
+    
+    registerUserQueue = [OneSignal getRegisterQueue];
+    if (registerUserQueue)
+        dispatch_sync(registerUserQueue, ^{});
+    
+    [OneSignalClientOverrider runBackgroundThreads];
+    
+    [UNUserNotificationCenterOverrider runBackgroundThreads];
+    
+    dispatch_barrier_sync(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{});
+    
+    [UIApplicationOverrider runBackgroundThreads];
+}
+
 + (void)clearStateForAppRestart:(XCTestCase *)testCase {
     NSLog(@"=======  APP RESTART ======\n\n");