Merge pull request #109 from blueshift-labs/development_version_2.0.10

inapp silent push fixees
blueshift-labs · Apr 27, 2020 · f2e0200 · f2e0200
2 parents 807e82c + dca1def
commit f2e0200
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/BlueShift-iOS-SDK/BlueShift.m b/BlueShift-iOS-SDK/BlueShift.m
@@ -173,16 +173,16 @@ - (NSString *) getDeviceToken {
 }
 
 - (void) createInAppNotification:(NSDictionary *)dictionary forApplicationState:(UIApplicationState)applicationState {
-    if (_config.enableInAppNotification == YES && [[UIApplication sharedApplication] applicationState] == UIApplicationStateActive) {
+    if (_config.enableInAppNotification == YES) {
         if ([BlueshiftEventAnalyticsHelper isSilentPushNotification: dictionary] && _config.inAppBackgroundFetchEnabled == YES) {
             [self fetchInAppNotificationFromAPI:^() {
-                    if (self->_config.inAppManualTriggerEnabled == NO) {
+                    if (self->_config.inAppManualTriggerEnabled == NO && [[UIApplication sharedApplication] applicationState] == UIApplicationStateActive) {
                         [_inAppNotificationMananger fetchInAppNotificationsFromDataStore: BlueShiftInAppTriggerNow];
                     }
                 } failure:^(NSError *error){
                     NSLog(@"%@", error);
             }];
-        } else if(_config.inAppManualTriggerEnabled == NO){
+        } else if(_config.inAppManualTriggerEnabled == NO && [[UIApplication sharedApplication] applicationState] == UIApplicationStateActive){
           [self startInAppMessageLoadFromaDBTimer];
         }
     }

diff --git a/BlueShift-iOS-SDK/BlueShiftAppData.m b/BlueShift-iOS-SDK/BlueShiftAppData.m
@@ -39,7 +39,7 @@ - (NSString *)bundleIdentifier {
 - (NSDictionary *)toDictionary {
     NSMutableDictionary *appMutableDictionary = [NSMutableDictionary dictionary];
     if (self.appName) {
-        [appMutableDictionary setObject:self.appName forKey:@"app_name"];
+        [appMutableDictionary setObject:self.bundleIdentifier forKey:@"app_name"];
     }
 
     if (self.appVersion) {