@capacitor/local-notifications 1.0.10 → 4.0.0-beta.2

package/android/src/main/java/com/capacitorjs/plugins/localnotifications/LocalNotificationManager.java

@@ -22,7 +22,7 @@ import com.getcapacitor.CapConfig;
 import com.getcapacitor.JSObject;
 import com.getcapacitor.Logger;
 import com.getcapacitor.PluginCall;
-import com.getcapacitor.android.R;
+import com.getcapacitor.PluginConfig;
 import com.getcapacitor.plugin.util.AssetUtil;
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -36,7 +36,6 @@ import org.json.JSONObject;
  */
 public class LocalNotificationManager {
 
-    private static final String CONFIG_KEY_PREFIX = "plugins.LocalNotifications.";
     private static int defaultSoundID = AssetUtil.RESOURCE_ID_ZERO_VALUE;
     private static int defaultSmallIconID = AssetUtil.RESOURCE_ID_ZERO_VALUE;
     // Action constants
@@ -52,13 +51,13 @@ public class LocalNotificationManager {
     private Context context;
     private Activity activity;
     private NotificationStorage storage;
-    private CapConfig config;
+    private PluginConfig config;
 
     public LocalNotificationManager(NotificationStorage notificationStorage, Activity activity, Context context, CapConfig config) {
         storage = notificationStorage;
         this.activity = activity;
         this.context = context;
-        this.config = config;
+        this.config = config.getPluginConfiguration("LocalNotifications");
     }
 
     /**
@@ -223,7 +222,7 @@ public class LocalNotificationManager {
         mBuilder.setSmallIcon(localNotification.getSmallIcon(context, getDefaultSmallIcon(context)));
         mBuilder.setLargeIcon(localNotification.getLargeIcon(context));
 
-        String iconColor = localNotification.getIconColor(config.getString(CONFIG_KEY_PREFIX + "iconColor"));
+        String iconColor = localNotification.getIconColor(config.getString("iconColor"));
         if (iconColor != null) {
             try {
                 mBuilder.setColor(Color.parseColor(iconColor));
@@ -253,13 +252,11 @@ public class LocalNotificationManager {
     private void createActionIntents(LocalNotification localNotification, NotificationCompat.Builder mBuilder) {
         // Open intent
         Intent intent = buildIntent(localNotification, DEFAULT_PRESS_ACTION);
-
-        PendingIntent pendingIntent = PendingIntent.getActivity(
-            context,
-            localNotification.getId(),
-            intent,
-            PendingIntent.FLAG_CANCEL_CURRENT
-        );
+        int flags = PendingIntent.FLAG_CANCEL_CURRENT;
+        if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+            flags = flags | PendingIntent.FLAG_MUTABLE;
+        }
+        PendingIntent pendingIntent = PendingIntent.getActivity(context, localNotification.getId(), intent, flags);
         mBuilder.setContentIntent(pendingIntent);
 
         // Build action types
@@ -273,7 +270,7 @@ public class LocalNotificationManager {
                     context,
                     localNotification.getId() + notificationAction.getId().hashCode(),
                     actionIntent,
-                    PendingIntent.FLAG_CANCEL_CURRENT
+                    flags
                 );
                 NotificationCompat.Action.Builder actionBuilder = new NotificationCompat.Action.Builder(
                     R.drawable.ic_transparent,
@@ -295,7 +292,11 @@ public class LocalNotificationManager {
         dissmissIntent.putExtra(ACTION_INTENT_KEY, "dismiss");
         LocalNotificationSchedule schedule = localNotification.getSchedule();
         dissmissIntent.putExtra(NOTIFICATION_IS_REMOVABLE_KEY, schedule == null || schedule.isRemovable());
-        PendingIntent deleteIntent = PendingIntent.getBroadcast(context, localNotification.getId(), dissmissIntent, 0);
+        flags = 0;
+        if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+            flags = PendingIntent.FLAG_MUTABLE;
+        }
+        PendingIntent deleteIntent = PendingIntent.getBroadcast(context, localNotification.getId(), dissmissIntent, flags);
         mBuilder.setDeleteIntent(deleteIntent);
     }
 
@@ -330,12 +331,11 @@ public class LocalNotificationManager {
         Intent notificationIntent = new Intent(context, TimedNotificationPublisher.class);
         notificationIntent.putExtra(NOTIFICATION_INTENT_KEY, request.getId());
         notificationIntent.putExtra(TimedNotificationPublisher.NOTIFICATION_KEY, notification);
-        PendingIntent pendingIntent = PendingIntent.getBroadcast(
-            context,
-            request.getId(),
-            notificationIntent,
-            PendingIntent.FLAG_CANCEL_CURRENT
-        );
+        int flags = PendingIntent.FLAG_CANCEL_CURRENT;
+        if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+            flags = flags | PendingIntent.FLAG_MUTABLE;
+        }
+        PendingIntent pendingIntent = PendingIntent.getBroadcast(context, request.getId(), notificationIntent, flags);
 
         // Schedule at specific time (with repeating support)
         Date at = schedule.getAt();
@@ -348,11 +348,7 @@ public class LocalNotificationManager {
                 long interval = at.getTime() - new Date().getTime();
                 alarmManager.setRepeating(AlarmManager.RTC, at.getTime(), interval, pendingIntent);
             } else {
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M && schedule.allowWhileIdle()) {
-                    alarmManager.setExactAndAllowWhileIdle(AlarmManager.RTC, at.getTime(), pendingIntent);
-                } else {
-                    alarmManager.setExact(AlarmManager.RTC, at.getTime(), pendingIntent);
-                }
+                setExactIfPossible(alarmManager, schedule, at.getTime(), pendingIntent);
             }
             return;
         }
@@ -373,15 +369,31 @@ public class LocalNotificationManager {
         if (on != null) {
             long trigger = on.nextTrigger(new Date());
             notificationIntent.putExtra(TimedNotificationPublisher.CRON_KEY, on.toMatchString());
-            pendingIntent = PendingIntent.getBroadcast(context, request.getId(), notificationIntent, PendingIntent.FLAG_CANCEL_CURRENT);
+            pendingIntent = PendingIntent.getBroadcast(context, request.getId(), notificationIntent, flags);
+            setExactIfPossible(alarmManager, schedule, trigger, pendingIntent);
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
+            Logger.debug(Logger.tags("LN"), "notification " + request.getId() + " will next fire at " + sdf.format(new Date(trigger)));
+        }
+    }
+
+    private void setExactIfPossible(
+        AlarmManager alarmManager,
+        LocalNotificationSchedule schedule,
+        long trigger,
+        PendingIntent pendingIntent
+    ) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S && !alarmManager.canScheduleExactAlarms()) {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M && schedule.allowWhileIdle()) {
+                alarmManager.setAndAllowWhileIdle(AlarmManager.RTC, trigger, pendingIntent);
+            } else {
+                alarmManager.set(AlarmManager.RTC, trigger, pendingIntent);
+            }
+        } else {
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M && schedule.allowWhileIdle()) {
                 alarmManager.setExactAndAllowWhileIdle(AlarmManager.RTC, trigger, pendingIntent);
             } else {
                 alarmManager.setExact(AlarmManager.RTC, trigger, pendingIntent);
             }
-
-            SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
-            Logger.debug(Logger.tags("LN"), "notification " + request.getId() + " will next fire at " + sdf.format(new Date(trigger)));
         }
     }
 
@@ -399,7 +411,11 @@ public class LocalNotificationManager {
 
     private void cancelTimerForNotification(Integer notificationId) {
         Intent intent = new Intent(context, TimedNotificationPublisher.class);
-        PendingIntent pi = PendingIntent.getBroadcast(context, notificationId, intent, 0);
+        int flags = 0;
+        if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+            flags = PendingIntent.FLAG_MUTABLE;
+        }
+        PendingIntent pi = PendingIntent.getBroadcast(context, notificationId, intent, flags);
         if (pi != null) {
             AlarmManager alarmManager = (AlarmManager) context.getSystemService(Context.ALARM_SERVICE);
             alarmManager.cancel(pi);
@@ -428,7 +444,7 @@ public class LocalNotificationManager {
         if (defaultSoundID != AssetUtil.RESOURCE_ID_ZERO_VALUE) return defaultSoundID;
 
         int resId = AssetUtil.RESOURCE_ID_ZERO_VALUE;
-        String soundConfigResourceName = config.getString(CONFIG_KEY_PREFIX + "sound");
+        String soundConfigResourceName = config.getString("sound");
         soundConfigResourceName = AssetUtil.getResourceBaseName(soundConfigResourceName);
 
         if (soundConfigResourceName != null) {
@@ -443,7 +459,7 @@ public class LocalNotificationManager {
         if (defaultSmallIconID != AssetUtil.RESOURCE_ID_ZERO_VALUE) return defaultSmallIconID;
 
         int resId = AssetUtil.RESOURCE_ID_ZERO_VALUE;
-        String smallIconConfigResourceName = config.getString(CONFIG_KEY_PREFIX + "smallIcon");
+        String smallIconConfigResourceName = config.getString("smallIcon");
         smallIconConfigResourceName = AssetUtil.getResourceBaseName(smallIconConfigResourceName);
 
         if (smallIconConfigResourceName != null) {

package/android/src/main/java/com/capacitorjs/plugins/localnotifications/LocalNotificationRestoreReceiver.java

@@ -5,6 +5,7 @@ import static android.os.Build.VERSION.SDK_INT;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
+import android.os.Build;
 import android.os.UserManager;
 import com.getcapacitor.CapConfig;
 import java.util.ArrayList;
@@ -15,7 +16,7 @@ public class LocalNotificationRestoreReceiver extends BroadcastReceiver {
 
     @Override
     public void onReceive(Context context, Intent intent) {
-        if (SDK_INT >= 24) {
+        if (SDK_INT >= Build.VERSION_CODES.N) {
             UserManager um = context.getSystemService(UserManager.class);
             if (um == null || !um.isUserUnlocked()) return;
         }

package/android/src/main/java/com/capacitorjs/plugins/localnotifications/LocalNotificationSchedule.java

@@ -65,6 +65,7 @@ public class LocalNotificationSchedule {
             on.setYear(onJson.getInteger("year"));
             on.setMonth(onJson.getInteger("month"));
             on.setDay(onJson.getInteger("day"));
+            on.setWeekday(onJson.getInteger("weekday"));
             on.setHour(onJson.getInteger("hour"));
             on.setMinute(onJson.getInteger("minute"));
             on.setSecond(onJson.getInteger("second"));
@@ -140,7 +141,8 @@ public class LocalNotificationSchedule {
     public Long getEveryInterval() {
         switch (every) {
             case "year":
-                return count * DateUtils.YEAR_IN_MILLIS;
+                // This case is just approximation as not all years have the same number of days
+                return count * DateUtils.WEEK_IN_MILLIS * 52;
             case "month":
                 // This case is just approximation as months have different number of days
                 return count * 30 * DateUtils.DAY_IN_MILLIS;

package/android/src/main/java/com/capacitorjs/plugins/localnotifications/LocalNotificationsPlugin.java

@@ -1,6 +1,11 @@
 package com.capacitorjs.plugins.localnotifications;
 
+import android.app.Notification;
+import android.app.NotificationManager;
+import android.content.Context;
 import android.content.Intent;
+import android.os.Build;
+import android.service.notification.StatusBarNotification;
 import com.getcapacitor.Bridge;
 import com.getcapacitor.JSArray;
 import com.getcapacitor.JSObject;
@@ -13,12 +18,15 @@ import com.getcapacitor.annotation.Permission;
 import java.util.List;
 import java.util.Map;
 import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
 
 @CapacitorPlugin(name = "LocalNotifications", permissions = @Permission(strings = {}, alias = "display"))
 public class LocalNotificationsPlugin extends Plugin {
 
     private static Bridge staticBridge = null;
     private LocalNotificationManager manager;
+    public NotificationManager notificationManager;
     private NotificationStorage notificationStorage;
     private NotificationChannelManager notificationChannelManager;
 
@@ -29,6 +37,7 @@ public class LocalNotificationsPlugin extends Plugin {
         manager = new LocalNotificationManager(notificationStorage, getActivity(), getContext(), this.bridge.getConfig());
         manager.createNotificationChannel();
         notificationChannelManager = new NotificationChannelManager(getActivity());
+        notificationManager = (NotificationManager) getActivity().getSystemService(Context.NOTIFICATION_SERVICE);
         staticBridge = this.bridge;
     }
 
@@ -97,6 +106,76 @@ public class LocalNotificationsPlugin extends Plugin {
         call.resolve(data);
     }
 
+    @PluginMethod
+    public void getDeliveredNotifications(PluginCall call) {
+        JSArray notifications = new JSArray();
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            StatusBarNotification[] activeNotifications = notificationManager.getActiveNotifications();
+
+            for (StatusBarNotification notif : activeNotifications) {
+                JSObject jsNotif = new JSObject();
+
+                jsNotif.put("id", notif.getId());
+                jsNotif.put("tag", notif.getTag());
+
+                Notification notification = notif.getNotification();
+                if (notification != null) {
+                    jsNotif.put("title", notification.extras.getCharSequence(Notification.EXTRA_TITLE));
+                    jsNotif.put("body", notification.extras.getCharSequence(Notification.EXTRA_TEXT));
+                    jsNotif.put("group", notification.getGroup());
+                    jsNotif.put("groupSummary", 0 != (notification.flags & Notification.FLAG_GROUP_SUMMARY));
+
+                    JSObject extras = new JSObject();
+
+                    for (String key : notification.extras.keySet()) {
+                        extras.put(key, notification.extras.get(key));
+                    }
+
+                    jsNotif.put("data", extras);
+                }
+
+                notifications.put(jsNotif);
+            }
+        }
+
+        JSObject result = new JSObject();
+        result.put("notifications", notifications);
+        call.resolve(result);
+    }
+
+    @PluginMethod
+    public void removeDeliveredNotifications(PluginCall call) {
+        JSArray notifications = call.getArray("notifications");
+
+        try {
+            for (Object o : notifications.toList()) {
+                if (o instanceof JSONObject) {
+                    JSObject notif = JSObject.fromJSONObject((JSONObject) o);
+                    String tag = notif.getString("tag");
+                    Integer id = notif.getInteger("id");
+
+                    if (tag == null) {
+                        notificationManager.cancel(id);
+                    } else {
+                        notificationManager.cancel(tag, id);
+                    }
+                } else {
+                    call.reject("Expected notifications to be a list of notification objects");
+                }
+            }
+        } catch (JSONException e) {
+            call.reject(e.getMessage());
+        }
+
+        call.resolve();
+    }
+
+    @PluginMethod
+    public void removeAllDeliveredNotifications(PluginCall call) {
+        notificationManager.cancelAll();
+        call.resolve();
+    }
+
     @PluginMethod
     public void createChannel(PluginCall call) {
         notificationChannelManager.createChannel(call);

package/android/src/main/java/com/capacitorjs/plugins/localnotifications/NotificationChannelManager.java

@@ -54,12 +54,8 @@ public class NotificationChannelManager {
                 call.reject("Channel missing name");
                 return;
             }
-            if (call.getInt(CHANNEL_IMPORTANCE) != null) {
-                channel.put(CHANNEL_IMPORTANCE, call.getInt(CHANNEL_IMPORTANCE));
-            } else {
-                call.reject("Channel missing importance");
-                return;
-            }
+
+            channel.put(CHANNEL_IMPORTANCE, call.getInt(CHANNEL_IMPORTANCE, NotificationManager.IMPORTANCE_DEFAULT));
             channel.put(CHANNEL_DESCRIPTION, call.getString(CHANNEL_DESCRIPTION, ""));
             channel.put(CHANNEL_VISIBILITY, call.getInt(CHANNEL_VISIBILITY, NotificationCompat.VISIBILITY_PUBLIC));
             channel.put(CHANNEL_SOUND, call.getString(CHANNEL_SOUND, null));

package/android/src/main/java/com/capacitorjs/plugins/localnotifications/TimedNotificationPublisher.java

@@ -7,6 +7,7 @@ import android.app.PendingIntent;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
+import android.os.Build;
 import com.getcapacitor.JSObject;
 import com.getcapacitor.Logger;
 import java.text.SimpleDateFormat;
@@ -49,7 +50,11 @@ public class TimedNotificationPublisher extends BroadcastReceiver {
             long trigger = date.nextTrigger(new Date());
             Intent clone = (Intent) intent.clone();
             PendingIntent pendingIntent = PendingIntent.getBroadcast(context, id, clone, PendingIntent.FLAG_CANCEL_CURRENT);
-            alarmManager.setExact(AlarmManager.RTC, trigger, pendingIntent);
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S && !alarmManager.canScheduleExactAlarms()) {
+                alarmManager.set(AlarmManager.RTC, trigger, pendingIntent);
+            } else {
+                alarmManager.setExact(AlarmManager.RTC, trigger, pendingIntent);
+            }
             SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
             Logger.debug(Logger.tags("LN"), "notification " + id + " will next fire at " + sdf.format(new Date(trigger)));
             return true;

package/android/src/main/res/drawable/ic_transparent.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="16dp"
+    android:height="16dp"
+    android:viewportHeight="108"
+    android:viewportWidth="108">
+
+    <path
+        android:width="1dp"
+        android:color="@android:color/transparent" />
+
+</vector>