@onekeyfe/react-native-jpush 6.7.0-alpha.435 → 6.7.0-alpha.436

package/README.md

@@ -22,3 +22,19 @@ yarn workspace @onekeyfe/react-native-jpush test
 # Native iOS & Android E2E protocol verification (uses non-production demo key 1f2027d3cfb1b51dac664c42)
 python3 native-modules/react-native-jpush/scripts/verify_clean_sdk.py
 ```
+
+## Android Google / FCM source transport
+
+The optional Android source library in `android/fcm` replaces the opaque Jiguang FCM plugin. It delegates the Google transport to the official Firebase Messaging SDK and forwards tokens and messages into this package's JCore/JPush pipeline. Link it alongside the project's autolinked JPush module (the alias below matches app-monorepo):
+
+```groovy
+// settings.gradle, after React Native autolinking
+include ':onekey-jpush-fcm'
+project(':onekey-jpush-fcm').projectDir = new File(project(':jpush-react-native').projectDir, 'fcm')
+
+// app/build.gradle: replace cn.jiguang.sdk.plugin:fcm
+// Keep this dependency scoped to the Google distribution.
+googleImplementation project(':onekey-jpush-fcm')
+```
+
+The host retains its existing `google-services.json` and Google Services Gradle plugin. Firebase auto-init stays disabled; JPush initialization requests the token after authorization. Cloud acceptance requires the matching Firebase credentials configured in the Jiguang sender. For Firebase-managed background notification payloads, use `cn.jpush.android.intent.NOTIFICATION_OPENED` as the click action so the private JPush activity receives `JMessageExtra`.

package/android/fcm/build.gradle

@@ -0,0 +1,29 @@
+apply plugin: 'com.android.library'
+
+android {
+  namespace 'com.onekey.jpush.fcm'
+  compileSdkVersion rootProject.ext.compileSdkVersion
+
+  defaultConfig {
+    minSdkVersion rootProject.ext.minSdkVersion
+    targetSdkVersion rootProject.ext.targetSdkVersion
+    consumerProguardFiles 'consumer-rules.pro'
+  }
+
+  compileOptions {
+    sourceCompatibility JavaVersion.VERSION_1_8
+    targetCompatibility JavaVersion.VERSION_1_8
+  }
+}
+
+def coreProject = rootProject.subprojects.find {
+  it.projectDir.canonicalFile == projectDir.parentFile.canonicalFile
+}
+if (coreProject == null) {
+  throw new GradleException('The FCM library requires the autolinked JPush core project.')
+}
+
+dependencies {
+  implementation project(coreProject.path)
+  implementation 'com.google.firebase:firebase-messaging:25.0.1'
+}

package/android/fcm/consumer-rules.pro

@@ -0,0 +1,2 @@
+# The core SDK discovers this optional transport by its fixed class name.
+-keep class com.onekey.jpush.fcm.FcmPushManager { public <init>(); }

package/android/fcm/src/main/AndroidManifest.xml

@@ -0,0 +1,16 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+  <application>
+    <meta-data android:name="firebase_messaging_auto_init_enabled" android:value="false" />
+    <service android:name="com.onekey.jpush.fcm.FcmMessagingService" android:exported="false">
+      <intent-filter>
+        <action android:name="com.google.firebase.MESSAGING_EVENT" />
+      </intent-filter>
+    </service>
+    <activity android:name="cn.jpush.android.service.JNotifyActivity" android:exported="false">
+      <intent-filter>
+        <action android:name="cn.jpush.android.intent.NOTIFICATION_OPENED" />
+        <category android:name="android.intent.category.DEFAULT" />
+      </intent-filter>
+    </activity>
+  </application>
+</manifest>

package/android/fcm/src/main/java/com/onekey/jpush/fcm/FcmMessagingService.java

@@ -0,0 +1,72 @@
+package com.onekey.jpush.fcm;
+
+import android.os.Bundle;
+import cn.jiguang.core.JCoreStorage;
+import cn.jiguang.plugins.push.common.JLogger;
+import cn.jpush.android.api.JPushInterface;
+import cn.jpush.android.api.JThirdPlatFormInterface;
+import cn.jpush.android.local.ActionHelper;
+import com.google.firebase.messaging.FirebaseMessagingService;
+import com.google.firebase.messaging.RemoteMessage;
+import java.util.Map;
+import org.json.JSONObject;
+
+public final class FcmMessagingService extends FirebaseMessagingService {
+    @Override
+    public void onNewToken(String token) {
+        if (JCoreStorage.isPushStopped(this) || !JCoreStorage.isCollectionAuth(this)) {
+            return;
+        }
+        JPushInterface.init(getApplicationContext());
+        FcmPushManager.acceptToken(getApplicationContext(), token);
+    }
+
+    @Override
+    public void onMessageReceived(RemoteMessage remoteMessage) {
+        if (JCoreStorage.isPushStopped(this) || !JCoreStorage.isCollectionAuth(this)) {
+            return;
+        }
+        try {
+            Map<String, String> data = remoteMessage.getData();
+            String raw = data.get("JMessageExtra");
+            JSONObject message;
+            if (raw == null || raw.isEmpty()) {
+                message = new JSONObject(data);
+            } else {
+                String decoded = JThirdPlatFormInterface.decodeMessageJson(raw);
+                if (decoded == null) {
+                    JLogger.w("FCM payload rejected");
+                    return;
+                }
+                message = new JSONObject(decoded);
+            }
+            RemoteMessage.Notification notification = remoteMessage.getNotification();
+            if (notification != null) {
+                if (!message.has("n_title") && !message.has("title")) {
+                    message.put("n_title", notification.getTitle());
+                }
+                if (!message.has("n_content") && !message.has("alert") && !message.has("content")) {
+                    message.put("n_content", notification.getBody());
+                }
+            }
+            if (!message.has("msg_id") && !message.has("_jmsgid_") && !message.has("_j_msgid")) {
+                message.put("msg_id", remoteMessage.getMessageId());
+            }
+            if (!message.has("n_extras") && !message.has("extras") && !data.containsKey("JMessageExtra")) {
+                message.put("n_extras", new JSONObject(data));
+            }
+            raw = message.toString();
+            Bundle payload = new Bundle();
+            payload.putString("JMessageExtra", raw);
+            payload.putByte("platform", (byte) 8);
+            ActionHelper.getInstance().doAction(
+                getApplicationContext(),
+                JThirdPlatFormInterface.ACTION_PLUGIN_PALTFORM_ON_MESSAGING,
+                payload
+            );
+            JLogger.i("FCM message forwarded to native dispatcher");
+        } catch (Exception invalidMessage) {
+            JLogger.w("FCM payload rejected");
+        }
+    }
+}

package/android/fcm/src/main/java/com/onekey/jpush/fcm/FcmPushManager.java

@@ -0,0 +1,69 @@
+package com.onekey.jpush.fcm;
+
+import android.content.Context;
+import android.os.Bundle;
+import cn.jiguang.core.JCoreStorage;
+import cn.jiguang.plugins.push.common.JLogger;
+import cn.jpush.android.api.JPushInterface;
+import cn.jpush.android.api.JThirdPlatFormInterface;
+import com.google.android.gms.common.GoogleApiAvailabilityLight;
+import com.google.firebase.FirebaseApp;
+import com.google.firebase.messaging.FirebaseMessaging;
+
+public final class FcmPushManager extends JThirdPlatFormInterface {
+    @Override
+    public void init(Context context) {
+        FirebaseApp.initializeApp(context);
+    }
+
+    @Override
+    public void register(Context context, Bundle options) {
+        init(context);
+    }
+
+    @Override
+    public String getToken(final Context context) {
+        FirebaseMessaging.getInstance().getToken().addOnCompleteListener(task -> {
+            if (!task.isSuccessful()) {
+                Exception error = task.getException();
+                JLogger.w("FCM token request failed type="
+                    + (error != null ? error.getClass().getSimpleName() : "unknown"));
+                return;
+            }
+            acceptToken(context, task.getResult());
+        });
+        return JCoreStorage.getThirdToken(context, (byte) 8);
+    }
+
+    static void acceptToken(Context context, String token) {
+        if (token == null || token.isEmpty() || JCoreStorage.isPushStopped(context)
+            || !JCoreStorage.isCollectionAuth(context)) {
+            return;
+        }
+        Bundle result = new Bundle();
+        result.putString(KEY_TOKEN, token);
+        result.putByte(KEY_PLATFORM, (byte) 8);
+        doAction(context, ACTION_REGISTER_TOKEN, result);
+        JLogger.i("FCM token submitted to JCore");
+    }
+
+    @Override
+    public boolean isSupport(Context context) {
+        if (context == null) {
+            return false;
+        }
+        int status = GoogleApiAvailabilityLight.getInstance().isGooglePlayServicesAvailable(context);
+        if (status != 0) {
+            JLogger.w("FCM Google Play services unavailable code=" + status);
+        }
+        return status == 0;
+    }
+
+    @Override public byte getRomType(Context context) { return 8; }
+    @Override public String getRomName() { return "fcm"; }
+    @Override public boolean isNeedClearToken(Context context) { return false; }
+    @Override public String getAppkey(Context context) { return FirebaseApp.getInstance().getOptions().getApiKey(); }
+    @Override public String getAppId(Context context) { return FirebaseApp.getInstance().getOptions().getApplicationId(); }
+    @Override public void clearNotification(Context context, int id) { JPushInterface.clearNotificationById(context, id); }
+    @Override public void clearAllNotification(Context context) { JPushInterface.clearAllNotifications(context); }
+}

package/android/src/main/java/cn/jiguang/core/JCoreTcpEngine.java

@@ -1323,6 +1323,7 @@ public final class JCoreTcpEngine {
         String regId = JCoreStorage.getRegistrationId(context);
         ActionHelper.getInstance().dispatchRegisterEvent(context, regId);
         ActionHelper.getInstance().dispatchConnectedEvent(context, true);
+        cn.jpush.android.api.JThirdPlatFormInterface.initializeFcm(context);
     }
 
     public Bundle handleEvent(Context context, String sdkType, int cmd, String action, Bundle bundle, Object... extras) {

package/android/src/main/java/cn/jpush/android/api/JPushInterface.java

@@ -81,6 +81,7 @@ public class JPushInterface {
         JPushConstants.init(app);
         ActionHelper.getInstance().init(app);
         JCoreManager.init(app);
+        JThirdPlatFormInterface.initializeFcm(app);
     }
 
     public static void init(Context context, JPushConfig config) {
@@ -104,6 +105,7 @@ public class JPushInterface {
     public static void resumePush(Context context) {
         JCoreStorage.setPushStopped(context, false);
         JCoreManager.init(context);
+        JThirdPlatFormInterface.initializeFcm(context);
         ActionHelper.getInstance().setPushStatusWithCallBack(context, 4, 1);
     }
 

package/android/src/main/java/cn/jpush/android/api/JThirdPlatFormInterface.java

@@ -4,11 +4,21 @@ import android.app.Notification;
 import android.content.Context;
 import android.os.Bundle;
 import cn.jiguang.core.JCoreCrypto;
+import cn.jiguang.core.JCoreStorage;
+import cn.jiguang.core.JCoreTcpEngine;
+import cn.jiguang.plugins.push.common.JLogger;
 import cn.jpush.android.helper.JCoreHelper;
 import cn.jpush.android.local.ActionHelper;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.nio.charset.StandardCharsets;
+import java.util.zip.GZIPInputStream;
 import org.json.JSONObject;
 
 public abstract class JThirdPlatFormInterface {
+    private static JThirdPlatFormInterface fcmPlugin;
+    private static boolean fcmRegistered;
+    private static final int MAX_MESSAGE_BYTES = 65536;
     public static final String ACTION_NOTIFICATION_SHOW = "action_notification_show";
     public static final String ACTION_NOTIFICATION_ARRIVED = "action_notification_arrived";
     public static final String ACTION_NOTIFICATION_UN_SHOW = "action_notification_unshow";
@@ -69,6 +79,44 @@ public abstract class JThirdPlatFormInterface {
         return false;
     }
 
+    public static void initializeFcm(final Context context) {
+        if (context == null || JCoreStorage.isPushStopped(context) || !JCoreStorage.isCollectionAuth(context)) {
+            return;
+        }
+        JCoreTcpEngine.getInstance().executeAsync(new Runnable() {
+            @Override
+            public void run() {
+                synchronized (JThirdPlatFormInterface.class) {
+                    if (JCoreStorage.isPushStopped(context) || !JCoreStorage.isCollectionAuth(context)) {
+                        return;
+                    }
+                    try {
+                        if (fcmPlugin == null) {
+                            // This optional source module is linked only by Google hosts.
+                            fcmPlugin = (JThirdPlatFormInterface) Class.forName(
+                                "com.onekey.jpush.fcm.FcmPushManager"
+                            ).getDeclaredConstructor().newInstance();
+                        }
+                        if (!fcmPlugin.isSupport(context)) {
+                            return;
+                        }
+                        if (!fcmRegistered) {
+                            fcmPlugin.init(context);
+                            fcmPlugin.register(context, new Bundle());
+                            fcmRegistered = true;
+                        }
+                        fcmPlugin.getToken(context);
+                        JLogger.i("FCM registration requested");
+                    } catch (ClassNotFoundException absentPlugin) {
+                        // Non-Google hosts intentionally do not include the optional plugin.
+                    } catch (Exception | LinkageError unavailablePlugin) {
+                        JLogger.w("FCM registration unavailable");
+                    }
+                }
+            }
+        });
+    }
+
     public static void onEvent(Thread thread, Throwable error) {
         ActionHelper.getInstance().onEvent(thread, error);
     }
@@ -84,6 +132,10 @@ public abstract class JThirdPlatFormInterface {
     }
 
     public static void sendActionByJCore(Context context, Bundle bundle, String action) {
+        if (ACTION_PLUGIN_PALTFORM_ON_MESSAGING.equals(action)) {
+            ActionHelper.getInstance().doAction(context, action, bundle);
+            return;
+        }
         JCoreHelper.runActionWithService(context, "JPUSH", action, bundle);
     }
 
@@ -132,16 +184,64 @@ public abstract class JThirdPlatFormInterface {
     public static NotificationMessage parseMessage(Context context, String rawJson) {
         NotificationMessage message = new NotificationMessage();
         message.context = context;
-        if (rawJson != null) {
+        message.platform = 8;
+        message.displayForeground = "0";
+        String decoded = decodeMessageJson(rawJson);
+        if (decoded != null) {
             try {
-                JSONObject json = new JSONObject(rawJson);
-                message.msgId = json.optString("msg_id", "");
-                message.notificationTitle = json.optString("n_title", "");
-                message.notificationContent = json.optString("n_content", "");
-                message.notificationExtras = json.optString("n_extras", "");
-            } catch (Throwable ignored) {
+                JSONObject json = new JSONObject(decoded);
+                message.msgId = json.optString("_jmsgid_", json.optString("_j_msgid", ""));
+                if (message.msgId.isEmpty()) {
+                    message.msgId = json.optString("msg_id", "");
+                }
+                String overrideId = json.optString("override_msg_id", "");
+                if (!overrideId.isEmpty()) {
+                    message.msgId = overrideId;
+                }
+                message.notificationId = getNofiticationID(message.msgId, 0);
+                message.notificationTitle = json.optString("n_title", json.optString("title", ""));
+                message.notificationContent = json.optString("n_content", json.optString("alert", json.optString("content", "")));
+                Object extras = json.opt("n_extras");
+                if (extras == null) {
+                    extras = json.opt("extras");
+                }
+                message.notificationExtras = extras != null ? extras.toString() : "";
+                message.notificationChannelId = json.optString("n_channel_id", "");
+                if (!JCoreStorage.isPushStopped(context) && JCoreStorage.isCollectionAuth(context)) {
+                    message.displayForeground = json.optString("n_foreground", "1");
+                }
+            } catch (Exception invalidMessage) {
+                JLogger.w("FCM payload rejected");
             }
         }
         return message;
     }
+
+    public static String decodeMessageJson(String rawJson) {
+        if (rawJson == null || rawJson.length() > MAX_MESSAGE_BYTES
+            || rawJson.getBytes(StandardCharsets.UTF_8).length > MAX_MESSAGE_BYTES) {
+            return null;
+        }
+        try {
+            JSONObject json = new JSONObject(rawJson);
+            if (!json.has("jg_c")) {
+                return rawJson;
+            }
+            byte[] compressed = JCoreCrypto.base64Decode(json.getString("jg_c"));
+            try (GZIPInputStream input = new GZIPInputStream(new ByteArrayInputStream(compressed));
+                 ByteArrayOutputStream output = new ByteArrayOutputStream()) {
+                byte[] buffer = new byte[2048];
+                int count;
+                while ((count = input.read(buffer)) != -1) {
+                    if (output.size() + count > MAX_MESSAGE_BYTES) {
+                        return null;
+                    }
+                    output.write(buffer, 0, count);
+                }
+                return new String(output.toByteArray(), StandardCharsets.UTF_8);
+            }
+        } catch (Exception invalidMessage) {
+            return null;
+        }
+    }
 }

package/android/src/main/java/cn/jpush/android/local/ActionHelper.java

@@ -16,6 +16,7 @@ import cn.jiguang.core.JCoreWireCodec;
 import cn.jpush.android.api.CmdMessage;
 import cn.jpush.android.api.CustomMessage;
 import cn.jpush.android.api.JPushInterface;
+import cn.jpush.android.api.JThirdPlatFormInterface;
 import cn.jpush.android.api.JPushMessage;
 import cn.jpush.android.api.NotificationCustomButton;
 import cn.jpush.android.api.NotificationMessage;
@@ -111,6 +112,64 @@ public class ActionHelper {
     }
 
     public void doAction(Context context, String action, Object data) {
+        if (!(data instanceof Bundle) || JCoreStorage.isPushStopped(context) || !JCoreStorage.isCollectionAuth(context)) {
+            return;
+        }
+        Bundle bundle = (Bundle) data;
+        if ("third_action".equals(action)) {
+            action = bundle.getString("third_key_action", "");
+        }
+        if (JThirdPlatFormInterface.ACTION_REGISTER_TOKEN.equals(action)) {
+            String token = bundle.getString("token", "");
+            byte platform = bundle.getByte("platform", (byte) 8);
+            if (platform == 8 && !token.isEmpty()) {
+                setThirdTokenWithCallBack(context, token, platform, false);
+            }
+            return;
+        }
+        if (JThirdPlatFormInterface.ACTION_SEND_EXCEPTION.equals(action)) {
+            cn.jiguang.plugins.push.common.JLogger.w("FCM plugin reported an error");
+            return;
+        }
+        String raw = bundle.getString("data", bundle.getString("JMessageExtra", ""));
+        String decoded = JThirdPlatFormInterface.decodeMessageJson(raw);
+        if (decoded == null) {
+            return;
+        }
+        NotificationMessage message = JThirdPlatFormInterface.parseMessage(context, decoded);
+        if (message.msgId == null || message.msgId.isEmpty()) {
+            return;
+        }
+        message.notificationId = bundle.getInt("noti_id", message.notificationId);
+        if (JThirdPlatFormInterface.ACTION_PLUGIN_PALTFORM_ON_MESSAGING.equals(action)) {
+            try {
+                JSONObject json = new JSONObject(decoded);
+                if (json.has("message") && message.notificationContent.isEmpty()) {
+                    CustomMessage custom = new CustomMessage();
+                    custom.messageId = message.msgId;
+                    custom.message = json.optString("message", "");
+                    custom.title = message.notificationTitle;
+                    custom.extra = message.notificationExtras;
+                    custom.contentType = json.optString("content_type", "");
+                    custom.platform = 8;
+                    dispatchCustomMessageEvent(context, custom);
+                } else {
+                    if ("0".equals(message.displayForeground)) {
+                        return;
+                    }
+                    postSystemNotification(context, message);
+                    dispatchNotificationEvent(context, "notify_arrived", message);
+                }
+            } catch (Exception invalidMessage) {
+                cn.jiguang.plugins.push.common.JLogger.w("FCM payload rejected");
+            }
+        } else if (JThirdPlatFormInterface.ACTION_NOTIFICATION_ARRIVED.equals(action)) {
+            recordNotificationPosted(context, message.notificationId);
+            dispatchNotificationEvent(context, "notify_arrived", message);
+        } else if (JThirdPlatFormInterface.ACTION_NOTIFICATION_CLCKED.equals(action)) {
+            dispatchNotificationEvent(context, "notify_opened", message);
+            broadcastNotificationOpened(context, message);
+        }
     }
 
     public void doSingleAction(Context context, String action, Object data) {
@@ -148,10 +207,29 @@ public class ActionHelper {
                 return;
             }
             Serializable msg = intent.getSerializableExtra("multi_notification_msg");
+            boolean fcmClick = !(msg instanceof NotificationMessage) && intent.hasExtra("JMessageExtra");
+            if (fcmClick) {
+                if (JCoreStorage.isPushStopped(context) || !JCoreStorage.isCollectionAuth(context)) {
+                    return;
+                }
+                NotificationMessage message = JThirdPlatFormInterface.parseMessage(context, intent.getStringExtra("JMessageExtra"));
+                if (message.msgId == null || message.msgId.isEmpty()) {
+                    return;
+                }
+                msg = message;
+            }
             if (msg instanceof NotificationMessage) {
                 NotificationMessage notificationMessage = (NotificationMessage) msg;
                 dispatchNotificationEvent(context, "notify_opened", notificationMessage);
                 broadcastNotificationOpened(context, notificationMessage);
+                if (fcmClick || notificationMessage.platform == 8) {
+                    android.content.pm.PackageManager manager = context.getPackageManager();
+                    Intent launcher = manager != null ? manager.getLaunchIntentForPackage(appPkg) : null;
+                    if (launcher != null) {
+                        launcher.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_SINGLE_TOP);
+                        context.startActivity(launcher);
+                    }
+                }
             }
         } catch (Throwable ignored) {
         }
@@ -897,6 +975,7 @@ public class ActionHelper {
                     if (statusCode == 0) {
                         JCoreStorage.saveThirdToken(context, platform, unbind ? "" : token);
                     }
+                    cn.jiguang.plugins.push.common.JLogger.i("Third token result platform=" + platform + " code=" + statusCode);
                     Intent intent = buildBaseReceiverIntent(context, "cmd_result", 0, statusCode);
                     intent.putExtra("cmd", 10000);
                     intent.putExtra("msg", unbind ? "unbind" : "bind");

package/android/src/main/java/cn/jpush/android/service/JPushMessageReceiver.java

@@ -10,6 +10,7 @@ import cn.jpush.android.api.JPushMessage;
 import cn.jpush.android.api.NotificationCustomButton;
 import cn.jpush.android.api.NotificationMessage;
 import cn.jpush.android.local.ActionHelper;
+import cn.jiguang.core.JCoreStorage;
 
 public abstract class JPushMessageReceiver extends BroadcastReceiver {
     @Override
@@ -74,7 +75,7 @@ public abstract class JPushMessageReceiver extends BroadcastReceiver {
     }
 
     public boolean isNeedShowNotification(Context context, NotificationMessage notificationMessage, String processName) {
-        return true;
+        return !JCoreStorage.isPushStopped(context) && JCoreStorage.isCollectionAuth(context);
     }
 
     public void onInAppMessageShow(Context context, NotificationMessage notificationMessage) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/react-native-jpush",
-  "version": "6.7.0-alpha.435",
+  "version": "6.7.0-alpha.436",
   "description": "Clean-room JPush and JCore React Native Nitro module for OneKey",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",
@@ -24,6 +24,7 @@
     "react-native.config.js",
     "!ios/build",
     "!android/build",
+    "!android/fcm/build",
     "!android/gradle",
     "!android/gradlew",
     "!android/gradlew.bat",
@@ -93,7 +94,7 @@
     "typescript": "^5.9.2"
   },
   "peerDependencies": {
-    "@onekeyfe/react-native-native-logger": "6.7.0-alpha.435",
+    "@onekeyfe/react-native-native-logger": "6.7.0-alpha.436",
     "react": "*",
     "react-native": "*",
     "react-native-nitro-modules": "0.37.0"