react-native-netmera 1.3.4 → 1.3.8

package/ios/RNNetmera.m

@@ -10,53 +10,51 @@
 #import "RNNetmeraEvent.h"
 #import "RNNetmeraUser.h"
 #import "RNNetmeraUtils.h"
+#import "RNNetmeraCategoryObject.h"
 #import <Netmera/Netmera.h>
 
-
 NSString *const ERROR_CODE_INBOX = @"2016";
 NSString *const ERROR_MESSAGE_INBOX = @"There was a problem fetching inbox";
 NSString *const ERROR_CODE_NOT_NEXT_PAGE = @"2018";
 NSString *const ERROR_MESSAGE_NOT_NEXT_PAGE = @"Not next page";
 NSString *const ERROR_CODE_UPDATE_STATUS = @"2019";
 NSString *const ERROR_MESSAGE_UPDATE_STATUS = @"There was a problem updating status";
+NSString *const ERROR_CODE_NULL_CATEGORY = @"2020";
+NSString *const ERROR_MESSAGE_NULL_CATEGORY = @"Must call fetchCategory method first";
+NSString *const ERROR_CODE_INVALID_PUSH_OBJECT = @"2021";
+NSString *const ERROR_MESSAGE_INVALID_PUSH_OBJECT = @"Received NetmeraPushObject was not valid.";
 
 
 @implementation RNNetmera
 
-- (instancetype)init
-{
-    if (self = [super init]) {
-        [Netmera setFrameworkVersion:@"1.3.4true"];
-        [Netmera setFramework:@"react"];
-    }
+- (instancetype)init {
     return self;
 }
 
-+ (BOOL)requiresMainQueueSetup
-{
-    return NO;
++ (void)initNetmera:(NSString *)apiKey {
+    [Netmera start];
+    [Netmera setAPIKey:apiKey];
+    [self setNetmeraHeaders];
 }
 
-- (dispatch_queue_t)methodQueue
-{
-    return dispatch_get_main_queue();
++ (void)setNetmeraHeaders {
+    [Netmera setFramework:@"react"];
+    [Netmera setFrameworkVersion:@"1.3.8"];
 }
 
-RCT_EXPORT_MODULE()
++ (void)setPushDelegate:(NSObject<NetmeraPushDelegate> *)delegate {
+    [Netmera setPushDelegate:delegate];
+}
 
-RCT_EXPORT_METHOD(initNetmera:(NSString *)apiKey)
-{
-  [Netmera start];
-  [Netmera setAPIKey:apiKey];
++ (void)requestPushNotificationAuthorization {
+    [Netmera requestPushNotificationAuthorizationForTypes:UIUserNotificationTypeAlert | UIUserNotificationTypeBadge | UIUserNotificationTypeSound];
 }
 
-RCT_EXPORT_METHOD(currentExternalId:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
-{
-    resolve([Netmera getCurrentExternalId]);
++ (BOOL)requiresMainQueueSetup {
+    return NO;
 }
 
-RCT_EXPORT_METHOD(logging:(BOOL *)enabled)
-{
++ (void)logging: (BOOL) enabled {
     if(enabled){
         [Netmera setLogLevel:(NetmeraLogLevelDebug)];
     }else{
@@ -64,55 +62,59 @@ RCT_EXPORT_METHOD(logging:(BOOL *)enabled)
     }
 }
 
-RCT_EXPORT_METHOD(setBaseUrl:(NSString *)baseUrl)
-{
-  [Netmera setBaseURL:baseUrl];
+- (dispatch_queue_t)methodQueue {
+    return dispatch_get_main_queue();
+}
+
+RCT_EXPORT_MODULE()
+
+RCT_EXPORT_METHOD(currentExternalId:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
+    resolve([Netmera getCurrentExternalId]);
 }
 
-RCT_EXPORT_METHOD(requestPushNotificationAuthorization)
-{
-  [Netmera requestPushNotificationAuthorizationForTypes:UIUserNotificationTypeAlert | UIUserNotificationTypeBadge | UIUserNotificationTypeSound];
+RCT_EXPORT_METHOD(logging:(BOOL *)enabled) {
+    [RNNetmera logging:enabled];
 }
 
-RCT_EXPORT_METHOD(requestPermissionsForLocation)
-{
+RCT_EXPORT_METHOD(setBaseUrl:(NSString *)baseUrl) {
+    [Netmera setBaseURL:baseUrl];
+}
+
+RCT_EXPORT_METHOD(requestPushNotificationAuthorization) {
+    [Netmera requestPushNotificationAuthorizationForTypes:UIUserNotificationTypeAlert | UIUserNotificationTypeBadge | UIUserNotificationTypeSound];
+}
+
+RCT_EXPORT_METHOD(requestPermissionsForLocation) {
     [Netmera requestLocationAuthorization];
 }
 
-RCT_EXPORT_METHOD(setNetmeraMaxActiveRegions :(NSInteger)maxActiveRegions)
-{
+RCT_EXPORT_METHOD(setNetmeraMaxActiveRegions :(NSInteger)maxActiveRegions) {
     [Netmera setNetmeraMaxActiveRegions:maxActiveRegions];
 }
 
-RCT_EXPORT_METHOD(enablePopupPresentation)
-{
+RCT_EXPORT_METHOD(enablePopupPresentation) {
     [Netmera setEnabledPopupPresentation:true];
 }
 
-RCT_EXPORT_METHOD(disablePopupPresentation)
-{
+RCT_EXPORT_METHOD(disablePopupPresentation) {
     [Netmera setEnabledPopupPresentation:false];
 }
 
-RCT_EXPORT_METHOD(isPushEnabled:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
-{
+RCT_EXPORT_METHOD(isPushEnabled:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
     resolve(@([Netmera isEnabledReceivingPushNotifications]));
 }
 
-RCT_EXPORT_METHOD(enablePush)
-{
+RCT_EXPORT_METHOD(enablePush) {
     [Netmera setEnabledReceivingPushNotifications:true];
 }
 
-RCT_EXPORT_METHOD(disablePush)
-{
+RCT_EXPORT_METHOD(disablePush) {
     [Netmera setEnabledReceivingPushNotifications:false];
 }
 
 RCT_EXPORT_METHOD(fetchInbox:(NSDictionary *)inboxDictionary
                   resolver: (RCTPromiseResolveBlock)resolve
-                  rejecter:(RCTPromiseRejectBlock)reject)
-{
+                  rejecter:(RCTPromiseRejectBlock)reject) {
     NetmeraInboxFilter *filter = [[NetmeraInboxFilter alloc] init];
 
     if(inboxDictionary[@"status"]){
@@ -134,28 +136,27 @@ RCT_EXPORT_METHOD(fetchInbox:(NSDictionary *)inboxDictionary
 
     [Netmera fetchInboxUsingFilter:filter
                         completion:^(NetmeraInbox *inbox, NSError *error) {
-                            if(error) {
-                                reject(ERROR_CODE_INBOX, ERROR_MESSAGE_INBOX, nil);
-                            }else{
-                                self.netmeraInbox = inbox;
-                                NSMutableArray *array = [[NSMutableArray alloc]init];
-                                for(NetmeraPushObject *object in self.netmeraInbox.objects){
-                                  [array addObject:[[RNNetmeraUtils shared] dictionaryFromPushObject:object]];
-                                }
-                                resolve(array);
-                            }
-                        }];
-}
-
-RCT_REMAP_METHOD(fetchNextPage, resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
-{
+        if(error) {
+            reject(ERROR_CODE_INBOX, ERROR_MESSAGE_INBOX, nil);
+        }else{
+            self.netmeraInbox = inbox;
+            NSMutableArray *array = [[NSMutableArray alloc]init];
+            for(NetmeraPushObject *object in self.netmeraInbox.objects){
+                [array addObject:[[RNNetmeraUtils shared] dictionaryFromPushObject:object]];
+            }
+            resolve(array);
+        }
+    }];
+}
+
+RCT_REMAP_METHOD(fetchNextPage, resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
     [self.netmeraInbox fetchNextPageWithCompletionBlock:^(NSError *error) {
         if(error) {
             reject(ERROR_CODE_NOT_NEXT_PAGE, ERROR_MESSAGE_NOT_NEXT_PAGE, nil);
         }else{
             NSMutableArray *array = [[NSMutableArray alloc]init];
             for(NetmeraPushObject *object in self.netmeraInbox.objects){
-              [array addObject:[[RNNetmeraUtils shared] dictionaryFromPushObject:object]];
+                [array addObject:[[RNNetmeraUtils shared] dictionaryFromPushObject:object]];
             }
             resolve(array);
         }
@@ -164,8 +165,7 @@ RCT_REMAP_METHOD(fetchNextPage, resolver:(RCTPromiseResolveBlock)resolve rejecte
 
 RCT_EXPORT_METHOD(countForStatus:(NSInteger *)status
                   resolver: (RCTPromiseResolveBlock)resolve
-                  rejecter:(RCTPromiseRejectBlock)reject)
-{
+                  rejecter:(RCTPromiseRejectBlock)reject) {
     NetmeraInboxStatus netmeraInboxStatus = status;
     NSInteger numOfReadOrUnread = [self.netmeraInbox countForStatus:netmeraInboxStatus];
     resolve([@(numOfReadOrUnread) stringValue]);
@@ -175,33 +175,47 @@ RCT_EXPORT_METHOD(inboxUpdateStatus:(NSInteger)fromIndex
                   toIndex:(NSInteger)toIndex
                   status:(NSInteger)status
                   resolver: (RCTPromiseResolveBlock)resolve
-                  rejecter:(RCTPromiseRejectBlock)reject)
-{
-      @try {
-    NSIndexSet *set = [NSIndexSet indexSetWithIndexesInRange:NSMakeRange(fromIndex, toIndex-fromIndex)];
-    NetmeraInboxStatus netmeraInboxStatus = status;
-    NSArray *pushObjects = [self.netmeraInbox.objects objectsAtIndexes:set];
-    [self.netmeraInbox updateStatus:netmeraInboxStatus
-                     forPushObjects:pushObjects
-                         completion:^(NSError *error) {
-                             if(error) {
-                                 reject(ERROR_CODE_UPDATE_STATUS, ERROR_MESSAGE_UPDATE_STATUS, nil);
-                             }else{
-                                 resolve(nil);
-                             }
-                         }];
-
-     }@catch (NSException *exception) {
-         reject(ERROR_CODE_UPDATE_STATUS, ERROR_MESSAGE_UPDATE_STATUS, nil);
-     }
-}
-
-//    TODO
-//    fetchCategory
-//    fetchNextCategoryPage
-
-RCT_EXPORT_METHOD(sendEvent:(NSDictionary *)eventDictionary)
-{
+                  rejecter:(RCTPromiseRejectBlock)reject) {
+    @try {
+        NSIndexSet *set = [NSIndexSet indexSetWithIndexesInRange:NSMakeRange(fromIndex, toIndex-fromIndex)];
+        NetmeraInboxStatus netmeraInboxStatus = status;
+        NSArray *pushObjects = [self.netmeraInbox.objects objectsAtIndexes:set];
+        [self.netmeraInbox updateStatus:netmeraInboxStatus
+                         forPushObjects:pushObjects
+                             completion:^(NSError *error) {
+            if(error) {
+                reject(ERROR_CODE_UPDATE_STATUS, ERROR_MESSAGE_UPDATE_STATUS, nil);
+            }else{
+                resolve(nil);
+            }
+        }];
+
+    } @catch (NSException *exception) {
+        reject(ERROR_CODE_UPDATE_STATUS, ERROR_MESSAGE_UPDATE_STATUS, nil);
+    }
+}
+
+RCT_EXPORT_METHOD(fetchCategory:(NSDictionary *)inboxDictionary
+                  resolver: (RCTPromiseResolveBlock)resolve
+                  rejecter:(RCTPromiseRejectBlock)reject) {
+    NetmeraInboxCategoryFilter *filter = [RNNetmeraCategoryObject getCategoryObject: inboxDictionary];
+
+    [Netmera fetchInboxCategoryUsingFilter:filter completion:^(NetmeraInboxCategory *inbox, NSError *error) {
+        [self setCategory:inbox error:error resolver:resolve rejecter:reject];
+    }];
+}
+
+RCT_EXPORT_METHOD(fetchNextCategoryPage: (RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
+    if (self.netmeraInboxCategory == nil) {
+        reject(ERROR_CODE_NULL_CATEGORY, ERROR_MESSAGE_NULL_CATEGORY, nil);
+    }
+
+    [self.netmeraInboxCategory fetchNextPageWithCompletionBlock:^(NSError * _Nonnull error) {
+        [self setCategory:self.netmeraInboxCategory error:error resolver:resolve rejecter:reject];
+    }];
+}
+
+RCT_EXPORT_METHOD(sendEvent:(NSDictionary *)eventDictionary) {
     NSMutableDictionary *mutableEventDictionary = [eventDictionary mutableCopy];
     RNNetmeraEvent *event = [RNNetmeraEvent event];
     event.netmeraEventKey = mutableEventDictionary[@"code"];
@@ -210,8 +224,7 @@ RCT_EXPORT_METHOD(sendEvent:(NSDictionary *)eventDictionary)
     [Netmera sendEvent:event];
 }
 
-RCT_EXPORT_METHOD(updateUser:(NSDictionary *)userDictionary)
-{
+RCT_EXPORT_METHOD(updateUser:(NSDictionary *)userDictionary) {
     NSMutableDictionary *userMutableDictionary = [userDictionary mutableCopy];
     NSArray *keysForNullValues = [userMutableDictionary allKeysForObject:[NSNull null]];
     [userMutableDictionary removeObjectsForKeys:keysForNullValues];
@@ -228,14 +241,112 @@ RCT_EXPORT_METHOD(updateUser:(NSDictionary *)userDictionary)
     [Netmera updateUser:user];
 }
 
-//    TODO
-//    initializeService
-//    setApiKey
-//    handlePushObject
-//    handleLastMessage
-//    handleInteractiveAction
-//    updateStatusByCategories
-//    updateAll
+RCT_EXPORT_METHOD(setApiKey:(NSString *)apiKey) {
+    [Netmera setAPIKey:apiKey];
+}
 
-@end
+RCT_EXPORT_METHOD(handlePushObject:(NSString *)pushId) {
+    if (self.netmeraInbox == nil) {
+        return;
+    }
+
+    for (int i = 0; i < [self.netmeraInbox.objects count]; i++) {
+        if ([pushId isEqualToString: self.netmeraInbox.objects[i].pushId]) {
+            [Netmera handlePushObject: self.netmeraInbox.objects[i]];
+        }
+    }
+}
+
+RCT_EXPORT_METHOD(handleInteractiveAction:(NSString *)interactiveActionId) {
+    if (self.netmeraInbox == nil) {
+        return;
+    }
+
+    for (int i = 0; i < [self.netmeraInbox.objects count]; i++) {
+        if (self.netmeraInbox.objects[i].interactiveActions != nil) {
+            for (int j = 0; j < [self.netmeraInbox.objects[i].interactiveActions count]; j++) {
+                NetmeraUserNotificationAction *action = self.netmeraInbox.objects[i].interactiveActions[j];
+                if (action != nil && [interactiveActionId isEqualToString: action.interactiveAction.identifier]) {
+                    [Netmera handleInteractiveAction:action forPushObject:nil];
+                    return;
+                }
+            }
+        }
+    }
+}
 
+RCT_EXPORT_METHOD(handleLastMessage: (NSString*) categoryName resolver: (RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
+    if (self.netmeraInboxCategory == nil) {
+        reject(ERROR_CODE_NULL_CATEGORY, ERROR_MESSAGE_NULL_CATEGORY, nil);
+    }
+
+    if (categoryName == nil || [categoryName isEqualToString:@""]) {
+        reject(ERROR_CODE_INVALID_PUSH_OBJECT, ERROR_MESSAGE_INVALID_PUSH_OBJECT, nil);
+    }
+
+
+    for(NetmeraInboxCategoryObject *category in self.netmeraInboxCategory.objects){
+        if([categoryName isEqualToString: category.categoryName]){
+            [Netmera handlePushObject:category.lastMessage];
+            break;
+        }
+    }
+}
+
+RCT_EXPORT_METHOD(updateStatusByCategories:(NSInteger)fromIndex
+                  toIndex:(NSInteger)toIndex
+                  status:(NSInteger)status
+                  resolver: (RCTPromiseResolveBlock)resolve
+                  rejecter:(RCTPromiseRejectBlock)reject) {
+    @try {
+        NSIndexSet *set = [NSIndexSet indexSetWithIndexesInRange:NSMakeRange(fromIndex, toIndex - fromIndex)];
+        NSArray *categories = [self.netmeraInboxCategory objects];
+
+        NSMutableArray *categoryList = [NSMutableArray array];
+        for (int i = 0; i < [categories objectsAtIndexes:set].count; i++) {
+            [categoryList addObject:[[categories objectAtIndex:i] categoryName]];
+        }
+        NSArray *categoryNames = [NSArray arrayWithArray:categoryList];
+
+        NetmeraInboxStatus netmeraInboxStatus = status;
+
+        [Netmera updateStatus:netmeraInboxStatus
+                 byCategories:categoryNames
+                   completion:^(NSError *error) {
+            if(error) {
+                reject(ERROR_CODE_UPDATE_STATUS, ERROR_MESSAGE_UPDATE_STATUS, nil);
+            }else{
+                resolve(nil);
+            }
+        }];
+
+    } @catch (NSException *exception) {
+        reject(ERROR_CODE_UPDATE_STATUS, ERROR_MESSAGE_UPDATE_STATUS, nil);
+    }
+}
+
+RCT_EXPORT_METHOD(updateAll:(NSInteger)inboxStatus
+                  resolver: (RCTPromiseResolveBlock)resolve
+                  rejecter:(RCTPromiseRejectBlock)reject) {
+    [Netmera updateStatus:inboxStatus forAllWithCompletion: ^(NSError *error) {
+        if (error != nil) {
+            reject(ERROR_CODE_UPDATE_STATUS, ERROR_MESSAGE_UPDATE_STATUS, nil);
+        } else {
+            resolve(@(YES));
+        }
+    }];
+}
+
+- (void) setCategory: (NetmeraInboxCategory*)category
+               error: (NSError*)error
+            resolver: (RCTPromiseResolveBlock)resolve
+            rejecter: (RCTPromiseRejectBlock)reject {
+    if(error) {
+        reject(ERROR_CODE_NULL_CATEGORY, ERROR_MESSAGE_NULL_CATEGORY, nil);
+    } else {
+        self.netmeraInboxCategory = category;
+        resolve([RNNetmeraCategoryObject mapCategoryObjects: self.netmeraInboxCategory.objects]);
+    }
+}
+
+@end

package/ios/RNNetmeraCategoryObject.h

@@ -0,0 +1,16 @@
+//
+//  RNNetmeraCategoryObject.h
+//  Netmera SDK
+//
+//  Created by Ensar Bayhan on 06.01.2022.
+//  Copyright © 2022 Netmera. All rights reserved.
+//
+
+#import <Netmera/Netmera.h>
+
+@interface RNNetmeraCategoryObject : NSObject
+
++(NSArray<NSDictionary*>*) mapCategoryObjects: (NSMutableArray<NetmeraInboxCategoryObject *>*) categoryObjects;
++(NetmeraInboxCategoryFilter*) getCategoryObject: (NSDictionary*) inboxDictionary;
+
+@end

package/ios/RNNetmeraCategoryObject.m

@@ -0,0 +1,59 @@
+//
+//  RNNetmeraCategoryObject.m
+//  Netmera SDK
+//
+//  Created by Ensar Bayhan on 06.01.2022.
+//  Copyright © 2022 Netmera. All rights reserved.
+//
+
+#import "RNNetmeraCategoryObject.h"
+#import "RNNetmeraUtils.h"
+
+@implementation RNNetmeraCategoryObject
+
++(NSArray<NSDictionary*>*) mapCategoryObjects: (NSMutableArray<NetmeraInboxCategoryObject *>*) categoryObjects {
+    NSMutableArray<NSDictionary*> *categoryObjectList = [[NSMutableArray alloc]init];
+    for (int i = 0; i < [categoryObjects count]; i++) {
+        [categoryObjectList addObject: [self getCategoryObjectMap:categoryObjects[i]]];
+    }
+    return categoryObjectList;
+}
+
++(NSDictionary*) getCategoryObjectMap:(NetmeraInboxCategoryObject*) categoryObject {
+    NSMutableDictionary *data = [NSMutableDictionary dictionary];
+    [data setValue:[categoryObject categoryName] forKey:@"categoryName"];
+    [data setValue:@([[categoryObject status] readCount]) forKey:@"readCount"];
+    [data setValue:@([[categoryObject status] unreadCount]) forKey:@"unreadCount"];
+    [data setValue:@([[categoryObject status] deletedCount]) forKey:@"deletedCount"];
+    NSDictionary * lastMsg = [[RNNetmeraUtils shared] dictionaryFromPushObject:[categoryObject lastMessage]];
+
+    NSError *error;
+    NSData *dataxx = [NSJSONSerialization dataWithJSONObject:lastMsg options:0 error:&error];
+    NSString *jsonStr = [[NSString alloc] initWithData:dataxx encoding:NSUTF8StringEncoding];
+
+    [data setValue:jsonStr forKey:@"lastMessage"];
+    //[data setValue:[jsonData toJSONString] forKey:@"categoryStatus"];
+
+    return data;
+}
+
++(NetmeraInboxCategoryFilter*) getCategoryObject: (NSDictionary*) inboxDictionary{
+    NetmeraInboxCategoryFilter *filter = [[NetmeraInboxCategoryFilter alloc] init];
+
+    if(inboxDictionary[@"status"]){
+        NetmeraInboxStatus netmeraInboxStatus =[inboxDictionary[@"status"] integerValue];
+        filter.status = netmeraInboxStatus;
+    }
+
+    if(inboxDictionary[@"pageSize"]){
+        filter.pageSize = [inboxDictionary[@"pageSize"] intValue];
+    }
+
+    if(inboxDictionary[@"includeExpiredObjects"]){
+        filter.shouldIncludeExpiredObjects = [inboxDictionary[@"includeExpiredObjects"] boolValue];
+    }
+
+    return filter;
+}
+
+@end

package/ios/RNNetmeraEvent.m

@@ -11,7 +11,11 @@
 @implementation RNNetmeraEvent
 
 - (NSString *)eventKey {
-    return _netmeraEventKey;
+    if (super.eventKey != nil) {
+        return super.eventKey;
+    } else {
+        return _netmeraEventKey;
+    }
 }
 
 + (NSDictionary *)keyPathPropertySelectorMapping {

package/ios/RNNetmeraRCTEventEmitter.h

@@ -11,9 +11,10 @@
 
 @interface RNNetmeraRCTEventEmitter : RCTEventEmitter <RCTBridgeModule>
 
-+ (void)didPushReceive:(NSDictionary *)body;
-+ (void)didPushOpen:(NSDictionary *)body;
-+ (void)didPushRegister:(NSDictionary *)body;
++(void) onPushRegister:(NSDictionary*)dict;
++(void) onPushReceive:(NSDictionary*)dict;
++(void) onPushDismiss:(NSDictionary*)dict;
++(void) onPushOpen:(NSDictionary *)dict;
 
 @end
 

package/ios/RNNetmeraRCTEventEmitter.m

@@ -24,7 +24,7 @@ RCT_EXPORT_MODULE();
 
 - (NSArray<NSString *> *)supportedEvents
 {
-  return @[@"onPushReceive", @"onPushOpen", @"onPushRegister"];
+  return @[@"onPushReceive", @"onPushOpen", @"onPushRegister", @"onPushDismiss"];
 }
 
 + (BOOL)requiresMainQueueSetup
@@ -47,16 +47,20 @@ RCT_EXPORT_MODULE();
   }
 }
 
-+ (void)didPushReceive:(NSDictionary *)body {
++ (void)onPushRegister:(NSDictionary *)body {
+  [[NSNotificationCenter defaultCenter] postNotificationName:@"onPushRegister" object:nil userInfo:body];
+}
+
++ (void)onPushReceive:(NSDictionary *)body {
   [[NSNotificationCenter defaultCenter] postNotificationName:@"onPushReceive" object:nil userInfo:body];
 }
 
-+ (void)didPushOpen:(NSDictionary *)body {
++ (void)onPushOpen:(NSDictionary *)body {
   [[NSNotificationCenter defaultCenter] postNotificationName:@"onPushOpen" object:nil userInfo:body];
 }
 
-+ (void)didPushRegister:(NSDictionary *)body {
-  [[NSNotificationCenter defaultCenter] postNotificationName:@"onPushRegister" object:nil userInfo:body];
++ (void)onPushDismiss:(NSDictionary *)body {
+  [[NSNotificationCenter defaultCenter] postNotificationName:@"onPushDismiss" object:nil userInfo:body];
 }
 
 @end

package/ios/RNNetmeraUtils.m

@@ -22,22 +22,53 @@ static RNNetmeraUtils *utils;
 
 -(NSDictionary *)dictionaryFromPushObject:(NetmeraPushObject *)pushObject{
     NSMutableDictionary *data = [NSMutableDictionary dictionary];
-    [data setValue:[[pushObject alert] title] forKey:@"title"];
-    [data setValue:[[pushObject alert] subtitle] forKey:@"subtitle"];
-    [data setValue:[[pushObject alert] body] forKey:@"body"];
-    [data setValue:[NSNumber numberWithInteger:[pushObject pushType]] forKey:@"pushType"];
-    [data setValue:[NSNumber numberWithInteger:[pushObject inboxStatus]] forKey:@"inboxStatus"];
-    [data setValue:[pushObject pushId] forKey:@"pushId"];
-    [data setValue:[pushObject pushInstanceId] forKey:@"pushInstanceId"];
-    [data setValue:[[pushObject action] deeplinkURLString] forKey:@"deepLink"];
-    [data setValue:[pushObject externalId] forKey:@"externalId"];
-    [data setValue:[pushObject category] forKey:@"categories"];
-    [data setValue:[[pushObject mediaAttachmentURL] absoluteString] forKey:@"mediaAttachmentURL"];
-    if(pushObject.customDictionary.count > 0){
-        [data setValue:[pushObject customDictionary] forKey:@"customJson"];
+    data[@"pushType"] = [NSNumber numberWithInteger:[pushObject pushType]];
+    data[@"pushId"] = [pushObject pushId];
+    data[@"pushInstanceId"] = [pushObject pushInstanceId];
+    data[@"inboxStatus"] = [NSNumber numberWithInteger:[pushObject inboxStatus]];
+    data[@"category"] = [pushObject interactiveCategoryIdentifier];
+    data[@"customJson"] = [pushObject customDictionary];
+    data[@"deepLink"] = [pushObject action].deeplinkURLString;
+    data[@"webPage"] = [[[pushObject dictionaryValue] objectForKey:@"_nm.act"] objectForKey:@"url"];
+    data[@"externalId"] = [pushObject externalId];
+    data[@"title"] = [[pushObject alert] title];
+    data[@"subtitle"] = [[pushObject alert] subtitle];
+    data[@"body"] = [[pushObject alert] body];
+    data[@"mediaAttachmentURL"] = [[pushObject mediaAttachmentURL] absoluteString];
+    data[@"categories"] = [pushObject category];
+    data[@"carousel"] = [pushObject carousel];
+
+    if(pushObject.expirationDate!=nil){
+        NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];
+        [dateFormatter setDateFormat:@"yyyy-MM-dd HH:mm:ss"];
+        data[@"expireTime"] = [dateFormatter stringFromDate:pushObject.expirationDate];
+    }
+
+
+    if(pushObject.interactiveActions != nil) {
+        NSMutableArray *actions = [[NSMutableArray alloc]init];
+        for(int i = 0 ; i < [pushObject.interactiveActions count]; i++) {
+            NSMutableDictionary *action = [NSMutableDictionary dictionary];
+            action[@"id"] = pushObject.interactiveActions[i].interactiveAction.identifier;
+            action[@"text"] = pushObject.interactiveActions[i].interactiveAction.title;
+            action[@"act"] = pushObject.interactiveActions[i].actionDictionary;
+            action[@"prms"] = pushObject.interactiveActions[i].customDictionary;
+            [actions addObject:action];
+        }
+        NSError *error;
+        NSData *dataxx = [NSJSONSerialization dataWithJSONObject:actions options:0 error:&error];
+        NSString *jsonStr = [[NSString alloc] initWithData:dataxx encoding:NSUTF8StringEncoding];
+        [data setValue:jsonStr forKey:@"interactiveActions"];
     }
+
     if(pushObject.sendDate){
-        [data setValue:[NSNumber numberWithDouble:[[pushObject sendDate] timeIntervalSince1970]*1000]  forKey:@"sendDate"];
+        NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];
+        [dateFormatter setDateFormat:@"yyyy-MM-dd HH:mm:ss"];
+        data[@"sendDate"] = [dateFormatter stringFromDate:pushObject.sendDate];
+    }
+
+    if([[pushObject dictionaryValue] objectForKey:@"_nm.act"] != nil){
+        data[@"pushAction"] = [[pushObject dictionaryValue] objectForKey:@"_nm.act"];
     }
     return data;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-netmera",
-  "version": "1.3.4",
+  "version": "1.3.8",
   "description": "Netmera React Native SDK",
   "main": "index.js",
   "author": "netmera",

package/android/build/.transforms/cc45f1af54894b49e3ec8f6b5a05a8d7.bin

@@ -1 +0,0 @@
-o/classes