Merge pull request #1042 from 0is1/master

Fix Android rescheduled notifications firing immediately

Merge pull request #1042 from 0is1/master
Fix Android rescheduled notifications firing immediately
5658029f · Libin Lu · GitHub · 9f9e6678 · 83846143 · 5658029f
Commit 5658029f authored Sep 12, 2018 by Libin Lu Committed by GitHub Sep 12, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

android/src/main/java/com/evollu/react/fcm/FIRLocalMessagingHelper.java ...in/java/com/evollu/react/fcm/FIRLocalMessagingHelper.java +4 -4

No files found.
--- a/android/src/main/java/com/evollu/react/fcm/FIRLocalMessagingHelper.java
+++ b/android/src/main/java/com/evollu/react/fcm/FIRLocalMessagingHelper.java
@@ -58,11 +58,11 @@ public class FIRLocalMessagingHelper {
            return;
        }

-        long fireDate = Math.round(bundle.getDouble("fire_date"));
-        if(fireDate == 0){
-            fireDate = Math.round(bundle.getLong("fire_date"));
+        Long fireDate = bundle.getLong("fire_date", -1);
+        if (fireDate == -1) {
+            fireDate = (long) bundle.getDouble("fire_date", -1);
        }
-        if (fireDate == 0) {
+        if (fireDate == -1) {
            Log.e(TAG, "failed to schedule notification because fire date is missing");
            return;
        }