react-native-netmera 1.3.0 → 1.3.5

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.h

@@ -7,7 +7,7 @@
 //
 
 
-#import <Netmera/NetmeraEvent.h>
+#import <NetmeraCore/NetmeraEvent.h>
 
 @interface RNNetmeraEvent : NetmeraEvent
 

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/RNNetmeraUser.h

@@ -6,7 +6,7 @@
 //  Copyright © 2019 Netmera. All rights reserved.
 //
 
-#import <Netmera/NetmeraUser.h>
+#import <NetmeraCore/NetmeraUser.h>
 
 @interface RNNetmeraUser : NetmeraUser
 

package/ios/RNNetmeraUtils.h

@@ -6,7 +6,7 @@
 //  Copyright © 2019 Netmera. All rights reserved.
 //
 
-#import <Netmera/NetmeraPushObject.h>
+#import <NetmeraCore/NetmeraPushObject.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

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.0",
+  "version": "1.3.5",
   "description": "Netmera React Native SDK",
   "main": "index.js",
   "author": "netmera",

package/.idea/encodings.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Encoding" addBOMForNewFiles="with NO BOM" />
-</project>

package/.idea/workspace.xml

@@ -1,175 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ChangeListManager">
-    <list default="true" id="af255513-399b-4f8a-aac9-29b75e2af52a" name="Default Changelist" comment="" />
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-  </component>
-  <component name="ProjectId" id="1ZCuX0Sr9vC01OHGCyQ8QvKPJxZ" />
-  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
-  <component name="ProjectViewState">
-    <option name="hideEmptyMiddlePackages" value="true" />
-    <option name="showExcludedFiles" value="true" />
-    <option name="showLibraryContents" value="true" />
-  </component>
-  <component name="PropertiesComponent">
-    <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
-    <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
-    <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
-    <property name="nodejs_npm_path_reset_for_default_project" value="true" />
-    <property name="nodejs_package_manager_path" value="npm" />
-    <property name="ts.external.directory.path" value="$APPLICATION_HOME_DIR$/plugins/JavaScriptLanguage/jsLanguageServicesImpl/external" />
-  </component>
-  <component name="RecentsManager">
-    <key name="MoveFile.RECENT_KEYS">
-      <recent name="$PROJECT_DIR$/example" />
-    </key>
-  </component>
-  <component name="SvnConfiguration">
-    <configuration />
-  </component>
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="af255513-399b-4f8a-aac9-29b75e2af52a" name="Default Changelist" comment="" />
-      <created>1560431382126</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1560431382126</updated>
-      <workItem from="1560431383790" duration="3308000" />
-      <workItem from="1560499138383" duration="6962000" />
-      <workItem from="1560527906623" duration="1321000" />
-      <workItem from="1561383940232" duration="2072000" />
-      <workItem from="1561574468206" duration="253000" />
-      <workItem from="1561624233738" duration="2843000" />
-      <workItem from="1562685956095" duration="1423000" />
-      <workItem from="1562756871962" duration="8016000" />
-      <workItem from="1562866279111" duration="728000" />
-      <workItem from="1562917751884" duration="1764000" />
-      <workItem from="1562933423104" duration="16000" />
-      <workItem from="1562933575490" duration="5338000" />
-      <workItem from="1563257943119" duration="12663000" />
-      <workItem from="1563436224929" duration="9519000" />
-      <workItem from="1563692416446" duration="6610000" />
-      <workItem from="1565200432434" duration="1247000" />
-      <workItem from="1565202413785" duration="454000" />
-      <workItem from="1565271247979" duration="259000" />
-      <workItem from="1566221774216" duration="3292000" />
-      <workItem from="1568116172999" duration="1147000" />
-      <workItem from="1568117948203" duration="2189000" />
-      <workItem from="1568121194768" duration="25000" />
-      <workItem from="1568992316952" duration="415000" />
-      <workItem from="1569228475438" duration="462000" />
-      <workItem from="1569750292522" duration="477000" />
-      <workItem from="1570085119346" duration="513000" />
-      <workItem from="1578033896961" duration="11538000" />
-      <workItem from="1578121096154" duration="1048000" />
-      <workItem from="1578297695711" duration="1356000" />
-      <workItem from="1579697448790" duration="823000" />
-      <workItem from="1580459945043" duration="4775000" />
-      <workItem from="1580477076618" duration="246000" />
-      <workItem from="1583832721504" duration="746000" />
-      <workItem from="1584355437296" duration="1298000" />
-      <workItem from="1584362481623" duration="633000" />
-      <workItem from="1584370613135" duration="316000" />
-      <workItem from="1584385547457" duration="4588000" />
-      <workItem from="1584450108020" duration="269000" />
-      <workItem from="1584519413417" duration="736000" />
-      <workItem from="1584609648609" duration="234000" />
-      <workItem from="1585143635533" duration="2944000" />
-      <workItem from="1586332956571" duration="2759000" />
-      <workItem from="1586371533175" duration="10963000" />
-      <workItem from="1586517769464" duration="487000" />
-      <workItem from="1586850288816" duration="517000" />
-      <workItem from="1586906337600" duration="229000" />
-      <workItem from="1591284929385" duration="1224000" />
-      <workItem from="1591344430590" duration="189000" />
-      <workItem from="1591529202444" duration="276000" />
-      <workItem from="1593160360453" duration="1398000" />
-      <workItem from="1596542830687" duration="709000" />
-      <workItem from="1597907511066" duration="1338000" />
-      <workItem from="1597914039645" duration="112000" />
-      <workItem from="1598375804540" duration="13832000" />
-    </task>
-    <servers />
-  </component>
-  <component name="TodoView">
-    <todo-panel id="selected-file">
-      <is-autoscroll-to-source value="true" />
-    </todo-panel>
-    <todo-panel id="all">
-      <are-packages-shown value="true" />
-      <is-autoscroll-to-source value="true" />
-    </todo-panel>
-  </component>
-  <component name="TypeScriptGeneratedFilesManager">
-    <option name="version" value="1" />
-  </component>
-  <component name="Vcs.Log.Tabs.Properties">
-    <option name="TAB_STATES">
-      <map>
-        <entry key="MAIN">
-          <value>
-            <State>
-              <option name="COLUMN_ORDER" />
-            </State>
-          </value>
-        </entry>
-      </map>
-    </option>
-    <option name="RECENT_FILTERS">
-      <map>
-        <entry key="Branch">
-          <value>
-            <list />
-          </value>
-        </entry>
-        <entry key="User">
-          <value>
-            <list />
-          </value>
-        </entry>
-      </map>
-    </option>
-  </component>
-  <component name="WindowStateProjectService">
-    <state x="675" y="450" key="#com.intellij.fileTypes.FileTypeChooser" timestamp="1598386533395">
-      <screen x="0" y="0" width="2048" height="1280" />
-    </state>
-    <state x="675" y="450" key="#com.intellij.fileTypes.FileTypeChooser/0.0.2048.1280@0.0.2048.1280" timestamp="1598386533395" />
-    <state x="100" y="100" width="1848" height="1080" key="DiffContextDialog" timestamp="1598426932859">
-      <screen x="0" y="0" width="2048" height="1280" />
-    </state>
-    <state x="100" y="100" width="1848" height="1080" key="DiffContextDialog/0.0.2048.1280@0.0.2048.1280" timestamp="1598426932859" />
-    <state x="100" y="100" width="1848" height="1080" key="DiffContextDialog/0.23.2048.1207@0.23.2048.1207" timestamp="1598377460463" />
-    <state width="2027" height="370" key="GridCell.Tab.0.bottom" timestamp="1598383184615">
-      <screen x="0" y="0" width="2048" height="1280" />
-    </state>
-    <state width="2027" height="370" key="GridCell.Tab.0.bottom/0.0.2048.1280@0.0.2048.1280" timestamp="1598383184615" />
-    <state width="2027" height="370" key="GridCell.Tab.0.center" timestamp="1598383184614">
-      <screen x="0" y="0" width="2048" height="1280" />
-    </state>
-    <state width="2027" height="370" key="GridCell.Tab.0.center/0.0.2048.1280@0.0.2048.1280" timestamp="1598383184614" />
-    <state width="2027" height="370" key="GridCell.Tab.0.left" timestamp="1598383184613">
-      <screen x="0" y="0" width="2048" height="1280" />
-    </state>
-    <state width="2027" height="370" key="GridCell.Tab.0.left/0.0.2048.1280@0.0.2048.1280" timestamp="1598383184613" />
-    <state width="2027" height="370" key="GridCell.Tab.0.right" timestamp="1598383184614">
-      <screen x="0" y="0" width="2048" height="1280" />
-    </state>
-    <state width="2027" height="370" key="GridCell.Tab.0.right/0.0.2048.1280@0.0.2048.1280" timestamp="1598383184614" />
-    <state x="671" y="397" width="706" height="486" key="find.popup" timestamp="1598399871944">
-      <screen x="0" y="0" width="2048" height="1280" />
-    </state>
-    <state x="671" y="397" width="706" height="486" key="find.popup/0.0.2048.1280@0.0.2048.1280" timestamp="1598399871944" />
-    <state x="689" y="291" width="670" height="676" key="search.everywhere.popup" timestamp="1598389628122">
-      <screen x="0" y="0" width="2048" height="1280" />
-    </state>
-    <state x="689" y="291" width="670" height="676" key="search.everywhere.popup/0.0.2048.1280@0.0.2048.1280" timestamp="1598389628122" />
-  </component>
-</project>

package/android/.idea/codeStyles/Project.xml

@@ -1,29 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <Objective-C-extensions>
-      <file>
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Import" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Macro" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Typedef" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Enum" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Constant" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Global" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Struct" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="FunctionPredecl" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Function" />
-      </file>
-      <class>
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Property" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Synthesize" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InitMethod" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="StaticMethod" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InstanceMethod" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="DeallocMethod" />
-      </class>
-      <extensions>
-        <pair source="cpp" header="h" fileNamingConvention="NONE" />
-        <pair source="c" header="h" fileNamingConvention="NONE" />
-      </extensions>
-    </Objective-C-extensions>
-  </code_scheme>
-</component>

package/android/.idea/runConfigurations.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RunConfigurationProducerService">
-    <option name="ignoredProducers">
-      <set>
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
-      </set>
-    </option>
-  </component>
-</project>