Merge pull request #174 from mendix/revert-165-moo/notifee-migration

karahanharunn · web-flow · commit 67fbd3839b0d · 2025-12-11T16:13:25.000+01:00
Revert "feat: Migrate from react-native-push-notification to @notifee/react-n…"
diff --git a/CHANGELOG.android.txt b/CHANGELOG.android.txt
@@ -1,2 +1 @@
-- We have migrated from react-native-push-notification to @notifee/react-native for better new architecture compatibility and enhanced push notification features.
-- We fixed an issue where TextInput-based fields like the TextBox and TextArea would not receive focus on Android devices via touch.
+- We have improved the UI for users who use three-button navigation when edge-to-edge mode is enabled.
diff --git a/CHANGELOG.ios.txt b/CHANGELOG.ios.txt
@@ -1 +0,0 @@
-- We have migrated from react-native-push-notification to @notifee/react-native for better new architecture compatibility and enhanced push notification features.
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -23,7 +23,6 @@
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
     <!-- Required for scheduling local notifications -->
     <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM"/>
-    <uses-permission android:name="android.permission.USE_EXACT_ALARM" />
     <!-- Ignore deprecation: We still need this for the RN I think -->
     <uses-permission android:name="android.permission.USE_FINGERPRINT"/>
     <!-- Ignore deprecation -->
@@ -98,6 +97,18 @@
             </intent-filter>
         </activity>
 
+        <receiver android:name="com.dieam.reactnativepushnotification.modules.RNPushNotificationActions"/>
+        <receiver android:name="com.dieam.reactnativepushnotification.modules.RNPushNotificationPublisher"/>
+        <receiver
+                android:name="com.dieam.reactnativepushnotification.modules.RNPushNotificationBootEventReceiver"
+                android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.BOOT_COMPLETED"/>
+                <action android:name="android.intent.action.QUICKBOOT_POWERON"/>
+                <action android:name="com.htc.intent.action.QUICKBOOT_POWERON"/>
+            </intent-filter>
+        </receiver>
+
         <service
                 android:name=".firebase.FirebaseMessagingService"
                 android:exported="false">
diff --git a/android/app/src/main/java/com/mendix/developerapp/firebase/FirebaseMessagingService.kt b/android/app/src/main/java/com/mendix/developerapp/firebase/FirebaseMessagingService.kt
@@ -9,6 +9,7 @@ import android.net.Uri
 import android.os.Build
 import android.util.Log
 import androidx.core.app.NotificationCompat
+import com.dieam.reactnativepushnotification.modules.RNPushNotificationListenerService
 import com.google.firebase.messaging.RemoteMessage
 import com.mendix.developerapp.R
 
@@ -38,7 +39,7 @@ class FirebaseMessagingService: com.google.firebase.messaging.FirebaseMessagingS
             }
 
 
-            val notificationManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+            val notificationManager = context.getSystemService(RNPushNotificationListenerService.NOTIFICATION_SERVICE) as NotificationManager
             // Since android Oreo notification channel is needed.
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
                 val channel = NotificationChannel(MENDIX_AD_CAMPAIGN_CHANNEL,
diff --git a/android/build.gradle b/android/build.gradle
@@ -66,9 +66,6 @@ allprojects {
         }
         google()
         maven { url 'https://jitpack.io' }
-        maven {
-            url "$rootDir/../node_modules/@notifee/react-native/android/libs"
-        }
     }
 
     // Build all modules with Android 16KB pages enabled
diff --git a/ios/DeveloperApp/AppDelegate.swift b/ios/DeveloperApp/AppDelegate.swift
@@ -123,6 +123,9 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
         didReceive response: UNNotificationResponse,
         withCompletionHandler completionHandler: @escaping () -> Void
     ) {
+        if (!handleMendixNotification(response: response)) {
+            RNCPushNotificationIOS.didReceive(response)
+        }
         completionHandler()
     }
     
diff --git a/ios/DeveloperApp/DeveloperApp-Bridging-Header.h b/ios/DeveloperApp/DeveloperApp-Bridging-Header.h
@@ -3,3 +3,4 @@
 #import "MendixNative.h"
 #import "IQKeyboardManager/IQKeyboardManager.h"
 #import "RNSplashScreen.h"
+#import "RNCPushNotificationIOS.h"
diff --git a/ios/DeveloperApp/Info.plist b/ios/DeveloperApp/Info.plist
@@ -86,7 +86,7 @@
 	<key>NSPhotoLibraryUsageDescription</key>
 	<string>To use that feature the app needs access to your photo library.</string>
 	<key>Native Binary Version</key>
-	<integer>15</integer>
+	<integer>14</integer>
 	<key>NativeOTAEnabled</key>
 	<true/>
 	<key>ReferenceGuideUrl</key>
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
@@ -1892,6 +1892,8 @@ PODS:
     - React-Core
   - RNCPicker (2.11.0):
     - React-Core
+  - RNCPushNotificationIOS (1.10.1):
+    - React-Core
   - RNDateTimePicker (8.2.0):
     - React-Core
   - RNDeviceInfo (13.0.0):
@@ -1947,11 +1949,6 @@ PODS:
     - React-Core
   - RNLocalize (3.2.1):
     - React-Core
-  - RNNotifee (9.1.8):
-    - React-Core
-    - RNNotifee/NotifeeCore (= 9.1.8)
-  - RNNotifee/NotifeeCore (9.1.8):
-    - React-Core
   - RNPermissions (4.1.5):
     - React-Core
   - RNReanimated (3.16.1):
@@ -2211,6 +2208,7 @@ DEPENDENCIES:
   - "RNCAsyncStorage (from `../node_modules/@react-native-async-storage/async-storage`)"
   - "RNCMaskedView (from `../node_modules/@react-native-masked-view/masked-view`)"
   - "RNCPicker (from `../node_modules/@react-native-picker/picker`)"
+  - "RNCPushNotificationIOS (from `../node_modules/@react-native-community/push-notification-ios`)"
   - "RNDateTimePicker (from `../node_modules/@react-native-community/datetimepicker`)"
   - RNDeviceInfo (from `../node_modules/react-native-device-info`)
   - RNFastImage (from `../node_modules/react-native-fast-image`)
@@ -2223,7 +2221,6 @@ DEPENDENCIES:
   - RNGestureHandler (from `../node_modules/react-native-gesture-handler`)
   - RNInAppBrowser (from `../node_modules/react-native-inappbrowser-reborn`)
   - RNLocalize (from `../node_modules/react-native-localize`)
-  - "RNNotifee (from `../node_modules/@notifee/react-native`)"
   - RNPermissions (from `../node_modules/react-native-permissions`)
   - RNReanimated (from `../node_modules/react-native-reanimated`)
   - RNScreens (from `../node_modules/react-native-screens`)
@@ -2440,6 +2437,8 @@ EXTERNAL SOURCES:
     :path: "../node_modules/@react-native-masked-view/masked-view"
   RNCPicker:
     :path: "../node_modules/@react-native-picker/picker"
+  RNCPushNotificationIOS:
+    :path: "../node_modules/@react-native-community/push-notification-ios"
   RNDateTimePicker:
     :path: "../node_modules/@react-native-community/datetimepicker"
   RNDeviceInfo:
@@ -2464,8 +2463,6 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native-inappbrowser-reborn"
   RNLocalize:
     :path: "../node_modules/react-native-localize"
-  RNNotifee:
-    :path: "../node_modules/@notifee/react-native"
   RNPermissions:
     :path: "../node_modules/react-native-permissions"
   RNReanimated:
@@ -2597,6 +2594,7 @@ SPEC CHECKSUMS:
   RNCAsyncStorage: 40367e8d25522dca9c3513c7b9815a184669bd97
   RNCMaskedView: de80352547bd4f0d607bf6bab363d826822bd126
   RNCPicker: 124b4fb5859ba1a3fd53a91e16d1e7a0fc016e59
+  RNCPushNotificationIOS: 778dc253960de7b6544abe6cee86fea1e2c590ab
   RNDateTimePicker: 818460dc31b0dc5ec58289003e27dd8d022fb79c
   RNDeviceInfo: ae4e1a9b955b2a65314588cc7251795631925668
   RNFastImage: 462a183c4b0b6b26fdfd639e1ed6ba37536c3b87
@@ -2609,7 +2607,6 @@ SPEC CHECKSUMS:
   RNGestureHandler: 9bf6e8f72d2e72c8f7eb45986fe71a5005fb072d
   RNInAppBrowser: 031138591f9cbf57e987d0fe97f4e73d5fc7524b
   RNLocalize: e7378161f0b6a6365407eb2377aab46cc38047d8
-  RNNotifee: 5e3b271e8ea7456a36eec994085543c9adca9168
   RNPermissions: e1ce3272c349e0e06c38d540353967737428336b
   RNReanimated: 20f0d150af988258289b2d6cda655bd14945a769
   RNScreens: 86e5c168cdd055a8feead28eb756ca7103918b6a
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -19,8 +19,7 @@
   },
   "dependencies": {
     "@gorhom/bottom-sheet": "^5.1.1",
-    "@mendix/native": "9.2.1",
-    "@notifee/react-native": "9.1.8",
+    "@mendix/native": "9.2.0",
     "@op-engineering/op-sqlite": "9.2.7",
     "@react-native-async-storage/async-storage": "2.0.0",
     "@react-native-camera-roll/camera-roll": "7.4.0",
@@ -30,6 +29,7 @@
     "@react-native-community/datetimepicker": "8.2.0",
     "@react-native-community/geolocation": "3.4.0",
     "@react-native-community/netinfo": "11.4.1",
+    "@react-native-community/push-notification-ios": "1.10.1",
     "@react-native-firebase/analytics": "20.1.0",
     "@react-native-firebase/app": "20.1.0",
     "@react-native-firebase/crashlytics": "20.1.0",
@@ -56,6 +56,7 @@
     "react-native-maps": "1.14.0",
     "react-native-pager-view": "6.4.1",
     "react-native-permissions": "4.1.5",
+    "react-native-push-notification": "8.1.1",
     "react-native-reanimated": "3.16.1",
     "react-native-safe-area-context": "5.2.0",
     "react-native-schedule-exact-alarm-permission": "^0.1.5",
diff --git a/patches/react-native-push-notification+8.1.1.patch b/patches/react-native-push-notification+8.1.1.patch
@@ -0,0 +1,18 @@
+diff --git a/node_modules/react-native-push-notification/android/src/main/java/com/dieam/reactnativepushnotification/modules/RNPushNotificationHelper.java b/node_modules/react-native-push-notification/android/src/main/java/com/dieam/reactnativepushnotification/modules/RNPushNotificationHelper.java
+index 248ff08..4316500 100644
+--- a/node_modules/react-native-push-notification/android/src/main/java/com/dieam/reactnativepushnotification/modules/RNPushNotificationHelper.java
++++ b/node_modules/react-native-push-notification/android/src/main/java/com/dieam/reactnativepushnotification/modules/RNPushNotificationHelper.java
+@@ -171,6 +171,13 @@ public class RNPushNotificationHelper {
+             return;
+         }
+ 
++
++        // Call canScheduleExactAlarms to confirm the user has allowed alarms to be set. otherwise,
++        // attempting to set an alarm below will crash the app!
++        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S && !getAlarmManager().canScheduleExactAlarms()) {
++            return;
++        }
++
+         Log.d(LOG_TAG, String.format("Setting a notification with id %s at time %s",
+                 bundle.getString("id"), Long.toString(fireDate)));
+         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1 @@`
`1`		`-- We have migrated from react-native-push-notification to @notifee/react-native for better new architecture compatibility and enhanced push notification features.`
`2`		`-- We fixed an issue where TextInput-based fields like the TextBox and TextArea would not receive focus on Android devices via touch.`
	`1`	`+- We have improved the UI for users who use three-button navigation when edge-to-edge mode is enabled.`
Original file line number	Diff line number	Diff line change
`@@ -1 +0,0 @@`
`1`		`-- We have migrated from react-native-push-notification to @notifee/react-native for better new architecture compatibility and enhanced push notification features.`
Original file line number	Diff line number	Diff line change
`@@ -66,9 +66,6 @@ allprojects {`
`66`	`66`	`}`
`67`	`67`	`google()`
`68`	`68`	`maven { url 'https://jitpack.io' }`
`69`		`- maven {`
`70`		`- url "$rootDir/../node_modules/@notifee/react-native/android/libs"`
`71`		`- }`
`72`	`69`	`}`
`73`	`70`
`74`	`71`	`// Build all modules with Android 16KB pages enabled`
Original file line number	Diff line number	Diff line change
`@@ -123,6 +123,9 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD`
`123`	`123`	`didReceive response: UNNotificationResponse,`
`124`	`124`	`withCompletionHandler completionHandler: @escaping () -> Void`
`125`	`125`	`) {`
	`126`	`+ if (!handleMendixNotification(response: response)) {`
	`127`	`+ RNCPushNotificationIOS.didReceive(response)`
	`128`	`+ }`
`126`	`129`	`completionHandler()`
`127`	`130`	`}`
`128`	`131`