fix: Push notification not working on Android on New Arch (#6602)

Author: diegolmello

android/app/src/main/java/chat/rocket/reactnative/notification/Ejson.java

@@ -1,10 +1,14 @@
 package chat.rocket.reactnative.notification;
 
+import android.util.Log;
+
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.Callback;
 
 import com.ammarahmed.mmkv.SecureKeystore;
 import com.tencent.mmkv.MMKV;
+import com.wix.reactnativenotifications.core.AppLifecycleFacade;
+import com.wix.reactnativenotifications.core.AppLifecycleFacadeHolder;
 
 import java.math.BigInteger;
 
@@ -38,20 +42,21 @@ public class Ejson {
 
     Content content;
 
+    private ReactApplicationContext reactContext;
+
     private MMKV mmkv;
 
     private String TOKEN_KEY = "reactnativemeteor_usertoken-";
 
     public Ejson() {
-        ReactApplicationContext reactApplicationContext = CustomPushNotification.reactApplicationContext;
-
-        if (reactApplicationContext == null) {
-            return;
+        AppLifecycleFacade facade = AppLifecycleFacadeHolder.get();
+        if (facade != null && facade.getRunningReactContext() instanceof ReactApplicationContext) {
+            this.reactContext = (ReactApplicationContext) facade.getRunningReactContext();
         }
 
         // Start MMKV container
-        MMKV.initialize(reactApplicationContext);
-        SecureKeystore secureKeystore = new SecureKeystore(reactApplicationContext);
+        MMKV.initialize(this.reactContext);
+        SecureKeystore secureKeystore = new SecureKeystore(this.reactContext);
 
         // https://github.com/ammarahm-ed/react-native-mmkv-storage/blob/master/src/loader.js#L31
         String alias = Utils.toHex("com.MMKV.default");

android/app/src/main/java/chat/rocket/reactnative/notification/Encryption.java

@@ -1,18 +1,20 @@
 package chat.rocket.reactnative.notification;
 
-import android.database.Cursor;
-import android.database.sqlite.SQLiteDatabase;
+ import android.database.Cursor;
 import android.util.Base64;
 import android.util.Log;
 
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.WritableMap;
+import com.wix.reactnativenotifications.core.AppLifecycleFacade;
+import com.wix.reactnativenotifications.core.AppLifecycleFacadeHolder;
 import com.google.gson.Gson;
 import com.pedrouid.crypto.RCTAes;
 import com.pedrouid.crypto.RCTRsaUtils;
 import com.pedrouid.crypto.RSA;
 import com.pedrouid.crypto.Util;
+import com.nozbe.watermelondb.WMDatabase;
 
 import java.io.File;
 import java.lang.reflect.Field;
@@ -73,25 +75,25 @@ class Encryption {
 
     public Room readRoom(final Ejson ejson) {
         String dbName = getDatabaseName(ejson.serverURL());
-        SQLiteDatabase db = null;
+        WMDatabase db = null;
 
         try {
-            db = SQLiteDatabase.openDatabase(dbName, null, SQLiteDatabase.OPEN_READONLY);
-            String[] queryArgs = {ejson.rid};
+           db = WMDatabase.getInstance(dbName, reactContext);
+           String[] queryArgs = {ejson.rid};
 
-            Cursor cursor = db.rawQuery("SELECT * FROM subscriptions WHERE id == ? LIMIT 1", queryArgs);
+           Cursor cursor = db.rawQuery("SELECT * FROM subscriptions WHERE id == ? LIMIT 1", queryArgs);
 
-            if (cursor.getCount() == 0) {
-                cursor.close();
-                return null;
-            }
+           if (cursor.getCount() == 0) {
+               cursor.close();
+               return null;
+           }
 
-            cursor.moveToFirst();
-            String e2eKey = cursor.getString(cursor.getColumnIndex("e2e_key"));
-            Boolean encrypted = cursor.getInt(cursor.getColumnIndex("encrypted")) > 0;
-            cursor.close();
+           cursor.moveToFirst();
+           String e2eKey = cursor.getString(cursor.getColumnIndex("e2e_key"));
+           Boolean encrypted = cursor.getInt(cursor.getColumnIndex("encrypted")) > 0;
+           cursor.close();
 
-            return new Room(e2eKey, encrypted);
+           return new Room(e2eKey, encrypted);
 
         } catch (Exception e) {
             Log.e("[ENCRYPTION]", "Error reading room", e);
@@ -117,15 +119,16 @@ private String getDatabaseName(String serverUrl) {
             e.printStackTrace();
         }
 
-        String dbName = serverUrl.replace("https://", "");
+        // Match JS WatermelonDB naming: strip scheme, replace '/' with '.', add '-experimental' when needed, and append one ".db".
+        String name = serverUrl.replaceFirst("^(\\w+:)?//", "").replace("/", ".");
         if (!isOfficial) {
-            dbName += "-experimental";
+            name += "-experimental";
         }
-        // Old issue. Safer to accept it then to migrate away from it.
-        dbName += ".db.db";
-        // https://github.com/Nozbe/WatermelonDB/blob/a757e646141437ad9a06f7314ad5555a8a4d252e/native/android-jsi/src/main/java/com/nozbe/watermelondb/jsi/JSIInstaller.java#L18
-        File databasePath = new File(reactContext.getDatabasePath(dbName).getPath().replace("/databases", ""));
-        return databasePath.getPath();
+        name += ".db";
+
+        // Important: return just the name (not an absolute path). WMDatabase will resolve and append its own ".db" internally,
+        // so the physical file becomes "*.db.db", matching the JS adapter.
+        return name;
     }
 
     public String readUserKey(final Ejson ejson) throws Exception {
@@ -213,6 +216,17 @@ public String decryptMessage(final Ejson ejson, final ReactApplicationContext re
 
     public String encryptMessage(final String message, final String id, final Ejson ejson) {
         try {
+            AppLifecycleFacade facade = AppLifecycleFacadeHolder.get();
+            if (facade != null && facade.getRunningReactContext() instanceof ReactApplicationContext) {
+                this.reactContext = (ReactApplicationContext) facade.getRunningReactContext();
+            } else {
+                this.reactContext = null;
+            }
+            if (this.reactContext == null) {
+                Log.i("[ROCKETCHAT][E2E]", "ReactApplicationContext is null, returning unencrypted message");
+                return message;
+            }
+            
             Room room = readRoom(ejson);
             if (room == null || !room.encrypted || room.e2eKey == null) {
                 return message;

app/lib/database/index.ts

@@ -27,7 +27,7 @@ import serversMigrations from './model/servers/migrations';
 import { TAppDatabase, TServerDatabase } from './interfaces';
 
 if (__DEV__) {
-	console.log(`📂 ${appGroupPath}`);
+	console.log(appGroupPath);
 }
 
 const getDatabasePath = (name: string) => `${appGroupPath}${name}${isOfficial ? '' : '-experimental'}.db`;
@@ -40,7 +40,9 @@ export const getDatabase = (database = ''): Database => {
 		dbName,
 		schema: appSchema,
 		migrations,
-		jsi: true
+		jsi: true,
+		// @ts-expect-error
+		experimentalUnsafeNativeReuse: true
 	});
 
 	return new Database({
@@ -75,7 +77,9 @@ class DB {
 				dbName: getDatabasePath('default'),
 				schema: serversSchema,
 				migrations: serversMigrations,
-				jsi: true
+				jsi: true,
+				// @ts-expect-error
+				experimentalUnsafeNativeReuse: true
 			}),
 			modelClasses: [Server, LoggedUser, ServersHistory]
 		}) as TServerDatabase

package.json

@@ -32,11 +32,11 @@
 		"bugsnag:upload-android": "bugsnag-cli upload react-native-android"
 	},
 	"dependencies": {
-		"@bugsnag/react-native": "^8.4.0",
+		"@bugsnag/react-native": "8.4.0",
 		"@discord/bottom-sheet": "bluesky-social/react-native-bottom-sheet",
 		"@hookform/resolvers": "^2.9.10",
 		"@notifee/react-native": "7.8.2",
-		"@nozbe/watermelondb": "^0.28.0-2",
+		"@nozbe/watermelondb": "^0.28.0",
 		"@react-native-async-storage/async-storage": "^1.22.3",
 		"@react-native-camera-roll/camera-roll": "^7.10.0",
 		"@react-native-clipboard/clipboard": "^1.13.2",

patches/react-native-notifications+5.1.0.patch

@@ -11,6 +11,35 @@ index ac04274..f2cfd00 100644
      final protected AppVisibilityListener mAppVisibilityListener = new AppVisibilityListener() {
          @Override
          public void onAppVisible() {
+diff --git a/node_modules/react-native-notifications/lib/android/app/src/main/java/com/wix/reactnativenotifications/fcm/FcmToken.java b/node_modules/react-native-notifications/lib/android/app/src/main/java/com/wix/reactnativenotifications/fcm/FcmToken.java
+index 7db6e8d..0127e8a 100644
+--- a/node_modules/react-native-notifications/lib/android/app/src/main/java/com/wix/reactnativenotifications/fcm/FcmToken.java
++++ b/node_modules/react-native-notifications/lib/android/app/src/main/java/com/wix/reactnativenotifications/fcm/FcmToken.java
+@@ -5,11 +5,12 @@ import android.os.Bundle;
+ import android.util.Log;
+ 
+ import com.facebook.react.ReactApplication;
+-import com.facebook.react.ReactInstanceManager;
+ import com.facebook.react.bridge.ReactContext;
+ import com.google.firebase.messaging.FirebaseMessaging;
+ import com.wix.reactnativenotifications.BuildConfig;
+ import com.wix.reactnativenotifications.core.JsIOHelper;
++import com.wix.reactnativenotifications.core.AppLifecycleFacade;
++import com.wix.reactnativenotifications.core.AppLifecycleFacadeHolder;
+ 
+ import static com.wix.reactnativenotifications.Defs.LOGTAG;
+ import static com.wix.reactnativenotifications.Defs.TOKEN_RECEIVED_EVENT_NAME;
+@@ -88,8 +89,8 @@ public class FcmToken implements IFcmToken {
+     }
+ 
+     protected void sendTokenToJS() {
+-        final ReactInstanceManager instanceManager = ((ReactApplication) mAppContext).getReactNativeHost().getReactInstanceManager();
+-        final ReactContext reactContext = instanceManager.getCurrentReactContext();
++        AppLifecycleFacade facade = AppLifecycleFacadeHolder.get();
++        final ReactContext reactContext = facade.getRunningReactContext();
+ 
+         // Note: Cannot assume react-context exists cause this is an async dispatched service.
+         if (reactContext != null && reactContext.hasActiveCatalystInstance()) {
 diff --git a/node_modules/react-native-notifications/lib/dist/Notifications.d.ts b/node_modules/react-native-notifications/lib/dist/Notifications.d.ts
 index 6e49fd4..5fe9515 100644
 --- a/node_modules/react-native-notifications/lib/dist/Notifications.d.ts

yarn.lock

@@ -2287,7 +2287,7 @@
   resolved "https://registry.yarnpkg.com/@bugsnag/plugin-react/-/plugin-react-8.4.0.tgz#1a6cf495f7177379f88e7efce0a4028b314ee3cf"
   integrity sha512-a+x3SmVE6VQ7a1jsEEU4q68L35rFy9OiDbWHAnZDZRcGXJzhA3ZU2XtB6ep5RCglwfPG0wLmq2dTjQBolSVi+g==
 
-"@bugsnag/react-native@^8.4.0":
+"@bugsnag/[email protected]":
   version "8.4.0"
   resolved "https://registry.yarnpkg.com/@bugsnag/react-native/-/react-native-8.4.0.tgz#6734082993209b68c56e398aaa9ce64e62637256"
   integrity sha512-kYTBDqRC8nMzg/54govZiDqh4uIMDW7e9iUxnMbVR91oES5NKS4NM161/ecJIh7UaUdzWf+MzDsZTJPEE5x9Xw==
@@ -3660,10 +3660,10 @@
   resolved "https://registry.yarnpkg.com/@nozbe/sqlite/-/sqlite-3.46.0.tgz#aeda9df305e2f49ef951409e44544c19a5a3e32d"
   integrity sha512-ntt8eNp5hh+axX9+kFb5uwyVE0edyfhiYYr+zHDzzFleGC7Qm+a2wHDWDtmRr5nSfbgomhY1uh30kpsHEIR3Mw==
 
-"@nozbe/watermelondb@^0.28.0-2":
-  version "0.28.0-2"
-  resolved "https://registry.yarnpkg.com/@nozbe/watermelondb/-/watermelondb-0.28.0-2.tgz#4a1e6e9416aa3d459a7cf80c54cdc10699182ccd"
-  integrity sha512-0BnbTpcy6n44sHnNZrgdrGQCpAgD8h/8BCi6/Sx1QkZiYp0+6bHppuBmUuGFcvJnYj3Xvnx2/5gbWh23oKUeJg==
+"@nozbe/watermelondb@^0.28.0":
+  version "0.28.0"
+  resolved "https://registry.yarnpkg.com/@nozbe/watermelondb/-/watermelondb-0.28.0.tgz#6130ac9017f9019966f892919ada79234c306c70"
+  integrity sha512-40ttcqPOLCTGnbfCQAXSEo8J4KlH/QQhwTfTb9E21CyX/driMEZueiJSI2rSkHICZrI2vnu52aRubNbI3UAzQQ==
   dependencies:
     "@babel/runtime" "7.26.0"
     "@nozbe/simdjson" "3.9.4"