Merge pull request #61 from benlime/master

phongcao · web-flow · commit 30af3666a400 · 2019-04-16T00:11:39.000-04:00
uses “google.message_id” instead of “id”
diff --git a/android/src/main/java/com/azure/reactnative/notificationhub/ReactNativeNotificationsHandler.java b/android/src/main/java/com/azure/reactnative/notificationhub/ReactNativeNotificationsHandler.java
@@ -99,7 +99,7 @@ private void sendNotification(Bundle bundle) {
                 return;
             }
 
-            String notificationIdString = bundle.getString("id");
+            String notificationIdString = bundle.getString("google.message_id");
             if (notificationIdString == null) {
                 Log.e(TAG, "No notification ID specified for the notification");
                 return;
@@ -223,7 +223,7 @@ private void sendNotification(Bundle bundle) {
                 }
             }
 
-            int notificationID = Integer.parseInt(notificationIdString);
+            int notificationID = notificationIdString.hashCode();
 
             PendingIntent pendingIntent = PendingIntent.getActivity(context, notificationID, intent,
                     PendingIntent.FLAG_UPDATE_CURRENT);

Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ private void sendNotification(Bundle bundle) {`
`99`	`99`	`return;`
`100`	`100`	`}`
`101`	`101`
`102`		`- String notificationIdString = bundle.getString("id");`
	`102`	`+ String notificationIdString = bundle.getString("google.message_id");`
`103`	`103`	`if (notificationIdString == null) {`
`104`	`104`	`Log.e(TAG, "No notification ID specified for the notification");`
`105`	`105`	`return;`
`@@ -223,7 +223,7 @@ private void sendNotification(Bundle bundle) {`
`223`	`223`	`}`
`224`	`224`	`}`
`225`	`225`
`226`		`- int notificationID = Integer.parseInt(notificationIdString);`
	`226`	`+ int notificationID = notificationIdString.hashCode();`
`227`	`227`
`228`	`228`	`PendingIntent pendingIntent = PendingIntent.getActivity(context, notificationID, intent,`
`229`	`229`	`PendingIntent.FLAG_UPDATE_CURRENT);`