Merge pull request #1499 from OneSignal/iam/remove-iam-caching

Iam/remove iam caching

Author: Rodrigo Gomez Palacio

iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Controller/OSInAppMessageMigrationController.m

@@ -77,15 +77,6 @@ + (void)migrateToOSInAppMessageInternal {
         [OneSignalLog onesignalLog:ONE_S_LL_DEBUG message:[NSString stringWithFormat:@"Migrating OSInAppMessage from version: %ld", sdkVersion]];
 
         [NSKeyedUnarchiver setClass:[OSInAppMessageInternal class] forClassName:@"OSInAppMessage"];
-        // Messages Array
-        NSArray<OSInAppMessageInternal *> *messages = [OneSignalUserDefaults.initStandard getSavedCodeableDataForKey:OS_IAM_MESSAGES_ARRAY
-                                                                                          defaultValue:[NSArray<OSInAppMessageInternal *> new]];
-        if (messages && messages.count) {
-            [NSKeyedArchiver setClassName:@"OSInAppMessageInternal" forClass:[OSInAppMessageInternal class]];
-            [OneSignalUserDefaults.initStandard saveCodeableDataForKey:OS_IAM_MESSAGES_ARRAY withValue:messages];
-        } else {
-            [OneSignalUserDefaults.initStandard saveCodeableDataForKey:OS_IAM_MESSAGES_ARRAY withValue:nil];
-        }
 
         // Redisplay Messages Dict
         NSMutableDictionary <NSString *, OSInAppMessageInternal *> *redisplayedInAppMessages = [[NSMutableDictionary alloc] initWithDictionary:[OneSignalUserDefaults.initStandard getSavedCodeableDataForKey:OS_IAM_REDISPLAY_DICTIONARY defaultValue:[NSMutableDictionary new]]];

iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Controller/OSMessagingController.h

@@ -51,7 +51,6 @@ NS_ASSUME_NONNULL_BEGIN
 + (void)start;
 + (void)removeInstance;
 - (void)presentInAppMessage:(OSInAppMessageInternal *)message;
-- (void)updateInAppMessagesFromCache;
 - (void)getInAppMessagesFromServer:(NSString * _Nullable)subscriptionId;
 - (void)messageViewImpressionRequest:(OSInAppMessageInternal *)message;
 - (void)messageViewPageImpressionRequest:(OSInAppMessageInternal *)message withPageId:(NSString *)pageId;

iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Controller/OSMessagingController.m

@@ -207,8 +207,7 @@ - (instancetype)init {
         self.dateGenerator = ^ NSTimeInterval {
             return [[NSDate date] timeIntervalSince1970];
         };
-        self.messages = [OneSignalUserDefaults.initStandard getSavedCodeableDataForKey:OS_IAM_MESSAGES_ARRAY
-                                                                                          defaultValue:[NSArray<OSInAppMessageInternal *> new]];
+        self.messages = [NSArray<OSInAppMessageInternal *> new];
         [self initializeTriggerController];
         self.messageDisplayQueue = [NSMutableArray new];
         self.clickListeners = [NSMutableArray new];
@@ -242,17 +241,11 @@ - (void)initializeTriggerController {
                                                   dateFromString:timeSinceLastMessage]];
 }
 
-- (void)updateInAppMessagesFromCache {
-    self.messages = [OneSignalUserDefaults.initStandard getSavedCodeableDataForKey:OS_IAM_MESSAGES_ARRAY defaultValue:[NSArray new]];
-    [self evaluateMessages];
-}
-
 - (void)getInAppMessagesFromServer:(NSString *)subscriptionId {
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
         [OneSignalLog onesignalLog:ONE_S_LL_VERBOSE message:@"getInAppMessagesFromServer"];
 
         if (!subscriptionId) {
-            [self updateInAppMessagesFromCache];
             return;
         }
 
@@ -328,7 +321,6 @@ - (void)attemptFetchWithRetries:(NSString *)subscriptionId
         NSDictionary* responseHeaders = errorInfo[@"headers"];
 
         if (!statusCode) {
-            [self updateInAppMessagesFromCache];
             return;
         }
 
@@ -356,9 +348,6 @@ - (void)attemptFetchWithRetries:(NSString *)subscriptionId
             }
         } else if (code >= 500 && code <= 599) {
             [OneSignalLog onesignalLog:ONE_S_LL_VERBOSE message:@"Server error, skipping retries"];
-            [self updateInAppMessagesFromCache];
-        } else {
-            [self updateInAppMessagesFromCache];
         }
     }];
 }
@@ -403,23 +392,15 @@ - (void)fetchInAppMessagesWithoutToken:(NSString *)subscriptionId {
                 [self updateInAppMessagesFromServer:messages];
                 return;
             }
-            [self updateInAppMessagesFromCache];
         });
     } onFailure:^(NSError *error) {
         [OneSignalLog onesignalLog:ONE_S_LL_VERBOSE message:[NSString stringWithFormat:@"getInAppMessagesFromServer failure: %@", error.localizedDescription]];
-        [self updateInAppMessagesFromCache];
     }];
 }
 
 - (void)updateInAppMessagesFromServer:(NSArray<OSInAppMessageInternal *> *)newMessages {
     [OneSignalLog onesignalLog:ONE_S_LL_VERBOSE message:@"updateInAppMessagesFromServer"];
     self.messages = newMessages;
-    
-    // Cache if messages passed in are not null, this method is called from on_session for
-    //  new messages and cached when foregrounding app
-    if (self.messages)
-        [OneSignalUserDefaults.initStandard saveCodeableDataForKey:OS_IAM_MESSAGES_ARRAY withValue:self.messages];
-
     self.calledLoadTags = NO;
     [self resetRedisplayMessagesBySession];
     [self evaluateMessages];
@@ -440,11 +421,6 @@ - (void)deleteInactiveMessage:(OSInAppMessageInternal *)message {
     NSMutableArray *newMessagesArray = [NSMutableArray arrayWithArray:self.messages];
     [newMessagesArray removeObject: message];
     self.messages = newMessagesArray;
-    if (self.messages) {
-        [OneSignalUserDefaults.initStandard saveCodeableDataForKey:OS_IAM_MESSAGES_ARRAY withValue:self.messages];
-    } else {
-        [OneSignalUserDefaults.initStandard removeValueForKey:OS_IAM_MESSAGES_ARRAY];
-    }
 }
 
 /*

iOS_SDK/OneSignalSDK/OneSignalInAppMessages/OSInAppMessagingDefines.h

@@ -73,7 +73,6 @@ typedef NS_ENUM(NSUInteger, OSTriggerOperatorType) {
 #define OS_IAM_CLICKED_SET_KEY @"OS_IAM_CLICKED_SET"
 #define OS_IAM_IMPRESSIONED_SET_KEY @"OS_IAM_IMPRESSIONED_SET"
 #define OS_IAM_PAGE_IMPRESSIONED_SET_KEY @"OS_IAM_PAGE_IMPRESSIONED_SET"
-#define OS_IAM_MESSAGES_ARRAY @"OS_IAM_MESSAGES_ARRAY"
 #define OS_IAM_REDISPLAY_DICTIONARY @"OS_IAM_REDISPLAY_DICTIONARY"
 #define OS_IAM_TIME_SINCE_LAST_MESSAGE_KEY @"OS_IAM_TIME_SINCE_LAST_MESSAGE"
 

iOS_SDK/OneSignalSDK/Source/OneSignal.m

@@ -417,9 +417,6 @@ + (void)startNewSessionInternal {
     //    [OneSignalLocation sendLocation];
     //    [self executePendingLiveActivityUpdates];
     //    [self receivedInAppMessageJson:results[@"push"][@"in_app_messages"]];  // go to controller
-    
-    // on failure:
-    //    [OSMessagingController.sharedInstance updateInAppMessagesFromCache]; // go to controller
 }
 
 + (void)startInAppMessages {