react-native-netmera 1.4.2 → 1.4.4

package/android/build/outputs/logs/manifest-merger-release-report.txt

@@ -0,0 +1,43 @@
+-- Merging decision tree log ---
+manifest
+ADDED from /Users/gunesbaki/Projects/Netmera/NetmeraSDKReactNative/android/src/main/AndroidManifest.xml:2:1-7:12
+INJECTED from /Users/gunesbaki/Projects/Netmera/NetmeraSDKReactNative/android/src/main/AndroidManifest.xml:2:1-7:12
+INJECTED from /Users/gunesbaki/Projects/Netmera/NetmeraSDKReactNative/android/src/main/AndroidManifest.xml:2:1-7:12
+INJECTED from /Users/gunesbaki/Projects/Netmera/NetmeraSDKReactNative/android/src/main/AndroidManifest.xml:2:1-7:12
+INJECTED from /Users/gunesbaki/Projects/Netmera/NetmeraSDKReactNative/android/src/main/AndroidManifest.xml:2:1-7:12
+INJECTED from /Users/gunesbaki/Projects/Netmera/NetmeraSDKReactNative/android/src/main/AndroidManifest.xml:2:1-7:12
+INJECTED from /Users/gunesbaki/Projects/Netmera/NetmeraSDKReactNative/android/src/main/AndroidManifest.xml:2:1-7:12
+	package
+		ADDED from /Users/gunesbaki/Projects/Netmera/NetmeraSDKReactNative/android/src/main/AndroidManifest.xml:3:11-47
+		INJECTED from /Users/gunesbaki/Projects/Netmera/NetmeraSDKReactNative/android/src/main/AndroidManifest.xml
+		INJECTED from /Users/gunesbaki/Projects/Netmera/NetmeraSDKReactNative/android/src/main/AndroidManifest.xml
+	android:versionName
+		INJECTED from /Users/gunesbaki/Projects/Netmera/NetmeraSDKReactNative/android/src/main/AndroidManifest.xml
+		ADDED from /Users/gunesbaki/Projects/Netmera/NetmeraSDKReactNative/android/src/main/AndroidManifest.xml:2:1-7:12
+		INJECTED from /Users/gunesbaki/Projects/Netmera/NetmeraSDKReactNative/android/src/main/AndroidManifest.xml
+	android:versionCode
+		INJECTED from /Users/gunesbaki/Projects/Netmera/NetmeraSDKReactNative/android/src/main/AndroidManifest.xml
+		ADDED from /Users/gunesbaki/Projects/Netmera/NetmeraSDKReactNative/android/src/main/AndroidManifest.xml:2:1-7:12
+		INJECTED from /Users/gunesbaki/Projects/Netmera/NetmeraSDKReactNative/android/src/main/AndroidManifest.xml
+	xmlns:android
+		ADDED from /Users/gunesbaki/Projects/Netmera/NetmeraSDKReactNative/android/src/main/AndroidManifest.xml:2:11-69
+application
+ADDED from /Users/gunesbaki/Projects/Netmera/NetmeraSDKReactNative/android/src/main/AndroidManifest.xml:4:5-6:19
+service#com.netmera.reactnativesdk.RNNetmeraPushHeadlessService
+ADDED from /Users/gunesbaki/Projects/Netmera/NetmeraSDKReactNative/android/src/main/AndroidManifest.xml:5:9-65
+	android:name
+		ADDED from /Users/gunesbaki/Projects/Netmera/NetmeraSDKReactNative/android/src/main/AndroidManifest.xml:5:18-62
+uses-sdk
+INJECTED from /Users/gunesbaki/Projects/Netmera/NetmeraSDKReactNative/android/src/main/AndroidManifest.xml reason: use-sdk injection requested
+INJECTED from /Users/gunesbaki/Projects/Netmera/NetmeraSDKReactNative/android/src/main/AndroidManifest.xml
+INJECTED from /Users/gunesbaki/Projects/Netmera/NetmeraSDKReactNative/android/src/main/AndroidManifest.xml
+INJECTED from /Users/gunesbaki/Projects/Netmera/NetmeraSDKReactNative/android/src/main/AndroidManifest.xml
+INJECTED from /Users/gunesbaki/Projects/Netmera/NetmeraSDKReactNative/android/src/main/AndroidManifest.xml
+	android:targetSdkVersion
+		INJECTED from /Users/gunesbaki/Projects/Netmera/NetmeraSDKReactNative/android/src/main/AndroidManifest.xml
+		ADDED from /Users/gunesbaki/Projects/Netmera/NetmeraSDKReactNative/android/src/main/AndroidManifest.xml
+		INJECTED from /Users/gunesbaki/Projects/Netmera/NetmeraSDKReactNative/android/src/main/AndroidManifest.xml
+	android:minSdkVersion
+		INJECTED from /Users/gunesbaki/Projects/Netmera/NetmeraSDKReactNative/android/src/main/AndroidManifest.xml
+		ADDED from /Users/gunesbaki/Projects/Netmera/NetmeraSDKReactNative/android/src/main/AndroidManifest.xml
+		INJECTED from /Users/gunesbaki/Projects/Netmera/NetmeraSDKReactNative/android/src/main/AndroidManifest.xml

package/android/src/main/java/com/netmera/reactnativesdk/RNNetmera.java

@@ -16,7 +16,7 @@ public class RNNetmera {
     static void setNetmeraHeaders() {
         ContentValues headerValues = new ContentValues();
         headerValues.put("X-netmera-framework", "react");
-        headerValues.put("X-netmera-frameworkV", "1.4.2");
+        headerValues.put("X-netmera-frameworkV", "1.4.4");
         Netmera.setNetmeraHeaders(headerValues);
     }
 }

package/ios/RNNetmera.m

@@ -46,7 +46,7 @@ NSString *const ERROR_MESSAGE_SET_CATEGORY_PREFERENCE = @"Error occurred while s
 
 + (void)setNetmeraHeaders {
     [Netmera setFramework:@"react"];
-    [Netmera setFrameworkVersion:@"1.4.2"];
+    [Netmera setFrameworkVersion:@"1.4.4"];
 }
 
 + (void)setPushDelegate:(NSObject<NetmeraPushDelegate> *)delegate {
@@ -359,24 +359,24 @@ RCT_EXPORT_METHOD(updateAll:(NSInteger)inboxStatus
 RCT_EXPORT_METHOD(getInboxCountForStatus:(NSDictionary *) filterDictionary
                   resolver: (RCTPromiseResolveBlock)resolve
                   rejecter: (RCTPromiseRejectBlock)reject) {
-    
-    
+
+
     NetmeraInboxCountFilter *filter = [[NetmeraInboxCountFilter alloc] init];
-    
+
     if (filterDictionary[@"status"]) {
         filter.status = [[RNNetmeraUtils shared] getInboxStatus:[filterDictionary[@"status"] integerValue]];
     } else {
         reject(ERROR_CODE_NULL_INBOX_STATUS, ERROR_MESSAGE_NULL_INBOX_STATUS, nil);
     }
-    
+
     if (filterDictionary[@"includeExpiredObjects"]) {
         filter.shouldIncludeExpiredObjects = filterDictionary[@"includeExpiredObjects"];
     }
-    
+
     if (filterDictionary[@"categories"]) {
         filter.categories = filterDictionary[@"categories"];
     }
-    
+
     [Netmera fetchInboxCountWithFilter: filter completion:^(NetmeraInboxCountResponse * _Nullable response, NSError * _Nullable error) {
         if (error != nil) {
             reject(ERROR_CODE_INBOX_STATUS, ERROR_MESSAGE_INBOX_STATUS, nil);
@@ -388,7 +388,7 @@ RCT_EXPORT_METHOD(getInboxCountForStatus:(NSDictionary *) filterDictionary
 
 RCT_EXPORT_METHOD(getUserCategoryPreferenceList: (RCTPromiseResolveBlock)resolve
                   rejecter: (RCTPromiseRejectBlock)reject) {
-    
+
     [Netmera getUserCategoryPreferenceListWithCompletion:^(NSArray<NetmeraUserCategoryPreference *> * _Nullable categories, NSError * _Nullable error) {
         if (error != nil) {
             reject(ERROR_CODE_GET_CATEGORY_PREFERENCE, ERROR_MESSAGE_GET_CATEGORY_PREFERENCE, nil);

package/ios/RNNetmera.xcodeproj/project.xcworkspace/contents.xcworkspacedata

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "self:">
+   </FileRef>
+</Workspace>

package/ios/RNNetmera.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>

package/ios/RNNetmeraRCTEventEmitter.m

@@ -9,17 +9,39 @@
 #import "RNNetmeraRCTEventEmitter.h"
 
 @implementation RNNetmeraRCTEventEmitter
-{
-  bool hasListeners;
-}
+
 RCT_EXPORT_MODULE();
 
+bool isReactBridgeInitialized;
+
+NSDictionary* waitingOnPushRegister = nil;
+NSDictionary* waitingOnPushReceive = nil;
+NSDictionary* waitingOnPushOpen = nil;
+NSDictionary* waitingOnPushDismiss = nil;
+
 -(void)startObserving {
-  hasListeners = YES;
+    isReactBridgeInitialized = YES;
+
+    if (waitingOnPushRegister != nil) {
+        [[NSNotificationCenter defaultCenter] postNotificationName:@"onPushRegister" object:nil userInfo: waitingOnPushRegister];
+        waitingOnPushRegister = nil;
+    }
+    if (waitingOnPushReceive != nil) {
+        [[NSNotificationCenter defaultCenter] postNotificationName:@"onPushReceive" object:nil userInfo: waitingOnPushReceive];
+        waitingOnPushReceive = nil;
+    }
+    if (waitingOnPushOpen != nil) {
+        [[NSNotificationCenter defaultCenter] postNotificationName:@"onPushOpen" object:nil userInfo: waitingOnPushOpen];
+        waitingOnPushOpen = nil;
+    }
+    if (waitingOnPushDismiss != nil) {
+        [[NSNotificationCenter defaultCenter] postNotificationName:@"onPushDismiss" object:nil userInfo: waitingOnPushDismiss];
+        waitingOnPushDismiss = nil;
+    }
 }
 
 -(void)stopObserving {
-  hasListeners = NO;
+    isReactBridgeInitialized = NO;
 }
 
 - (NSArray<NSString *> *)supportedEvents
@@ -42,25 +64,50 @@ RCT_EXPORT_MODULE();
 }
 
 - (void)emitEvent:(NSNotification *)notification {
-  if (hasListeners) {
+  if (isReactBridgeInitialized) {
     [self sendEventWithName:notification.name body:notification.userInfo];
   }
 }
 
 + (void)onPushRegister:(NSDictionary *)body {
-  [[NSNotificationCenter defaultCenter] postNotificationName:@"onPushRegister" object:nil userInfo:body];
+    NSData *deviceToken = body[@"pushToken"];
+    const unsigned char *bytes = deviceToken.bytes;
+    
+    NSMutableString *deviceTokenString = [NSMutableString string];
+      for (NSUInteger i = 0; i < deviceToken.length; i++) {
+       [deviceTokenString appendFormat:@"%02x", bytes[i]];
+      }
+    NSDictionary* pushToken = @{@"pushToken" : deviceTokenString};
+    
+    if (isReactBridgeInitialized) {
+        [[NSNotificationCenter defaultCenter] postNotificationName:@"onPushRegister" object:nil userInfo:pushToken];
+    } else {
+        waitingOnPushRegister = pushToken;
+    }
 }
 
 + (void)onPushReceive:(NSDictionary *)body {
-  [[NSNotificationCenter defaultCenter] postNotificationName:@"onPushReceive" object:nil userInfo:body];
+    if (isReactBridgeInitialized) {
+        [[NSNotificationCenter defaultCenter] postNotificationName:@"onPushReceive" object:nil userInfo:body];
+    } else {
+        waitingOnPushReceive = body;
+    }
 }
 
 + (void)onPushOpen:(NSDictionary *)body {
-  [[NSNotificationCenter defaultCenter] postNotificationName:@"onPushOpen" object:nil userInfo:body];
+    if (isReactBridgeInitialized) {
+        [[NSNotificationCenter defaultCenter] postNotificationName:@"onPushOpen" object:nil userInfo:body];
+    } else {
+        waitingOnPushOpen = body;
+    }
 }
 
 + (void)onPushDismiss:(NSDictionary *)body {
-  [[NSNotificationCenter defaultCenter] postNotificationName:@"onPushDismiss" object:nil userInfo:body];
+    if (isReactBridgeInitialized) {
+        [[NSNotificationCenter defaultCenter] postNotificationName:@"onPushDismiss" object:nil userInfo:body];
+    } else {
+        waitingOnPushDismiss = body;
+    }
 }
 
 @end

package/package.json

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