From cbb35a02231980d868f619c08aa4202535034eb4 Mon Sep 17 00:00:00 2001 From: ifsnow Date: Thu, 21 Jun 2018 15:34:30 +0900 Subject: [PATCH] [Android] Fix setDefaults in Notifications. --- .../notifications/DisplayNotificationTask.java | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/android/src/main/java/io/invertase/firebase/notifications/DisplayNotificationTask.java b/android/src/main/java/io/invertase/firebase/notifications/DisplayNotificationTask.java index 8e2ee22c..00cf83f5 100644 --- a/android/src/main/java/io/invertase/firebase/notifications/DisplayNotificationTask.java +++ b/android/src/main/java/io/invertase/firebase/notifications/DisplayNotificationTask.java @@ -142,12 +142,19 @@ public class DisplayNotificationTask extends AsyncTask { if (android.containsKey("contentInfo")) { nb = nb.setContentInfo(android.getString("contentInfo")); } - if (notification.containsKey("defaults")) { - double[] defaultsArray = android.getDoubleArray("defaults"); - int defaults = 0; - for (Double d : defaultsArray) { - defaults |= d.intValue(); + if (android.containsKey("defaults")) { + Double defaultValues = android.getDouble("defaults"); + int defaults = defaultValues.intValue(); + + if (defaults == 0) { + ArrayList defaultsArray = android.getIntegerArrayList("defaults"); + if(defaultsArray != null) { + for (Integer defaultValue : defaultsArray) { + defaults |= defaultValue; + } + } } + nb = nb.setDefaults(defaults); } if (android.containsKey("group")) {