fix open url/deeplink from push notifications when app is closed (#435)

* fix open url/deeplink from push notifications when app is closed

* fix unit test

* fix unit test

* remove unnecessary code from tests

* removing check for hasStarted since onStartResponse will check it itself and will execute the block if Leanplum is started

* removing unnecessary and duplicate code

Author: dejan2k

Example/Tests/Classes/LPPushNotificationsHandlerTest.m

@@ -42,8 +42,6 @@ + (void)setUp
 - (void)setUp
 {
     [super setUp];
-    // Automatically sets up AppId and AccessKey for development mode.
-    [LeanplumHelper setup_development_test];
 }
 
 - (void)tearDown
@@ -66,6 +64,8 @@ - (void)test_require_message_content
 
 - (void)test_notification_action
 {
+    XCTAssertTrue([LeanplumHelper start_development_test]);
+    
     id classMock = OCMClassMock([LPUIAlert class]);
 
     NSDictionary* userInfo = @{
@@ -106,12 +106,6 @@ - (void) test_receive_notification
     //test when UNUserNotificationCenter.currentNotificationCenter.delegate is nil
     UNUserNotificationCenter.currentNotificationCenter.delegate = nil;
 
-    // Requires Leanplum Start
-    // didReceiveRemoteNotification: UIApplicationState is Active -> calls handleNotification -> runs onContent on startIssued callback
-    if (!Leanplum.hasStarted){
-        XCTAssertTrue([LeanplumHelper start_production_test]);
-    }
-    
     // Change messageId so it is not a duplicate notification
     NSDictionary* userInfo2 = @{
                                 @"_lpm": @"messageId_2",

Leanplum-SDK/Classes/Notifications/Push/LPPushNotificationsHandler.h

@@ -14,7 +14,6 @@ NS_ASSUME_NONNULL_BEGIN
 @interface LPPushNotificationsHandler : NSObject
 
 @property (nonatomic, strong) LeanplumShouldHandleNotificationBlock shouldHandleNotification;
-@property (nonatomic, assign) BOOL appWasActivatedByReceivingPushNotification;
 @property (nonatomic, readonly) NSDictionary *currentUserNotificationSettings;
 
 - (void)didReceiveRemoteNotification:(NSDictionary *)userInfo;

Leanplum-SDK/Classes/Notifications/Push/LPPushNotificationsHandler.m

@@ -79,8 +79,8 @@ -(void)didReceiveRemoteNotification:(NSDictionary *)userInfo withAction:(NSStrin
 
     [self.countAggregator incrementCount:@"did_receive_remote_notification"];
 
-    // If app was inactive, then handle notification because the user tapped it.
-    if ([[UIApplication sharedApplication] applicationState] == UIApplicationStateInactive) {
+    // If app was inactive or in background, then handle notification because the user tapped it.
+    if ([[UIApplication sharedApplication] applicationState] != UIApplicationStateActive) {
         [self handleNotification:userInfo
                       withAction:action
                        appActive:NO
@@ -230,10 +230,6 @@ - (void)handleNotification:(NSDictionary *)userInfo
         return;
     }
 
-    if ([self isDuplicateNotification:userInfo]) {
-        return;
-    }
-    
     void (^onContent)(void) = ^{
         if (completionHandler) {
             completionHandler(UIBackgroundFetchResultNewData);
@@ -245,13 +241,6 @@ - (void)handleNotification:(NSDictionary *)userInfo
         }
     };
 
-    if (UIApplication.sharedApplication.applicationState == UIApplicationStateInactive && !self.appWasActivatedByReceivingPushNotification) {
-        [self setAppWasActivatedByReceivingPushNotification:NO];
-        onContent();
-        return;
-    }
-    [self setAppWasActivatedByReceivingPushNotification:NO];
-    
     LPLog(LPDebug, @"Push RECEIVED");
 
     [Leanplum onStartIssued:^() {
@@ -270,6 +259,11 @@ - (void)maybePerformNotificationActions:(NSDictionary *)userInfo
                                  action:(NSString *)action
                                  active:(BOOL)active
 {
+    // Do not perform the action if the app is in background
+    if (UIApplication.sharedApplication.applicationState == UIApplicationStateBackground) {
+        return;
+    }
+
     // Don't handle duplicate notifications.
     if ([self isDuplicateNotification:userInfo]) {
         return;
@@ -322,20 +316,22 @@ - (void)maybePerformNotificationActions:(NSDictionary *)userInfo
                 userInfo[LP_KEY_PUSH_NO_ACTION_MUTE]) {
                 handleNotificationBlock();
             } else {
-                id message = userInfo[@"aps"][@"alert"];
-                if ([message isKindOfClass:NSDictionary.class]) {
-                    message = message[@"body"];
-                }
-                if (message) {
-                    [LPUIAlert showWithTitle:APP_NAME
-                                     message:message
-                           cancelButtonTitle:NSLocalizedString(@"Cancel", nil)
-                           otherButtonTitles:@[NSLocalizedString(@"View", nil)]
-                                       block:^(NSInteger buttonIndex) {
-                                           if (buttonIndex == 1) {
-                                               handleNotificationBlock();
-                                           }
-                                       }];
+                if ([Leanplum hasStarted]) {
+                    id message = userInfo[@"aps"][@"alert"];
+                    if ([message isKindOfClass:NSDictionary.class]) {
+                        message = message[@"body"];
+                    }
+                    if (message) {
+                        [LPUIAlert showWithTitle:APP_NAME
+                                         message:message
+                               cancelButtonTitle:NSLocalizedString(@"Cancel", nil)
+                               otherButtonTitles:@[NSLocalizedString(@"View", nil)]
+                                           block:^(NSInteger buttonIndex) {
+                                               if (buttonIndex == 1) {
+                                                   handleNotificationBlock();
+                                               }
+                                           }];
+                    }
                 }
             }
         }
@@ -450,13 +446,6 @@ - (void)handleNotificationResponse:(NSDictionary *)userInfo
         }
     };
 
-    if (UIApplication.sharedApplication.applicationState == UIApplicationStateInactive || self.appWasActivatedByReceivingPushNotification) {
-        [self setAppWasActivatedByReceivingPushNotification:NO];
-        onContent();
-        return;
-    }
-    [self setAppWasActivatedByReceivingPushNotification:NO];
-    
     LPLog(LPDebug, @"Push RECEIVED");
 
     if ([[UIApplication sharedApplication] applicationState] != UIApplicationStateActive) {

Leanplum-SDK/Classes/Notifications/Push/LPPushNotificationsManager.m

@@ -352,9 +352,8 @@ + (void) load
 
 + (void)handleApplicationDidBecomeActive:(NSNotification *)notification {
     [[LPPushNotificationsManager sharedManager] swizzleAppMethods];
-    NSDictionary *userInfo = notification.userInfo[@"UIApplicationLaunchOptionsRemoteNotificationKey"];
+    NSDictionary *userInfo = notification.userInfo[UIApplicationLaunchOptionsRemoteNotificationKey];
     if (userInfo != nil) {
-        [[LPPushNotificationsManager sharedManager].handler setAppWasActivatedByReceivingPushNotification:YES];
         if (@available(iOS 10, *)) {
             if ([UNUserNotificationCenter currentNotificationCenter].delegate != nil) {
                 [[LPPushNotificationsManager sharedManager].handler handleWillPresentNotification:userInfo];
@@ -502,20 +501,6 @@ - (void)swizzleAppMethods
     {
         LPLog(LPInfo, @"Method swizzling is disabled, make sure to manually call Leanplum methods.");
     }
-    
-    // Detect receiving notifications.
-    [[NSNotificationCenter defaultCenter]
-     addObserverForName:UIApplicationDidFinishLaunchingNotification object:nil queue:nil
-     usingBlock:^(NSNotification *notification) {
-         if (notification.userInfo) {
-             NSDictionary *userInfo = notification.userInfo
-             [UIApplicationLaunchOptionsRemoteNotificationKey];
-             [self.handler handleNotification:userInfo
-                                   withAction:nil
-                                    appActive:NO
-                            completionHandler:nil];
-         }
-     }];
 }
 
 // Block to run to decide whether to show the notification
@@ -525,4 +510,8 @@ - (void)setShouldHandleNotification:(LeanplumShouldHandleNotificationBlock)block
     self.handler.shouldHandleNotification = block;
 }
 
+- (void) dealloc {
+    [[NSNotificationCenter defaultCenter] removeObserver:self];
+}
+
 @end