Merged in release/14.1.2 (pull request #47)

Release/14.1.2

Author: Mislav Stanić

android/src/main/java/com/shakebugs/react/utils/Converter.java

@@ -0,0 +1,15 @@
+package com.shakebugs.react.utils;
+
+public class Converter {
+    public static int stringToInt(String string) {
+        int result = 0;
+
+        try {
+            result = Integer.parseInt(string);
+        } catch (Exception e) {
+            Logger.w("Notification id is not a valid integer.");
+        }
+
+        return result;
+    }
+}

android/src/main/java/com/shakebugs/react/utils/Mapper.java

@@ -77,19 +77,27 @@ public static NetworkRequest mapToNetworkRequest(ReadableMap object) {
     }
 
     public static NotificationEvent mapToNotificationEvent(ReadableMap object) {
+        String id = object.hasKey("id") && !object.isNull("id") ? object.getString("id") : "";
+        String title = object.hasKey("title") && !object.isNull("title") ? object.getString("title") : "";
+        String description = object.hasKey("description") && !object.isNull("description") ? object.getString("description") : "";
+
         NotificationEvent notificationEvent = new NotificationEvent();
-        notificationEvent.setId(object.getInt("id"));
-        notificationEvent.setTitle(object.getString("title"));
-        notificationEvent.setDescription(object.getString("description"));
+        notificationEvent.setId(Converter.stringToInt(id));
+        notificationEvent.setTitle(title);
+        notificationEvent.setDescription(description);
 
         return notificationEvent;
     }
 
     public static WritableMap notificationEventToMap(NotificationEvent notificationEvent) {
+        int id = notificationEvent.getId();
+        String title = notificationEvent.getTitle() == null ? "" : notificationEvent.getTitle();
+        String description = notificationEvent.getDescription() == null ? "" : notificationEvent.getDescription();
+
         WritableMap map = new WritableNativeMap();
-        map.putInt("id", notificationEvent.getId());
-        map.putString("title", notificationEvent.getTitle());
-        map.putString("description", notificationEvent.getDescription());
+        map.putString("id", String.valueOf(id));
+        map.putString("title", title);
+        map.putString("description", description);
 
         return map;
     }

example/package.json

@@ -31,9 +31,9 @@
     "ios:dev": "export IOS_DEPENDENCY=$npm_package_config_ios_dev && npm run clean:ios && npm run ios:run:dev",
     "ios:stg": "export IOS_DEPENDENCY=$npm_package_config_ios_stg && npm run clean:ios && npm run ios:run:stg",
     "ios:prd": "export IOS_DEPENDENCY=$npm_package_config_ios_prd && npm run clean:ios && npm run ios:run:prd",
-    "ios:run:dev": "react-native run-ios --scheme=Development",
-    "ios:run:stg": "react-native run-ios --scheme=Staging",
-    "ios:run:prd": "react-native run-ios --scheme=Production",
+    "ios:run:dev": "react-native run-ios --scheme=Development --configuration=DevelopmentDebug",
+    "ios:run:stg": "react-native run-ios --scheme=Staging --configuration=StagingDebug",
+    "ios:run:prd": "react-native run-ios --scheme=Production --configuration=ProductionDebug",
     "build:ios": "npm run build:ios:dev",
     "build:ios:dev": "export IOS_DEPENDENCY=$npm_package_config_ios_dev && npm run clean:ios && npm run bundle:ios && cd ios && xcodebuild archive -workspace example.xcworkspace -scheme Development -configuration DevelopmentRelease 'COMPILER_INDEX_STORE_ENABLE=NO' -archivePath example.xcarchive && xcodebuild -exportArchive -archivePath example.xcarchive -exportPath ./ -exportOptionsPlist ../export_options.plist",
     "build:ios:stg": "export IOS_DEPENDENCY=$npm_package_config_ios_stg && npm run clean:ios && npm run bundle:ios && cd ios && xcodebuild archive -workspace example.xcworkspace -scheme Staging -configuration StagingRelease 'COMPILER_INDEX_STORE_ENABLE=NO' -archivePath example.xcarchive && xcodebuild -exportArchive -archivePath example.xcarchive -exportPath ./ -exportOptionsPlist ../export_options.plist",

example/src/ui/shake/ShakeScreen.js

@@ -150,7 +150,7 @@ const ShakeScreen = (props) => {
 
     const insertNotificationEvent = () => {
         const notificationEventBuilder = new NotificationEventBuilder()
-            .setId(0)
+            .setId('0')
             .setDescription('Description')
             .setTitle('Title');
         Shake.insertNotificationEvent(notificationEventBuilder);

index.d.ts

@@ -101,7 +101,7 @@ declare module "react-native-shake" {
     }
 
     export class NotificationEvent {
-        id: number;
+        id: string;
         title: string;
         description: string;
     }
@@ -119,8 +119,8 @@ declare module "react-native-shake" {
     }
 
     export class NotificationEventBuilder {
-        getId: () => number;
-        setId: (id: number) => NotificationEventBuilder;
+        getId: () => string;
+        setId: (id: string) => NotificationEventBuilder;
         getTitle: () => string;
         setTitle: (title: string) => NotificationEventBuilder;
         getDescription: () => string;

ios/RNShake.m

@@ -354,9 +354,9 @@ - (NSDictionary*)mapToNotificationEvent:(nonnull NSDictionary*)notificationDict
 {
     NSDictionary *notificationEvent = [[NSDictionary alloc] init];
     notificationEvent = @{
-        @"id": notificationDict[@"id"],
-        @"title": notificationDict[@"title"],
-        @"description": notificationDict[@"description"]
+        @"id": (notificationDict[@"id"] ?: @""),
+        @"title": (notificationDict[@"title"] ?: @""),
+        @"description": (notificationDict[@"description"] ?: @"")
     };
     return notificationEvent;
 }
@@ -365,9 +365,9 @@ - (NSDictionary*)notificationToMap:(nonnull SHKNotificationEventEditor*)notifica
 {
     NSDictionary *notificationDict = [[NSDictionary alloc] init];
     notificationDict = @{
-        @"id": notification.identifier,
-        @"title": notification.title,
-        @"description": notification.description,
+        @"id": (notification.identifier ?: @""),
+        @"title": (notification.title ?: @""),
+        @"description": (notification.description ?: @"")
     };
     return notificationDict;
 }

src/builders/NotificationEventBuilder.js

@@ -18,9 +18,9 @@ class NotificationEventBuilder {
             this._title = notificationEvent.title;
             this._description = notificationEvent.description;
         } else {
-            this._id = 0;
-            this._title = "";
-            this._description = "";
+            this._id = '';
+            this._title = '';
+            this._description = '';
         }
     }
 
@@ -30,6 +30,9 @@ class NotificationEventBuilder {
 
     setId(value) {
         this._id = value;
+        if (!this._id) {
+            this._id = '';
+        }
         return this;
     }
 
@@ -39,6 +42,9 @@ class NotificationEventBuilder {
 
     setTitle(value) {
         this._title = value;
+        if (!this._title) {
+            this._title = '';
+        }
         return this;
     }
 
@@ -48,6 +54,9 @@ class NotificationEventBuilder {
 
     setDescription(value) {
         this._description = value;
+        if (!this._description) {
+            this._description = '';
+        }
         return this;
     }