@imatis/react-native-notifications 4.3.3-imatis.7 → 4.3.3-imatis.9

package/lib/android/app/src/main/java/com/wix/reactnativenotifications/RNNotificationsModule.java

@@ -63,7 +63,7 @@ public class RNNotificationsModule extends ReactContextBaseJavaModule implements
     @Override
     public void onNewIntent(Intent intent) {
         if (NotificationIntentAdapter.canHandleIntent(intent)) {
-            Bundle notificationData = intent.getExtras();
+            Bundle notificationData = NotificationIntentAdapter.extractPendingNotificationDataFromIntent(intent);
             final IPushNotification notification = PushNotification.get(getReactApplicationContext().getApplicationContext(), notificationData);
             if (notification != null) {
                 notification.onOpened();

package/lib/android/app/src/main/java/com/wix/reactnativenotifications/RNNotificationsPackage.java

@@ -19,6 +19,7 @@ import com.wix.reactnativenotifications.core.notification.IPushNotification;
 import com.wix.reactnativenotifications.core.notification.PushNotification;
 import com.wix.reactnativenotifications.core.notificationdrawer.IPushNotificationsDrawer;
 import com.wix.reactnativenotifications.core.notificationdrawer.PushNotificationsDrawer;
+import com.wix.reactnativenotifications.core.ReactAppLifecycleFacade;
 
 import java.util.Arrays;
 import java.util.Collections;
@@ -66,7 +67,12 @@ public class RNNotificationsPackage implements ReactPackage, AppLifecycleFacade.
 
     @Override
     public void onActivityStarted(Activity activity) {
-        if (InitialNotificationHolder.getInstance().get() == null) {
+          boolean isReactInitialized = false;
+        if (AppLifecycleFacadeHolder.get() instanceof ReactAppLifecycleFacade) {
+            isReactInitialized = AppLifecycleFacadeHolder.get().isReactInitialized();
+        }
+
+        if (InitialNotificationHolder.getInstance().get() == null && !isReactInitialized) {
             callOnOpenedIfNeed(activity);
         }
     }
@@ -95,8 +101,7 @@ public class RNNotificationsPackage implements ReactPackage, AppLifecycleFacade.
         Intent intent = activity.getIntent();
         if (NotificationIntentAdapter.canHandleIntent(intent)) {
             Context appContext = mApplication.getApplicationContext();
-            Bundle notificationData = NotificationIntentAdapter.canHandleTrampolineActivity(appContext) ?
-                    intent.getExtras() : NotificationIntentAdapter.extractPendingNotificationDataFromIntent(intent);
+            Bundle notificationData = NotificationIntentAdapter.extractPendingNotificationDataFromIntent(intent);
             final IPushNotification pushNotification = PushNotification.get(appContext, notificationData);
             if (pushNotification != null) {
                 pushNotification.onOpened();

package/lib/android/app/src/main/java/com/wix/reactnativenotifications/core/NotificationIntentAdapter.java

@@ -14,17 +14,9 @@ public class NotificationIntentAdapter {
 
     @SuppressLint("UnspecifiedImmutableFlag")
     public static PendingIntent createPendingNotificationIntent(Context appContext, PushNotificationProps notification) {
-        if (canHandleTrampolineActivity(appContext)) {
-            Intent intent = new Intent(appContext, ProxyService.class);
-            intent.putExtra(PUSH_NOTIFICATION_EXTRA_NAME, notification.asBundle());
-            return PendingIntent.getService(appContext, (int) System.currentTimeMillis(), intent, PendingIntent.FLAG_ONE_SHOT);
-        } else {
-            Intent mainActivityIntent = appContext.getPackageManager().getLaunchIntentForPackage(appContext.getPackageName());
-            mainActivityIntent.putExtra(PUSH_NOTIFICATION_EXTRA_NAME, notification.asBundle());
-            TaskStackBuilder taskStackBuilder = TaskStackBuilder.create(appContext);
-            taskStackBuilder.addNextIntentWithParentStack(mainActivityIntent);
-            return taskStackBuilder.getPendingIntent((int) System.currentTimeMillis(), PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_ONE_SHOT | PendingIntent.FLAG_IMMUTABLE);
-        }
+        Intent intent = appContext.getPackageManager().getLaunchIntentForPackage(appContext.getPackageName());
+        intent.putExtra(PUSH_NOTIFICATION_EXTRA_NAME, notification.asBundle());
+        return PendingIntent.getActivity(appContext, (int) System.currentTimeMillis(), intent, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_ONE_SHOT | PendingIntent.FLAG_IMMUTABLE);
     }
 
     public static boolean canHandleTrampolineActivity(Context appContext) {

package/lib/android/app/src/reactNative59/java/com/wix/reactnativenotifications/NotificationManagerCompatFacade.java

@@ -2,8 +2,8 @@
 package com.wix.reactnativenotifications;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.v4.app.NotificationManagerCompat;
+import androidx.annotation.NonNull;
+import androidx.core.app.NotificationManagerCompat;
 
 public abstract class NotificationManagerCompatFacade {
     public static NotificationManagerCompat from(@NonNull Context context) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@imatis/react-native-notifications",
-  "version": "4.3.3-imatis.7",
+  "version": "4.3.3-imatis.9",
   "description": "Advanced Push Notifications (Silent, interactive notifications) for iOS & Android",
   "license": "MIT",
   "keywords": [

package/android/app/src/reactNative59/reactNative59.iml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/java" isTestSource="false" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>

package/android/app/src/reactNative60/reactNative60.iml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/java" isTestSource="false" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>

package/lib/android/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +0,0 @@
-#Mon Jul 12 10:27:56 ICT 2021
-gradle.version=6.1.1

package/lib/android/local.properties

@@ -1,8 +0,0 @@
-## This file must *NOT* be checked into Version Control Systems,
-# as it contains information specific to your local configuration.
-#
-# Location of the SDK. This is only used by Gradle.
-# For customization when using a Version Control System, please read the
-# header note.
-#Mon Jul 12 10:26:56 ICT 2021
-sdk.dir=/Users/troy/Library/Android/sdk

package/lib/dist/DTO/Notification.d.ts

@@ -1,11 +0,0 @@
-export declare class Notification {
-    identifier: string;
-    payload: any;
-    constructor(payload: object);
-    get title(): string;
-    get body(): string;
-    get sound(): string;
-    get badge(): number;
-    get type(): string;
-    get thread(): string;
-}

package/lib/dist/DTO/Notification.js

@@ -1,28 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Notification = void 0;
-class Notification {
-    constructor(payload) {
-        this.payload = payload;
-        this.identifier = this.payload.identifier;
-    }
-    get title() {
-        return this.payload.title;
-    }
-    get body() {
-        return this.payload.body;
-    }
-    get sound() {
-        return this.payload.sound;
-    }
-    get badge() {
-        return this.payload.badge;
-    }
-    get type() {
-        return this.payload.type;
-    }
-    get thread() {
-        return this.payload.thread;
-    }
-}
-exports.Notification = Notification;

package/lib/dist/DTO/Notification.test.d.ts

@@ -1 +0,0 @@
-export {};

package/lib/dist/DTO/Notification.test.js

@@ -1,52 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const Notification_1 = require("./Notification");
-const NotificationIOS_1 = require("./NotificationIOS");
-const NotificationAndroid_1 = require("./NotificationAndroid");
-describe('Notification', () => {
-    it('Should create notification with payload', () => {
-        const payload = { p: 'p' };
-        const notification = new Notification_1.Notification(payload);
-        expect(notification.payload).toEqual(payload);
-    });
-    it('Should create iOS notification with identifier', () => {
-        const payload = { identifier: 'identifier' };
-        const notification = new NotificationIOS_1.NotificationIOS(payload);
-        expect(notification.identifier).toEqual(payload.identifier);
-    });
-    it('Should create Android notification with identifier', () => {
-        const payload = { 'google.message_id': 'identifier' };
-        const notification = new NotificationAndroid_1.NotificationAndroid(payload);
-        expect(notification.identifier).toEqual('identifier');
-    });
-    it('Should return title from payload', () => {
-        const payload = { title: 'title' };
-        const notification = new Notification_1.Notification(payload);
-        expect(notification.title).toEqual(payload.title);
-    });
-    it('Should return body from payload', () => {
-        const payload = { body: 'body' };
-        const notification = new Notification_1.Notification(payload);
-        expect(notification.body).toEqual(payload.body);
-    });
-    it('Should return sound from payload', () => {
-        const payload = { sound: 'sound.mp4' };
-        const notification = new Notification_1.Notification(payload);
-        expect(notification.sound).toEqual(payload.sound);
-    });
-    it('Should return badge from payload', () => {
-        const payload = { badge: 1 };
-        const notification = new Notification_1.Notification(payload);
-        expect(notification.badge).toEqual(payload.badge);
-    });
-    it('Should return type from payload', () => {
-        const payload = { type: 'type' };
-        const notification = new Notification_1.Notification(payload);
-        expect(notification.type).toEqual(payload.type);
-    });
-    it('Should return thread from payload', () => {
-        const payload = { thread: 'thread' };
-        const notification = new Notification_1.Notification(payload);
-        expect(notification.thread).toEqual(payload.thread);
-    });
-});

package/lib/dist/DTO/NotificationAndroid.d.ts

@@ -1,7 +0,0 @@
-import { Notification } from './Notification';
-export declare class NotificationAndroid extends Notification {
-    constructor(payload: object);
-    get title(): string;
-    get body(): string;
-    get sound(): string;
-}

package/lib/dist/DTO/NotificationAndroid.js

@@ -1,20 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.NotificationAndroid = void 0;
-const Notification_1 = require("./Notification");
-class NotificationAndroid extends Notification_1.Notification {
-    constructor(payload) {
-        super(payload);
-        this.identifier = this.payload["google.message_id"];
-    }
-    get title() {
-        return this.payload.title;
-    }
-    get body() {
-        return this.payload.body;
-    }
-    get sound() {
-        return this.payload.sound;
-    }
-}
-exports.NotificationAndroid = NotificationAndroid;

package/lib/dist/DTO/NotificationAndroid.test.d.ts

@@ -1 +0,0 @@
-export {};

package/lib/dist/DTO/NotificationAndroid.test.js

@@ -1,25 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const NotificationAndroid_1 = require("./NotificationAndroid");
-describe('Notification', () => {
-    it('Should create notification with payload', () => {
-        const payload = { p: 'p' };
-        const notification = new NotificationAndroid_1.NotificationAndroid(payload);
-        expect(notification.payload).toEqual(payload);
-    });
-    it('Should return title from payload', () => {
-        const payload = { title: 'title', body: 'body' };
-        const notification = new NotificationAndroid_1.NotificationAndroid(payload);
-        expect(notification.title).toEqual('title');
-    });
-    it('Should return body from payload', () => {
-        const payload = { title: 'title', body: 'body' };
-        const notification = new NotificationAndroid_1.NotificationAndroid(payload);
-        expect(notification.body).toEqual('body');
-    });
-    it('Should return sound from payload', () => {
-        const payload = { title: 'title', sound: 'sound.wav' };
-        const notification = new NotificationAndroid_1.NotificationAndroid(payload);
-        expect(notification.sound).toEqual('sound.wav');
-    });
-});

package/lib/dist/DTO/NotificationFactory.d.ts

@@ -1,4 +0,0 @@
-import { Notification } from './Notification';
-export declare class NotificationFactory {
-    fromPayload(payload: any): Notification;
-}

package/lib/dist/DTO/NotificationFactory.js

@@ -1,18 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.NotificationFactory = void 0;
-const Notification_1 = require("./Notification");
-const NotificationIOS_1 = require("./NotificationIOS");
-const NotificationAndroid_1 = require("./NotificationAndroid");
-const react_native_1 = require("react-native");
-class NotificationFactory {
-    fromPayload(payload) {
-        if (react_native_1.Platform.OS === 'ios') {
-            return payload.aps ? new NotificationIOS_1.NotificationIOS(payload) : new Notification_1.Notification(payload);
-        }
-        else {
-            return new NotificationAndroid_1.NotificationAndroid(payload);
-        }
-    }
-}
-exports.NotificationFactory = NotificationFactory;

package/lib/dist/DTO/NotificationIOS.d.ts

@@ -1,12 +0,0 @@
-import { Notification } from './Notification';
-export declare class NotificationIOS extends Notification {
-    identifier: string;
-    constructor(payload: object);
-    get aps(): any;
-    get alert(): any;
-    get title(): string;
-    get body(): string;
-    get sound(): string;
-    get badge(): number;
-    get thread(): string;
-}

package/lib/dist/DTO/NotificationIOS.js

@@ -1,40 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.NotificationIOS = void 0;
-const Notification_1 = require("./Notification");
-const _ = require("lodash");
-class NotificationIOS extends Notification_1.Notification {
-    constructor(payload) {
-        super(payload);
-        this.identifier = this.payload.identifier;
-    }
-    get aps() {
-        return this.payload.aps || {};
-    }
-    get alert() {
-        if (_.isObject(this.aps.alert)) {
-            return this.aps.alert;
-        }
-        else if (_.isString(this.aps.alert)) {
-            return {
-                body: this.aps.alert
-            };
-        }
-    }
-    get title() {
-        return this.alert.title;
-    }
-    get body() {
-        return this.alert.body;
-    }
-    get sound() {
-        return this.aps.sound;
-    }
-    get badge() {
-        return this.aps.badge;
-    }
-    get thread() {
-        return this.aps.thread;
-    }
-}
-exports.NotificationIOS = NotificationIOS;

package/lib/dist/DTO/NotificationIOS.test.d.ts

@@ -1 +0,0 @@
-export {};

package/lib/dist/DTO/NotificationIOS.test.js

@@ -1,58 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const NotificationIOS_1 = require("./NotificationIOS");
-describe('Notification', () => {
-    it('Should create notification with payload', () => {
-        const payload = { p: 'p' };
-        const notification = new NotificationIOS_1.NotificationIOS(payload);
-        expect(notification.payload).toEqual(payload);
-    });
-    it('Should create notification with valid aps', () => {
-        const aps = { alert: {} };
-        const payload = { aps };
-        const notification = new NotificationIOS_1.NotificationIOS(payload);
-        expect(notification.aps).toEqual(aps);
-    });
-    it('Should create notification with empy aps', () => {
-        const payload = { aps: undefined };
-        const notification = new NotificationIOS_1.NotificationIOS(payload);
-        expect(notification.aps).toEqual({});
-    });
-    it('Should return alert object', () => {
-        const payload = { aps: { alert: { title: 'title' } } };
-        const notification = new NotificationIOS_1.NotificationIOS(payload);
-        expect(notification.alert).toEqual(payload.aps.alert);
-    });
-    it('Should return alert object when alert is string', () => {
-        const payload = { aps: { alert: 'title' } };
-        const notification = new NotificationIOS_1.NotificationIOS(payload);
-        expect(notification.alert).toEqual({
-            body: 'title'
-        });
-    });
-    it('Should return title from alert', () => {
-        const payload = { aps: { alert: { title: 'title' } } };
-        const notification = new NotificationIOS_1.NotificationIOS(payload);
-        expect(notification.title).toEqual('title');
-    });
-    it('Should return body from alert', () => {
-        const payload = { aps: { alert: { title: 'title', body: 'body' } } };
-        const notification = new NotificationIOS_1.NotificationIOS(payload);
-        expect(notification.body).toEqual('body');
-    });
-    it('Should return badge from aps', () => {
-        const payload = { aps: { badge: 0 } };
-        const notification = new NotificationIOS_1.NotificationIOS(payload);
-        expect(notification.badge).toEqual(0);
-    });
-    it('Should return sound from aps', () => {
-        const payload = { aps: { sound: 'sound.wav' } };
-        const notification = new NotificationIOS_1.NotificationIOS(payload);
-        expect(notification.sound).toEqual('sound.wav');
-    });
-    it('Should return thread from aps', () => {
-        const payload = { aps: { thread: 'thread' } };
-        const notification = new NotificationIOS_1.NotificationIOS(payload);
-        expect(notification.thread).toEqual('thread');
-    });
-});

package/lib/dist/Notifications.d.ts

@@ -1,65 +0,0 @@
-import { EventsRegistry } from './events/EventsRegistry';
-import { Notification } from './DTO/Notification';
-import { NotificationCategory } from './interfaces/NotificationCategory';
-import { NotificationChannel } from './interfaces/NotificationChannel';
-import { NotificationsIOS } from './NotificationsIOS';
-import { NotificationsAndroid } from './NotificationsAndroid';
-import { NotificationPermissionOptions } from './interfaces/NotificationPermissions';
-export declare class NotificationsRoot {
-    readonly _ios: NotificationsIOS;
-    readonly _android: NotificationsAndroid;
-    private readonly notificationFactory;
-    private readonly nativeEventsReceiver;
-    private readonly nativeCommandsSender;
-    private readonly commands;
-    private readonly eventsRegistry;
-    private readonly eventsRegistryIOS;
-    private readonly uniqueIdProvider;
-    private readonly completionCallbackWrapper;
-    constructor();
-    /**
-     * registerRemoteNotifications
-     */
-    registerRemoteNotifications(options?: NotificationPermissionOptions): void;
-    /**
-     * postLocalNotification
-     */
-    postLocalNotification(notification: Notification, id?: number): number;
-    /**
-     * getInitialNotification
-     */
-    getInitialNotification(): Promise<Notification | undefined>;
-    /**
-     * getLastAction
-     */
-    getLastAction(): Promise<Notification | undefined>;
-    /**
-     * setCategories
-     */
-    setCategories(categories: [NotificationCategory?]): void;
-    /**
-     * cancelLocalNotification
-    */
-    cancelLocalNotification(notificationId: number): void;
-    /**
-     * removeAllDeliveredNotifications
-     */
-    removeAllDeliveredNotifications(): void;
-    /**
-     * isRegisteredForRemoteNotifications
-     */
-    isRegisteredForRemoteNotifications(): Promise<boolean>;
-    /**
-     * setNotificationChannel
-     */
-    setNotificationChannel(notificationChannel: NotificationChannel): void;
-    /**
-     * Obtain the events registry instance
-     */
-    events(): EventsRegistry;
-    /**
-     * ios/android getters
-     */
-    get ios(): NotificationsIOS;
-    get android(): NotificationsAndroid;
-}

package/lib/dist/Notifications.js

@@ -1,98 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.NotificationsRoot = void 0;
-const NativeCommandsSender_1 = require("./adapters/NativeCommandsSender");
-const NativeEventsReceiver_1 = require("./adapters/NativeEventsReceiver");
-const Commands_1 = require("./commands/Commands");
-const EventsRegistry_1 = require("./events/EventsRegistry");
-const EventsRegistryIOS_1 = require("./events/EventsRegistryIOS");
-const UniqueIdProvider_1 = require("./adapters/UniqueIdProvider");
-const CompletionCallbackWrapper_1 = require("./adapters/CompletionCallbackWrapper");
-const NotificationsIOS_1 = require("./NotificationsIOS");
-const NotificationsAndroid_1 = require("./NotificationsAndroid");
-const NotificationFactory_1 = require("./DTO/NotificationFactory");
-class NotificationsRoot {
-    constructor() {
-        this.notificationFactory = new NotificationFactory_1.NotificationFactory();
-        this.nativeEventsReceiver = new NativeEventsReceiver_1.NativeEventsReceiver(this.notificationFactory);
-        this.nativeCommandsSender = new NativeCommandsSender_1.NativeCommandsSender();
-        this.completionCallbackWrapper = new CompletionCallbackWrapper_1.CompletionCallbackWrapper(this.nativeCommandsSender);
-        this.uniqueIdProvider = new UniqueIdProvider_1.UniqueIdProvider();
-        this.commands = new Commands_1.Commands(this.nativeCommandsSender, this.uniqueIdProvider, this.notificationFactory);
-        this.eventsRegistry = new EventsRegistry_1.EventsRegistry(this.nativeEventsReceiver, this.completionCallbackWrapper);
-        this.eventsRegistryIOS = new EventsRegistryIOS_1.EventsRegistryIOS(this.nativeEventsReceiver, this.completionCallbackWrapper);
-        this._ios = new NotificationsIOS_1.NotificationsIOS(this.commands, this.eventsRegistryIOS);
-        this._android = new NotificationsAndroid_1.NotificationsAndroid(this.commands);
-    }
-    /**
-     * registerRemoteNotifications
-     */
-    registerRemoteNotifications(options) {
-        this.ios.registerRemoteNotifications(options);
-        this.android.registerRemoteNotifications();
-    }
-    /**
-     * postLocalNotification
-     */
-    postLocalNotification(notification, id) {
-        return this.commands.postLocalNotification(notification, id);
-    }
-    /**
-     * getInitialNotification
-     */
-    getInitialNotification() {
-        return this.commands.getInitialNotification();
-    }
-    /**
-     * getLastAction
-     */
-    getLastAction() {
-        return this.commands.getLastAction();
-    }
-    /**
-     * setCategories
-     */
-    setCategories(categories) {
-        this.commands.setCategories(categories);
-    }
-    /**
-     * cancelLocalNotification
-    */
-    cancelLocalNotification(notificationId) {
-        return this.commands.cancelLocalNotification(notificationId);
-    }
-    /**
-     * removeAllDeliveredNotifications
-     */
-    removeAllDeliveredNotifications() {
-        return this.commands.removeAllDeliveredNotifications();
-    }
-    /**
-     * isRegisteredForRemoteNotifications
-     */
-    isRegisteredForRemoteNotifications() {
-        return this.commands.isRegisteredForRemoteNotifications();
-    }
-    /**
-     * setNotificationChannel
-     */
-    setNotificationChannel(notificationChannel) {
-        return this.android.setNotificationChannel(notificationChannel);
-    }
-    /**
-     * Obtain the events registry instance
-     */
-    events() {
-        return this.eventsRegistry;
-    }
-    /**
-     * ios/android getters
-     */
-    get ios() {
-        return this._ios;
-    }
-    get android() {
-        return this._android;
-    }
-}
-exports.NotificationsRoot = NotificationsRoot;

package/lib/dist/NotificationsAndroid.d.ts

@@ -1,14 +0,0 @@
-import { Commands } from './commands/Commands';
-import { NotificationChannel } from './interfaces/NotificationChannel';
-export declare class NotificationsAndroid {
-    private readonly commands;
-    constructor(commands: Commands);
-    /**
-    * Refresh FCM token
-    */
-    registerRemoteNotifications(): void;
-    /**
-     * setNotificationChannel
-     */
-    setNotificationChannel(notificationChannel: NotificationChannel): void;
-}