Fixed issue with state carrying over from test to test

Author: jkasten2

iOS_SDK/OneSignal/OneSignal.m

@@ -946,6 +946,13 @@ + (void)sendPurchases:(NSArray*)purchases {
 }
 
 
+static NSString *_lastAppActiveMessageId;
++ (void)setLastAppActiveMessageId:(NSString*)value { _lastAppActiveMessageId = value; }
+
+static NSString *_lastnonActiveMessageId;
++ (void)setLastnonActiveMessageId:(NSString*)value { _lastnonActiveMessageId = value; }
+
+
 // Entry point for the following:
 //  - 1. (iOS all) - Opening notifications
 //  - 2. Notification received
@@ -967,12 +974,11 @@ + (void)notificationOpened:(NSDictionary*)messageDict isActive:(BOOL)isActive {
     BOOL inAppAlert = false;
     if (isActive) {
         // Prevent duplicate calls
-        static NSString* lastAppActiveMessageId = @"";
-        NSString* newId = [self checkForProcessedDups:customDict lastMessageId:lastAppActiveMessageId];
+        NSString* newId = [self checkForProcessedDups:customDict lastMessageId:_lastAppActiveMessageId];
         if ([@"dup" isEqualToString:newId])
             return;
         if (newId)
-            lastAppActiveMessageId = newId;
+            _lastAppActiveMessageId = newId;
 
         if (![[NSUserDefaults standardUserDefaults] objectForKey:@"ONESIGNAL_ALERT_OPTION"]) {
             [[NSUserDefaults standardUserDefaults] setObject:@(OSNotificationDisplayTypeInAppAlert) forKey:@"ONESIGNAL_ALERT_OPTION"];
@@ -1019,12 +1025,11 @@ + (void)notificationOpened:(NSDictionary*)messageDict isActive:(BOOL)isActive {
     }
     else {
         // Prevent duplicate calls
-        static NSString* lastnonActiveMessageId = @"";
-        NSString* newId = [self checkForProcessedDups:customDict lastMessageId:lastnonActiveMessageId];
+        NSString* newId = [self checkForProcessedDups:customDict lastMessageId:_lastnonActiveMessageId];
         if ([@"dup" isEqualToString:newId])
             return;
         if (newId)
-            lastnonActiveMessageId = newId;
+            _lastnonActiveMessageId = newId;
 
         //app was in background / not running and opened due to a tap on a notification or an action check what type
         NSString* actionSelected = NULL;

iOS_SDK/OneSignal/OneSignalHelper.h

@@ -60,6 +60,7 @@
 + (UILocalNotification*)prepareUILocalNotification:(NSDictionary*)data :(NSDictionary*)userInfo;
 + (BOOL)verifyURL:(NSString *)urlString;
 + (BOOL)isRemoteSilentNotification:(NSDictionary*)msg;
+@property (class) NSString *lastMessageIdFromAction;
 
 // - Networking
 + (NSNumber*)getNetType;

iOS_SDK/OneSignal/OneSignalHelper.m

@@ -472,6 +472,9 @@ + (void)handleNotificationReceived:(OSNotificationDisplayType)displayType {
     handleNotificationReceived(notification);
 }
 
+static NSString *_lastMessageIdFromAction;
++ (void)setLastMessageIdFromAction:(NSString*)value { _lastMessageIdFromAction = value; }
+
 + (void)handleNotificationAction:(OSNotificationActionType)actionType actionID:(NSString*)actionID displayType:(OSNotificationDisplayType)displayType {
     if (!handleNotificationAction || ![self isOneSignalPayload])
         return;
@@ -482,10 +485,9 @@ + (void)handleNotificationAction:(OSNotificationActionType)actionType actionID:(
     OSNotificationOpenedResult * result = [[OSNotificationOpenedResult alloc] initWithNotification:notification action:action];
 
     // Prevent duplicate calls to same action
-    static NSString* lastMessageID = @"";
-    if ([payload.notificationID isEqualToString:lastMessageID])
+    if ([payload.notificationID isEqualToString:_lastMessageIdFromAction])
         return;
-    lastMessageID = payload.notificationID;
+    _lastMessageIdFromAction = payload.notificationID;
 
     handleNotificationAction(result);
 }

iOS_SDK/UnitTests/UnitTests.m

@@ -314,6 +314,12 @@ - (void)setUp {
     lastUrl = nil;
     lastHTTPRequset = nil;
 
+    [OneSignalHelper lastMessageReceived:nil];
+    OneSignalHelper.lastMessageIdFromAction = nil;
+    [OneSignal setValue:nil forKeyPath:@"lastAppActiveMessageId"];
+    [OneSignal setValue:nil forKeyPath:@"lastnonActiveMessageId"];
+    
+    
     notifTypesOverride = 7;
     authorizationStatus = [NSNumber numberWithInteger:UNAuthorizationStatusAuthorized];