Merge branch 'master' into master

wix · Jul 20, 2023 · aa3e149 · aa3e149
2 parents 1b88351 + 1e51492
commit aa3e149
Show file tree

Hide file tree

Showing 9 changed files with 221 additions and 286 deletions.
diff --git a/CHANGELOG.gren.md b/CHANGELOG.gren.md
diff --git a/lib/android/app/src/main/java/com/wix/reactnativenotifications/RNNotificationsPackage.java b/lib/android/app/src/main/java/com/wix/reactnativenotifications/RNNotificationsPackage.java
@@ -95,11 +95,13 @@ private void callOnOpenedIfNeed(Activity activity) {
         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();
+                // Erase notification intent after using it, to avoid looping with the same notification
+                // in case the app is moved to background and opened again
+                activity.setIntent(new Intent());
             }
         }
     }

diff --git a/...id/app/src/main/java/com/wix/reactnativenotifications/core/NotificationIntentAdapter.java b/...id/app/src/main/java/com/wix/reactnativenotifications/core/NotificationIntentAdapter.java
@@ -32,7 +32,12 @@ public static boolean canHandleTrampolineActivity(Context appContext) {
     }
 
     public static Bundle extractPendingNotificationDataFromIntent(Intent intent) {
-        return intent.getBundleExtra(PUSH_NOTIFICATION_EXTRA_NAME);
+        Bundle notificationBundle = intent.getBundleExtra(PUSH_NOTIFICATION_EXTRA_NAME);
+        if (notificationBundle != null) {
+            return notificationBundle;
+        } else {
+            return intent.getExtras();
+        }
     }
 
     public static boolean canHandleIntent(Intent intent) {

diff --git a/...pp/src/main/java/com/wix/reactnativenotifications/core/notification/PushNotification.java b/...pp/src/main/java/com/wix/reactnativenotifications/core/notification/PushNotification.java
@@ -8,6 +8,7 @@
 import android.content.Intent;
 import android.os.Build;
 import android.os.Bundle;
+import android.util.Log;
 
 import com.facebook.react.bridge.ReactContext;
 import com.wix.reactnativenotifications.core.AppLaunchHelper;
@@ -21,6 +22,7 @@
 import static com.wix.reactnativenotifications.Defs.NOTIFICATION_OPENED_EVENT_NAME;
 import static com.wix.reactnativenotifications.Defs.NOTIFICATION_RECEIVED_EVENT_NAME;
 import static com.wix.reactnativenotifications.Defs.NOTIFICATION_RECEIVED_BACKGROUND_EVENT_NAME;
+import static com.wix.reactnativenotifications.Defs.LOGTAG;
 
 public class PushNotification implements IPushNotification {
 
@@ -198,18 +200,32 @@ protected int createNotificationId(Notification notification) {
     }
 
     private void notifyReceivedToJS() {
-        mJsIOHelper.sendEventToJS(NOTIFICATION_RECEIVED_EVENT_NAME, mNotificationProps.asBundle(), mAppLifecycleFacade.getRunningReactContext());
+        try {
+            Bundle bundle = mNotificationProps.asBundle();
+            mJsIOHelper.sendEventToJS(NOTIFICATION_RECEIVED_EVENT_NAME, bundle, mAppLifecycleFacade.getRunningReactContext());
+        } catch (NullPointerException ex) {
+            Log.e(LOGTAG, "notifyReceivedToJS: Null pointer exception");
+        }
     }
 
     private void notifyReceivedBackgroundToJS() {
-        mJsIOHelper.sendEventToJS(NOTIFICATION_RECEIVED_BACKGROUND_EVENT_NAME, mNotificationProps.asBundle(), mAppLifecycleFacade.getRunningReactContext());
+        try {
+            Bundle bundle = mNotificationProps.asBundle();
+            mJsIOHelper.sendEventToJS(NOTIFICATION_RECEIVED_BACKGROUND_EVENT_NAME, bundle, mAppLifecycleFacade.getRunningReactContext());
+        } catch (NullPointerException ex) {
+            Log.e(LOGTAG, "notifyReceivedBackgroundToJS: Null pointer exception");
+        }
     }
 
     private void notifyOpenedToJS() {
         Bundle response = new Bundle();
-        response.putBundle("notification", mNotificationProps.asBundle());
 
-        mJsIOHelper.sendEventToJS(NOTIFICATION_OPENED_EVENT_NAME, response, mAppLifecycleFacade.getRunningReactContext());
+        try {
+            response.putBundle("notification", mNotificationProps.asBundle());
+            mJsIOHelper.sendEventToJS(NOTIFICATION_OPENED_EVENT_NAME, response, mAppLifecycleFacade.getRunningReactContext());
+        } catch (NullPointerException ex) {
+            Log.e(LOGTAG, "notifyOpenedToJS: Null pointer exception");
+        }
     }
 
     protected void launchOrResumeApp() {

diff --git a/lib/android/gradle.properties b/lib/android/gradle.properties
@@ -10,7 +10,7 @@
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
 # Default value: -Xmx10248m -XX:MaxPermSize=256m
-# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
 
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-native-notifications",
-  "version": "4.3.4-0",
+  "version": "5.0.0",
   "description": "Advanced Push Notifications (Silent, interactive notifications) for iOS & Android",
   "license": "MIT",
   "keywords": [

diff --git a/react-native.config.js b/react-native.config.js
@@ -7,7 +7,6 @@ module.exports = {
         packageInstance: 'new RNNotificationsPackage(reactNativeHost.getApplication())',
       }
     },
-    assets: []
   },
   project: {
     ios: {

diff --git a/scripts/test-unit.js b/scripts/test-unit.js
@@ -14,38 +14,38 @@ function run() {
 
 function runAndroidUnitTests() {
   const conf = release ? 'testReactNative60ReleaseUnitTest' : 'testReactNative60DebugUnitTest';
-  if (android && process.env.JENKINS_CI) {
-    const sdkmanager = '/usr/local/share/android-sdk/tools/bin/sdkmanager';
-    exec.execSync(`yes | ${sdkmanager} --licenses`);
-    // exec.execSync(`echo y | ${sdkmanager} --update && echo y | ${sdkmanager} --licenses`);
-  }
   exec.execSync(`cd lib/android && ./gradlew ${conf}`);
 }
 
 function runIosUnitTests() {
-  const conf = release ? `Release` : `Debug`;
+  exec.execSync('npm run build');
   exec.execSync('npm run pod-install');
+  testTarget('NotificationsExampleApp', 'iPhone 12', '14.4');
+}
+
+function testTarget(scheme, device, OS = 'latest') {
+  const conf = release ? `Release` : `Debug`;
   exec.execSync(`cd ./example/ios &&
             RCT_NO_LAUNCH_PACKAGER=true
             xcodebuild build build-for-testing
-            -scheme "NotificationsExampleApp"
+            -scheme "${scheme}"
             -workspace NotificationsExampleApp.xcworkspace
             -sdk iphonesimulator
             -configuration ${conf}
-            -derivedDataPath ./example/ios/DerivedData/NotificationsExampleApp
+            -derivedDataPath ./DerivedData/NotificationsExampleApp
             -quiet
-            -UseModernBuildSystem=NO
+            -UseModernBuildSystem=YES
             ONLY_ACTIVE_ARCH=YES`);
 
   exec.execSync(`cd ./example/ios &&
             RCT_NO_LAUNCH_PACKAGER=true
             xcodebuild test-without-building
-            -scheme "NotificationsExampleApp"
+            -scheme "${scheme}"
             -workspace NotificationsExampleApp.xcworkspace
             -sdk iphonesimulator
             -configuration ${conf}
-            -destination 'platform=iOS Simulator,name=iPhone 11'
-            -derivedDataPath ./example/ios/DerivedData/NotificationsExampleApp
+            -destination 'platform=iOS Simulator,name=${device},OS=${OS}'
+            -derivedDataPath ./DerivedData/NotificationsExampleApp
             ONLY_ACTIVE_ARCH=YES`);
 }
 

diff --git a/website/docs/docs/localNotifications.md b/website/docs/docs/localNotifications.md
@@ -25,7 +25,7 @@ let localNotification = Notifications.postLocalNotification({
 
 Notification object contains:
 
-- **`fireDate`**- The date and time when the system should deliver the notification (optinal - default is immediate dispatch).
+- **`fireDate`**- The date and time when the system should deliver the notification (optional - default is immediate dispatch).
 - `body`- The message displayed in the notification alert.
 - `title`- The title of the notification, displayed in the notifications center.
 - `alertAction`- The "action" displayed beneath an actionable notification on the lockscreen (e.g. "Slide to **open**"). Note that Apple no longer shows this in iOS 10.