Refactor to preprare version 4.0.0.

Author: Dallas62

CHANGELOG.md

@@ -7,8 +7,22 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+### Breaking changes
+
+- Now local scheduled notifications trigger `onNotification`.
+- `RNPushNotificationRegistrationService` has been remove, old reference in AndroidManifest must be removed.
+- `Notifications.registerNotificationActions()` has been removed and is not required for `actions`.
+- `DeviceEventEmitter.addListener('notificationActionReceived', callback)` is replaced by `onAction`.
+
 ### Features
 
+- (Android) `actions` accept an array of strings.
+- (Android) `invokeApp` allow you to handle actions in background without invoking the application.
+- (Android) `onAction` has been added to `.configure()` to handle action in background.
+- (Android) `PushNotification.invokeApp(notification)` allow you to invoke the application when in background (notification for initial notification).
+- (Android) `PushNotification.getChannels(callback)` allow you to get the list of channels.
+- (Android) `PushNotification.channelExists(channel_id, callback)` allow you to check of a channel exists.
+- (Android) `PushNotification.deleteChannel(channel_id)` allow you to delete a channel.
 - (Android) Add `largeIconUrl` to load a largeIcon based on Url. Based on [#1444](https://github.com/zo0r/react-native-push-notification/pull/1444)
 - (Android) Add `bigPictureUrl` to load a picture based on Url. Based on [#1444](https://github.com/zo0r/react-native-push-notification/pull/1444)
 - (Android) Add `shortcutId` for better badges management.
@@ -20,6 +34,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ### Fixed
 
 - (Android) Some options were ignored on scheduled/repeating notifications (allowWhileIdle, ignoreInForeground).
+- (Android/iOS) popInitialInotification might be ignored in `.configure()`
 
 ## [3.5.2] - 2020-05-25
 

README.md

@@ -86,6 +86,9 @@ In your `android/app/src/main/AndroidManifest.xml`
         <!-- Change the value to true to enable pop-up for in foreground (remote-only, for local use ignoreInForeground) -->
         <meta-data  android:name="com.dieam.reactnativepushnotification.notification_foreground"
                     android:value="false"/>
+        <!-- Change the value to false if you don't want the creation of the default channel -->
+        <meta-data  android:name="com.dieam.reactnativepushnotification.channel_create_default"
+                    android:value="true"/>
         <!-- Change the resource name to your App's accent color - or any other color you want -->
         <meta-data  android:name="com.dieam.reactnativepushnotification.notification_color"
                     android:resource="@color/white"/> <!-- or @android:color/{name} to use a standard color -->
@@ -224,6 +227,14 @@ PushNotification.configure({
     notification.finish(PushNotificationIOS.FetchResult.NoData);
   },
 
+  // (optional) Called when Registered Action is pressed and invokeApp is false, if true onNotification will be called (Android)
+  onAction: function (notification) {
+    console.log("ACTION:", notification.action);
+    console.log("NOTIFICATION:", notification);
+
+    // process the action
+  },
+
   // IOS ONLY (optional): default: all - Permissions to register.
   permissions: {
     alert: true,
@@ -302,6 +313,7 @@ PushNotification.localNotification({
   channelId: "your-custom-channel-id", // (optional) custom channelId, if the channel doesn't exist, it will be created with options passed above (importance, vibration, sound). Once the channel is created, the channel will not be update. Make sure your channelId is different if you change these options. If you have created a custom channel, it will apply options of the channel.
 
   actions: '["Yes", "No"]', // (Android only) See the doc for notification actions to know more
+  invokeApp: true, // (optional) This enable click on actions to bring back the application to foreground or stay in background, default: true
 
   /* iOS only properties */
   alertAction: "view", // (optional) default: view
@@ -349,13 +361,21 @@ This library doesn't include a full Channel Management at the moment. Channels a
 The pattern of `channel_id` is:
 
 ```
-rn-push-notification-channel-id(-soundname, default if playSound "-default")-(importance: default "4")-(vibration, default "300")
+rn-push-notification-channel-id-(importance: default "4")(-soundname, default if playSound "-default")-(vibration, default "300")
 ```
 
-By default, 2 channels are created:
+By default, 1 channel is created:
+
+- rn-push-notification-channel-id-4-default-300 (used for remote notification if none already exist).
+
+you can avoid the default creation by using this:
+
+```xml
+  <meta-data  android:name="com.dieam.reactnativepushnotification.channel_create_default"
+          android:value="false"/>
+```
 
-- rn-push-notification-channel-id-default-4-300 (used for remote notification if none already exist).
-- rn-push-notification-channel-id-4-300 (previously used for remote notification but without sounds).
+**NOTE: Without channel, remote notifications don't work**
 
 In the notifications options, you can provide a custom channel id with `channelId: "your-custom-channel-id"`, if the channel doesn't exist, it will be created with options passed above (importance, vibration, sound). Once the channel is created, the channel will not be update. Make sure your `channelId` is different if you change these options. If you have created a custom channel in another way, it will apply options of the channel.
 
@@ -387,6 +407,37 @@ If you want to use a different default channel for remote notification, refer to
       android:value="@string/default_notification_channel_id" />
 ```
 
+### List channels
+
+You can list available channels with:
+
+```js
+PushNotification.getChannels(function(channel_ids) {
+  console.log(channel_ids); // ['channel_id_1']
+});
+
+```
+
+### Channel exists
+
+You can check if a channel exists with:
+
+```js
+PushNotification.channelExists(function(exists) {
+  console.log(exists); // true/false
+});
+
+```
+
+### List channels
+
+You can list available channels with:
+
+```js
+PushNotification.deleteChannel(channel_id);
+
+```
+
 ## Cancelling notifications
 
 ### 1) cancelLocalNotifications
@@ -539,38 +590,11 @@ Property `repeatType` could be one of `month`, `week`, `day`, `hour`, `minute`,
 
 (Android only) [Refer](https://github.com/zo0r/react-native-push-notification/issues/151) to this issue to see an example of a notification action.
 
-Two things are required to setup notification actions.
-
-### 1) Specify notification actions for a notification
-
 This is done by specifying an `actions` parameters while configuring the local notification. This is an array of strings where each string is a notification action that will be presented with the notification.
 
-For e.g. `actions: '["Accept", "Reject"]' // Must be in string format`
-
-The array itself is specified in string format to circumvent some problems because of the way JSON arrays are handled by react-native android bridge.
-
-### 2) Specify handlers for the notification actions
+For e.g. `actions: ['Accept', 'Reject']`
 
-For each action specified in the `actions` field, we need to add a handler that is called when the user clicks on the action. This can be done in the `componentWillMount` of your main app file or in a separate file which is imported in your main app file. Notification actions handlers can be configured as below:
-
-```
-import PushNotificationAndroid from 'react-native-push-notification'
-
-(function() {
-  // Register all the valid actions for notifications here and add the action handler for each action
-  PushNotificationAndroid.registerNotificationActions(['Accept','Reject','Yes','No']);
-  DeviceEventEmitter.addListener('notificationActionReceived', function(action){
-    console.log ('Notification action received: ' + action);
-    const info = JSON.parse(action.dataJSON);
-    if (info.action == 'Accept') {
-      // Do work pertaining to Accept action here
-    } else if (info.action == 'Reject') {
-      // Do work pertaining to Reject action here
-    }
-    // Add all the required actions handlers
-  });
-})();
-```
+When you handle actions in background (`invokeApp: false`), you can open the application and pass the initial notification by using use `PushNotification.invokeApp(notification)`. 
 
 For iOS, you can use this [package](https://github.com/holmesal/react-native-ios-notification-actions) to add notification actions.
 

android/src/main/java/com/dieam/reactnativepushnotification/modules/RNPushNotification.java

@@ -22,6 +22,7 @@
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.ReadableArray;
+import com.facebook.react.bridge.WritableArray;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.WritableMap;
 
@@ -58,6 +59,8 @@ public RNPushNotification(ReactApplicationContext reactContext) {
         mJsDelivery = new RNPushNotificationJsDelivery(reactContext);
 
         mRNPushNotificationHelper.checkOrCreateDefaultChannel();
+
+        registerNotificationsReceiveNotificationActions();
     }
 
     @Override
@@ -92,30 +95,81 @@ public void onNewIntent(Intent intent) {
         }
     }
 
-    private void registerNotificationsReceiveNotificationActions(ReadableArray actions) {
+    private void registerNotificationsReceiveNotificationActions() {
         IntentFilter intentFilter = new IntentFilter();
-        // Add filter for each actions.
-        for (int i = 0; i < actions.size(); i++) {
-            String action = actions.getString(i);
-            intentFilter.addAction(getReactApplicationContext().getPackageName() + "." + action);
+        
+        for(int i = 0; i < 10; i++) {
+            intentFilter.addAction(getReactApplicationContext().getPackageName() + ".ACTION_" + i);
         }
 
+        final RNPushNotification self = this;
+
         getReactApplicationContext().registerReceiver(new BroadcastReceiver() {
             @Override
             public void onReceive(Context context, Intent intent) {
                 Bundle bundle = intent.getBundleExtra("notification");
 
-                // Notify the action.
-                mJsDelivery.notifyNotificationAction(bundle);
-
                 // Dismiss the notification popup.
                 NotificationManager manager = (NotificationManager) context.getSystemService(context.NOTIFICATION_SERVICE);
                 int notificationID = Integer.parseInt(bundle.getString("id"));
-                manager.cancel(notificationID);
+
+                boolean autoCancel = bundle.getBoolean("autoCancel", true);
+
+                if(autoCancel) {
+                  if (bundle.containsKey("tag")) {
+                      String tag = bundle.getString("tag");
+                      manager.cancel(tag, notificationID);
+                  } else {
+                      manager.cancel(notificationID);
+                  }
+                }
+
+                boolean invokeApp = bundle.getBoolean("invokeApp", true);
+
+                // Notify the action.
+                if(invokeApp) {
+                  self.invokeApp(bundle);
+                } else {
+                  mJsDelivery.notifyNotificationAction(bundle);
+                }
             }
         }, intentFilter);
     }
 
+    private void invokeApp(Bundle bundle) {
+        ReactContext reactContext = getReactApplicationContext();
+        String packageName = reactContext.getPackageName();
+        Intent launchIntent = reactContext.getPackageManager().getLaunchIntentForPackage(packageName);
+        String className = launchIntent.getComponent().getClassName();
+
+        try {
+            Class<?> activityClass = Class.forName(className);
+            Intent activityIntent = new Intent(reactContext, activityClass);
+
+            if(bundle != null) {
+              activityIntent.putExtra("notification", bundle);
+            }
+
+            activityIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+
+            reactContext.startActivity(activityIntent);
+        } catch(Exception e) {
+            Log.e(LOG_TAG, "Class not found", e);
+            return;
+        }
+    }
+    
+    @ReactMethod
+    public void invokeApp(ReadableMap data) {
+        Bundle bundle = null;
+
+        if (data != null) {
+            bundle = Arguments.toBundle(data);
+        }
+
+        invokeApp(bundle);
+    }
+
     @ReactMethod
     public void checkPermissions(Promise promise) {
         ReactContext reactContext = getReactApplicationContext();
@@ -227,13 +281,8 @@ public void cancelLocalNotifications(ReadableMap userInfo) {
     /**
      * Clear notification from the notification centre.
      */
-    public void clearLocalNotification(int notificationID) {
-        mRNPushNotificationHelper.clearNotification(notificationID);
-    }
-
-    @ReactMethod
-    public void registerNotificationActions(ReadableArray actions) {
-        registerNotificationsReceiveNotificationActions(actions);
+    public void clearLocalNotification(String tag, int notificationID) {
+        mRNPushNotificationHelper.clearNotification(tag, notificationID);
     }
 
     @ReactMethod
@@ -279,4 +328,36 @@ public void run() {
           }
       }).start();
     }
+
+    @ReactMethod
+    /**
+     * List all channels id
+     */
+    public void getChannels(Callback callback) {
+      WritableArray array = Arguments.fromList(mRNPushNotificationHelper.listChannels());
+      
+      if(callback != null) {
+        callback.invoke(array);
+      }
+    }
+
+    @ReactMethod
+    /**
+     * Check if channel exists with a given id
+     */
+    public void channelExists(String channel_id, Callback callback) {
+      boolean exists = mRNPushNotificationHelper.channelExists(channel_id);
+
+      if(callback != null) {
+        callback.invoke(exists);
+      }
+    }
+
+    @ReactMethod
+    /**
+     * Delete channel with a given id
+     */
+    public void deleteChannel(String channel_id) {
+      mRNPushNotificationHelper.deleteChannel(channel_id);
+    }
 }

android/src/main/java/com/dieam/reactnativepushnotification/modules/RNPushNotificationAttributes.java

@@ -38,6 +38,7 @@ public class RNPushNotificationAttributes {
     private static final String VIBRATE = "vibrate";
     private static final String VIBRATION = "vibration";
     private static final String ACTIONS = "actions";
+    private static final String INVOKE_APP = "invokeApp";
     private static final String TAG = "tag";
     private static final String REPEAT_TYPE = "repeatType";
     private static final String REPEAT_TIME = "repeatTime";
@@ -70,6 +71,7 @@ public class RNPushNotificationAttributes {
     private final boolean vibrate;
     private final double vibration;
     private final String actions;
+    private final boolean invokeApp;
     private final String tag;
     private final String repeatType;
     private final double repeatTime;
@@ -103,6 +105,7 @@ public RNPushNotificationAttributes(Bundle bundle) {
         vibrate = bundle.getBoolean(VIBRATE);
         vibration = bundle.getDouble(VIBRATION);
         actions = bundle.getString(ACTIONS);
+        invokeApp = bundle.getBoolean(INVOKE_APP);
         tag = bundle.getString(TAG);
         repeatType = bundle.getString(REPEAT_TYPE);
         repeatTime = bundle.getDouble(REPEAT_TIME);
@@ -138,6 +141,7 @@ private RNPushNotificationAttributes(JSONObject jsonObject) {
             vibrate = jsonObject.has(VIBRATE) ? jsonObject.getBoolean(VIBRATE) : true;
             vibration = jsonObject.has(VIBRATION) ? jsonObject.getDouble(VIBRATION) : 1000;
             actions = jsonObject.has(ACTIONS) ? jsonObject.getString(ACTIONS) : null;
+            invokeApp = jsonObject.has(INVOKE_APP) ? jsonObject.getBoolean(INVOKE_APP) : true;
             tag = jsonObject.has(TAG) ? jsonObject.getString(TAG) : null;
             repeatType = jsonObject.has(REPEAT_TYPE) ? jsonObject.getString(REPEAT_TYPE) : null;
             repeatTime = jsonObject.has(REPEAT_TIME) ? jsonObject.getDouble(REPEAT_TIME) : 0.0;
@@ -230,6 +234,7 @@ public Bundle toBundle() {
         bundle.putBoolean(VIBRATE, vibrate);
         bundle.putDouble(VIBRATION, vibration);
         bundle.putString(ACTIONS, actions);
+        bundle.putBoolean(INVOKE_APP, invokeApp);
         bundle.putString(TAG, tag);
         bundle.putString(REPEAT_TYPE, repeatType);
         bundle.putDouble(REPEAT_TIME, repeatTime);
@@ -267,6 +272,7 @@ public JSONObject toJson() {
             jsonObject.put(VIBRATE, vibrate);
             jsonObject.put(VIBRATION, vibration);
             jsonObject.put(ACTIONS, actions);
+            jsonObject.put(INVOKE_APP, invokeApp);
             jsonObject.put(TAG, tag);
             jsonObject.put(REPEAT_TYPE, repeatType);
             jsonObject.put(REPEAT_TIME, repeatTime);
@@ -310,6 +316,7 @@ public String toString() {
                 ", vibrate=" + vibrate +
                 ", vibration=" + vibration +
                 ", actions='" + actions + '\'' +
+                ", invokeApp=" + invokeApp +
                 ", tag='" + tag + '\'' +
                 ", repeatType='" + repeatType + '\'' +
                 ", repeatTime=" + repeatTime +