Android 10 updates

- Updates to support Android 10 (device and SDK)
- Change to androidx imports
- Conditionally skip autoLaunch behavior on Android 10
- Some bug fixes with channel naming and firing notifications.

Firing Notifications if autoLaunch:
- No longer fires notifications if autoLaunch is true.
- In above case, trigger event should schedule an immediate notification
- The intent is that it now can be conditional
- Still fires notification immediately on Android 10 when app is closed

Author: timkellyert

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cordova-plugin-local-notification",
-  "version": "0.9.0-beta.3",
+  "version": "0.9.0-beta.4",
   "description": "Schedules and queries for local notifications",
   "cordova": {
     "id": "cordova-plugin-local-notification",

plugin.xml

@@ -24,7 +24,7 @@
 <plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
         xmlns:android="http://schemas.android.com/apk/res/android"
         id="cordova-plugin-local-notification"
-        version="0.9.0-beta.3">
+        version="0.9.0-beta.4">
 
     <name>LocalNotification</name>
 

src/android/ClickReceiver.java

@@ -22,7 +22,7 @@
 package de.appplant.cordova.plugin.localnotification;
 
 import android.os.Bundle;
-import android.support.v4.app.RemoteInput;
+import androidx.core.app.RemoteInput;
 
 import org.json.JSONException;
 import org.json.JSONObject;

src/android/TriggerReceiver.java

@@ -42,6 +42,8 @@
 import static de.appplant.cordova.plugin.localnotification.LocalNotification.isAppRunning;
 import static java.util.Calendar.MINUTE;
 
+import static android.os.Build.VERSION_CODES.P;
+
 /**
  * The alarm receiver is triggered when a scheduled alarm is fired. This class
  * reads the information in the intent and displays this information in the
@@ -60,9 +62,14 @@ public class TriggerReceiver extends AbstractTriggerReceiver {
     @Override
     public void onTrigger(Notification notification, Bundle bundle) {
         boolean isUpdate = bundle.getBoolean(Notification.EXTRA_UPDATE, false);
+        boolean didAutoLaunch = false;
         Context context = notification.getContext();
         Options options = notification.getOptions();
         Manager manager = Manager.getInstance(context);
+
+        // trigger will have more than 1 key if a timed trigger was defined
+        // (no trigger has "type": "calendar")
+        boolean immediateFire = options.getTrigger().length() < 2;
         int badge = options.getBadgeNumber();
 
         if (badge > 0) {
@@ -73,13 +80,22 @@ public void onTrigger(Notification notification, Bundle bundle) {
             wakeUp(context);
         }
 
-        if (options.isAutoLaunchingApp()) {
+        if (options.isAutoLaunchingApp() && (SDK_INT <= P)) {
+            didAutoLaunch = true;
             LaunchUtils.launchApp(context);
         }
 
-        notification.show();
+        // Show notification only if we did not autoLaunch
+        // either because autoLaunch is false, or our SDK doesn't support it
+        if (!didAutoLaunch) {
+            notification.show();
+        }
 
-        if (!isUpdate && (isAppRunning() || options.isAutoLaunchingApp())) {
+        // run trigger function anytime the browser is running
+        // unless run with no trigger
+        // (which means that it came from trigger function)
+        if ((isAppRunning() || didAutoLaunch) && !immediateFire) {
+            // wake up even if we didn't set it to
             if (!options.shallWakeUp()) {
                 wakeUp(context);
             }

src/android/notification/Builder.java

@@ -27,9 +27,9 @@
 import android.graphics.Bitmap;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.v4.app.NotificationCompat;
-import android.support.v4.app.NotificationCompat.MessagingStyle.Message;
-import android.support.v4.media.app.NotificationCompat.MediaStyle;
+import androidx.core.app.NotificationCompat;
+import androidx.core.app.NotificationCompat.MessagingStyle.Message;
+import androidx.media.app.NotificationCompat.MediaStyle;
 import android.support.v4.media.session.MediaSessionCompat;
 
 import java.util.List;

src/android/notification/Manager.java

@@ -30,7 +30,7 @@
 import android.media.AudioAttributes;
 import android.net.Uri;
 import android.service.notification.StatusBarNotification;
-import android.support.v4.app.NotificationManagerCompat;
+import androidx.core.app.NotificationManagerCompat;
 
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -44,9 +44,9 @@
 import static android.os.Build.VERSION.SDK_INT;
 import static android.os.Build.VERSION_CODES.M;
 import static android.os.Build.VERSION_CODES.O;
-import static android.support.v4.app.NotificationManagerCompat.IMPORTANCE_DEFAULT;
-import static android.support.v4.app.NotificationManagerCompat.IMPORTANCE_HIGH;
-import static android.support.v4.app.NotificationManagerCompat.IMPORTANCE_LOW;
+import static androidx.core.app.NotificationManagerCompat.IMPORTANCE_DEFAULT;
+import static androidx.core.app.NotificationManagerCompat.IMPORTANCE_HIGH;
+import static androidx.core.app.NotificationManagerCompat.IMPORTANCE_LOW;
 import static de.appplant.cordova.plugin.notification.Notification.PREF_KEY_ID;
 import static de.appplant.cordova.plugin.notification.Notification.Type.TRIGGERED;
 
@@ -101,7 +101,7 @@ public Notification schedule(Request request, Class<?> receiver) {
 
     /**
      * Build channel with options
-     * 
+     *
      * @param soundUri      Uri for custom sound (empty to use default)
      * @param shouldVibrate whether not vibration should occur during the
      *                      notification
@@ -117,23 +117,23 @@ public String buildChannelWithOptions(Uri soundUri, boolean shouldVibrate, boole
         int importance;
 
         if (hasSound && shouldVibrate) {
-            defaultChannelId = Options.CHANNEL_ID_SOUND_VIBRATE;
-            defaultChannelName = Options.CHANNEL_NAME_SOUND_VIBRATE;
+            defaultChannelId = Options.SOUND_VIBRATE_CHANNEL_ID;
+            defaultChannelName = Options.SOUND_VIBRATE_CHANNEL_NAME;
             importance = IMPORTANCE_HIGH;
             shouldVibrate = true;
         } else if (hasSound) {
-            defaultChannelId = Options.CHANNEL_ID_SOUND;
-            defaultChannelName = Options.CHANNEL_NAME_SOUND;
+            defaultChannelId = Options.SOUND_CHANNEL_ID;
+            defaultChannelName = Options.SOUND_CHANNEL_NAME;
             importance = IMPORTANCE_DEFAULT;
             shouldVibrate = false;
         } else if (shouldVibrate) {
-            defaultChannelId = Options.CHANNEL_ID_VIBRATE;
-            defaultChannelName = Options.CHANNEL_NAME_VIBRATE;
+            defaultChannelId = Options.VIBRATE_CHANNEL_ID;
+            defaultChannelName = Options.VIBRATE_CHANNEL_NAME;
             importance = IMPORTANCE_LOW;
             shouldVibrate = true;
         } else {
-            defaultChannelId = Options.CHANNEL_ID_SILENT;
-            defaultChannelName = Options.CHANNEL_NAME_SILENT;
+            defaultChannelId = Options.SILENT_CHANNEL_ID;
+            defaultChannelName = Options.SILENT_CHANNEL_NAME;
             importance = IMPORTANCE_LOW;
             shouldVibrate = false;
         }

src/android/notification/Notification.java

@@ -31,9 +31,7 @@
 import android.media.AudioManager;
 import android.net.Uri;
 import android.service.notification.StatusBarNotification;
-import android.support.v4.app.NotificationCompat;
-import android.support.v4.util.ArraySet;
-import android.support.v4.util.Pair;
+import android.util.Pair;
 import android.util.Log;
 import android.util.SparseArray;
 
@@ -48,14 +46,17 @@
 import java.util.Timer;
 import java.util.TimerTask;
 
+import androidx.collection.ArraySet;
+import androidx.core.app.NotificationCompat;
+
 import static android.app.AlarmManager.RTC;
 import static android.app.AlarmManager.RTC_WAKEUP;
 import static android.app.PendingIntent.FLAG_CANCEL_CURRENT;
 import static android.os.Build.VERSION.SDK_INT;
 import static android.os.Build.VERSION_CODES.M;
-import static android.support.v4.app.NotificationCompat.PRIORITY_HIGH;
-import static android.support.v4.app.NotificationManagerCompat.IMPORTANCE_MAX;
-import static android.support.v4.app.NotificationManagerCompat.IMPORTANCE_MIN;
+import static androidx.core.app.NotificationCompat.PRIORITY_HIGH;
+import static androidx.core.app.NotificationCompat.PRIORITY_MAX;
+import static androidx.core.app.NotificationCompat.PRIORITY_MIN;
 
 /**
  * Wrapper class around OS notification class. Handles basic operations
@@ -232,10 +233,10 @@ void schedule(Request request, Class<?> receiver) {
 
             try {
                 switch (options.getPrio()) {
-                    case IMPORTANCE_MIN:
+                    case PRIORITY_MIN:
                         mgr.setExact(RTC, time, pi);
                         break;
-                    case IMPORTANCE_MAX:
+                    case PRIORITY_MAX:
                         if (SDK_INT >= M) {
                             mgr.setExactAndAllowWhileIdle(RTC_WAKEUP, time, pi);
                         } else {

src/android/notification/Options.java

@@ -27,8 +27,8 @@
 import android.graphics.Bitmap;
 import android.graphics.Color;
 import android.net.Uri;
-import android.support.v4.app.NotificationCompat;
-import android.support.v4.app.NotificationCompat.MessagingStyle.Message;
+import androidx.core.app.NotificationCompat;
+import androidx.core.app.NotificationCompat.MessagingStyle.Message;
 import android.support.v4.media.session.MediaSessionCompat;
 
 import org.json.JSONArray;
@@ -45,13 +45,13 @@
 
 import static android.os.Build.VERSION.SDK_INT;
 import static android.os.Build.VERSION_CODES.O;
-import static android.support.v4.app.NotificationCompat.DEFAULT_LIGHTS;
-import static android.support.v4.app.NotificationCompat.DEFAULT_SOUND;
-import static android.support.v4.app.NotificationCompat.DEFAULT_VIBRATE;
-import static android.support.v4.app.NotificationCompat.PRIORITY_MAX;
-import static android.support.v4.app.NotificationCompat.PRIORITY_MIN;
-import static android.support.v4.app.NotificationCompat.VISIBILITY_PUBLIC;
-import static android.support.v4.app.NotificationCompat.VISIBILITY_SECRET;
+import static androidx.core.app.NotificationCompat.DEFAULT_LIGHTS;
+import static androidx.core.app.NotificationCompat.DEFAULT_SOUND;
+import static androidx.core.app.NotificationCompat.DEFAULT_VIBRATE;
+import static androidx.core.app.NotificationCompat.PRIORITY_MAX;
+import static androidx.core.app.NotificationCompat.PRIORITY_MIN;
+import static androidx.core.app.NotificationCompat.VISIBILITY_PUBLIC;
+import static androidx.core.app.NotificationCompat.VISIBILITY_SECRET;
 
 /**
  * Wrapper around the JSON object passed through JS which contains all possible
@@ -60,23 +60,23 @@
  */
 public final class Options {
     // Default Channel ID for SDK < 26
-    static final String DEFAULT_CHANNEL_ID = "channel-id-default";
+    static final String DEFAULT_CHANNEL_ID = "default-channel-id";
 
     // Silent channel
-    static final String CHANNEL_ID_SILENT = "channel-id-silent";
-    static final CharSequence CHANNEL_NAME_SILENT = "Silent Notifications";
+    static final String SILENT_CHANNEL_ID = "silent-channel-id";
+    static final CharSequence SILENT_CHANNEL_NAME = "Silent Notifications";
 
     // Vibrate only channel
-    static final String CHANNEL_ID_VIBRATE = "vibrate-channel-id";
-    static final CharSequence CHANNEL_NAME_VIBRATE = "Low Priority Notifications";
+    static final String VIBRATE_CHANNEL_ID = "vibrate-channel-id";
+    static final CharSequence VIBRATE_CHANNEL_NAME = "Low Priority Notifications";
 
     // Sound only channel
-    static final String CHANNEL_ID_SOUND = "sound-channel-id";
-    static final CharSequence CHANNEL_NAME_SOUND = "Medium Priority Notifications";
+    static final String SOUND_CHANNEL_ID = "sound-channel-id";
+    static final CharSequence SOUND_CHANNEL_NAME = "Medium Priority Notifications";
 
     // Sound and vibrate channel
-    static final String CHANNEL_ID_SOUND_VIBRATE = "sound-vibrate-channel-id";
-    static final CharSequence CHANNEL_NAME_SOUND_VIBRATE = "High Priority Notifications";
+    static final String SOUND_VIBRATE_CHANNEL_ID = "sound-vibrate-channel-id";
+    static final CharSequence SOUND_VIBRATE_CHANNEL_NAME = "High Priority Notifications";
 
     // Key name for bundled sound extra
     static final String EXTRA_SOUND = "NOTIFICATION_SOUND";
@@ -446,7 +446,7 @@ public Integer getVolume() {
     /**
      * Returns the resetDelay until the sound changes revert back to the users
      * settings.
-     * 
+     *
      * @return resetDelay
      */
     public Integer getResetDelay() {

src/android/notification/action/Action.java

@@ -22,7 +22,7 @@
 package de.appplant.cordova.plugin.notification.action;
 
 import android.content.Context;
-import android.support.v4.app.RemoteInput;
+import androidx.core.app.RemoteInput;
 
 import org.json.JSONArray;
 import org.json.JSONObject;
@@ -134,4 +134,4 @@ private String[] getChoices() {
         return choices;
     }
 
-}
+}

src/android/notification/util/AssetProvider.java

@@ -19,8 +19,8 @@ Licensed to the Apache Software Foundation (ASF) under one
 
 package de.appplant.cordova.plugin.notification.util;
 
-import android.support.v4.content.FileProvider;
+import androidx.core.content.FileProvider;
 
 public class AssetProvider extends FileProvider {
     // Nothing to do here
-}
+}

www/local-notification.js

@@ -92,9 +92,9 @@ exports.requestPermission = function (callback, scope) {
 /**
  * Check to see if the user has allowed "Do Not Disturb" permissions for this app.
  * This is required to use alarmVolume to take a user out of silent mode.
- * 
+ *
  * @param {Function} callback The function to be exec as the callback.
- * @param {Object} scope callback function's scope 
+ * @param {Object} scope callback function's scope
  */
 exports.hasDoNotDisturbPermissions = function (callback, scope) {
     this._exec('hasDoNotDisturbPermissions', null, callback, scope);
@@ -104,7 +104,7 @@ exports.hasDoNotDisturbPermissions = function (callback, scope) {
  * Request "Do Not Disturb" permissions for this app.
  * The only way to do this is to launch the global do not distrub settings for all apps.
  * This permission is required to use alarmVolume to take a user out of silent mode.
- * 
+ *
  * @param {Function} callback The function to be exec as the callback.
  * @param {Object} scope callback function's scope.
  */
@@ -136,6 +136,11 @@ exports.isIgnoringBatteryOptimizations = function (callback, scope) {
  * @param {Object} scope callback function's scope
  */
 exports.requestIgnoreBatteryOptimizations = function (callback, scope) {
+    if (device.platform === 'iOS') {
+        console.warn('[Notifications] requestIgnoreBatteryOptimizations not supported on iOS');
+        callback(true);
+    }
+
     this._exec('requestIgnoreBatteryOptimizations', null, callback, scope);
 }