@onekeyfe/react-native-jpush 6.7.0-alpha.449 → 6.7.0-alpha.466

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

@@ -656,6 +656,7 @@ public final class JCoreWireCodec {
                     return clientDecoded;
                 }
             }
+            if ((flag & 1) != 0 && decrypted.length == 0) return null;
             body = decrypted;
         }
 

package/android/src/main/java/cn/jiguang/plugins/core/JCoreModule.java

@@ -26,13 +26,24 @@ import cn.jiguang.plugins.push.JPushModule;
 
 public class JCoreModule extends ReactContextBaseJavaModule {
 
-    public static ReactApplicationContext reactContext;
+    public static volatile ReactApplicationContext reactContext;
+    private boolean invalidated;
 
 
     public JCoreModule(ReactApplicationContext reactApplicationContext) {
         super(reactApplicationContext);
         reactContext = reactApplicationContext;
-        JPushModule.registerReactContext(reactApplicationContext);
+        JPushModule.retainReactContext(reactApplicationContext);
+    }
+
+    @Override
+    public void invalidate() {
+        synchronized (this) {
+            if (invalidated) return;
+            invalidated = true;
+        }
+        JPushModule.releaseReactContext(getReactApplicationContext());
+        super.invalidate();
     }
 
     @Override

package/android/src/main/java/cn/jiguang/plugins/push/JPushModule.java

@@ -26,6 +26,7 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Set;
+import java.util.Map;
 import java.util.concurrent.CopyOnWriteArraySet;
 import java.lang.*;
 
@@ -40,10 +41,13 @@ import cn.jpush.android.data.JPushLocalNotification;
 
 public class JPushModule extends ReactContextBaseJavaModule {
 
-    public static ReactApplicationContext reactContext;
+    public static volatile ReactApplicationContext reactContext;
     private static final Set<ReactApplicationContext> ACTIVE_CONTEXTS =
         new CopyOnWriteArraySet<ReactApplicationContext>();
 
+    private static final Map<ReactApplicationContext, Integer> CONTEXT_OWNERS = new HashMap<ReactApplicationContext, Integer>();
+    private boolean invalidated;
+
     public static boolean isAppForeground = false;
 
     public static void registerReactContext(ReactApplicationContext ctx) {
@@ -56,11 +60,33 @@ public class JPushModule extends ReactContextBaseJavaModule {
         }
     }
 
+    public static void retainReactContext(ReactApplicationContext ctx) {
+        if (ctx == null) return;
+        synchronized (CONTEXT_OWNERS) {
+            Integer count = CONTEXT_OWNERS.get(ctx);
+            CONTEXT_OWNERS.put(ctx, count == null ? 1 : count + 1);
+        }
+        registerReactContext(ctx);
+    }
+
+    public static void releaseReactContext(ReactApplicationContext ctx) {
+        if (ctx == null) return;
+        synchronized (CONTEXT_OWNERS) {
+            Integer count = CONTEXT_OWNERS.get(ctx);
+            if (count != null && count > 1) { CONTEXT_OWNERS.put(ctx, count - 1); return; }
+            CONTEXT_OWNERS.remove(ctx);
+            ACTIVE_CONTEXTS.remove(ctx);
+            if (reactContext == ctx) reactContext = ACTIVE_CONTEXTS.isEmpty() ? null : ACTIVE_CONTEXTS.iterator().next();
+            if (cn.jiguang.plugins.core.JCoreModule.reactContext == ctx) cn.jiguang.plugins.core.JCoreModule.reactContext = reactContext;
+        }
+    }
+
     public static Set<ReactApplicationContext> getActiveReactContexts() {
         return Collections.unmodifiableSet(ACTIVE_CONTEXTS);
     }
 
     public static void clearActiveReactContexts() {
+        synchronized (CONTEXT_OWNERS) { CONTEXT_OWNERS.clear(); }
         ACTIVE_CONTEXTS.clear();
         reactContext = null;
     }
@@ -68,7 +94,17 @@ public class JPushModule extends ReactContextBaseJavaModule {
     public JPushModule(ReactApplicationContext reactApplicationContext) {
         super(reactApplicationContext);
         reactContext = reactApplicationContext;
-        registerReactContext(reactApplicationContext);
+        retainReactContext(reactApplicationContext);
+    }
+
+    @Override
+    public void invalidate() {
+        synchronized (this) {
+            if (invalidated) return;
+            invalidated = true;
+        }
+        releaseReactContext(getReactApplicationContext());
+        super.invalidate();
     }
 
     @Override

package/android/src/main/java/cn/jiguang/plugins/push/helper/JPushHelper.java

@@ -26,6 +26,7 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.atomic.AtomicInteger;
 
+import cn.jiguang.core.JCoreStorage;
 import cn.jiguang.plugins.push.JPushModule;
 import cn.jiguang.plugins.push.common.JConstants;
 import cn.jiguang.plugins.push.common.JLogger;
@@ -42,16 +43,19 @@ public class JPushHelper {
 
     private static final class PendingEvent {
         final String eventName;
+        final long contentGeneration;
         final WritableMap params;
         final Map<String, Object> mapParams;
 
-        PendingEvent(String eventName, WritableMap params) {
+        PendingEvent(String eventName, WritableMap params, long contentGeneration) {
+            this.contentGeneration = contentGeneration;
             this.eventName = eventName;
             this.params = params;
             this.mapParams = null;
         }
 
-        PendingEvent(String eventName, Map<String, Object> mapParams) {
+        PendingEvent(String eventName, Map<String, Object> mapParams, long contentGeneration) {
+            this.contentGeneration = contentGeneration;
             this.eventName = eventName;
             this.params = null;
             this.mapParams = mapParams != null
@@ -62,9 +66,11 @@ public class JPushHelper {
 
     private static final class PendingNitroEvent {
         final String eventName;
+        final long contentGeneration;
         final String payloadJson;
 
-        PendingNitroEvent(String eventName, String payloadJson) {
+        PendingNitroEvent(String eventName, String payloadJson, long contentGeneration) {
+            this.contentGeneration = contentGeneration;
             this.eventName = eventName;
             this.payloadJson = payloadJson;
         }
@@ -121,6 +127,20 @@ public class JPushHelper {
         return s == null || s.length() == 0;
     }
 
+    private static boolean isContentEvent(String eventName) {
+        return JConstants.NOTIFICATION_EVENT.equals(eventName)
+            || JConstants.LOCAL_NOTIFICATION_EVENT.equals(eventName)
+            || JConstants.CUSTOM_MESSAGE_EVENT.equals(eventName)
+            || JConstants.INAPP_MESSAGE_EVENT.equals(eventName)
+            || JConstants.NOTIFY_BUTTON_CLICK_EVENT.equals(eventName);
+    }
+
+    private static boolean canDeliver(String eventName, long contentGeneration) {
+        Context context = JCoreStorage.getAppContext(null);
+        return !isContentEvent(eventName) || (contentGeneration == JCoreStorage.getContentGeneration()
+            && JCoreStorage.isCollectionAuth(context) && !JCoreStorage.isPushStopped(context));
+    }
+
     public static void flushPendingNitroEvents() {
         if (PENDING_NITRO_EVENTS.isEmpty() || NITRO_LISTENERS.isEmpty()) {
             return;
@@ -131,8 +151,9 @@ public class JPushHelper {
             if (pending == null || isEmpty(pending.eventName)) {
                 continue;
             }
-            for (NitroEventListener listener : NITRO_LISTENERS.values()) {
-                if (listener != null) {
+            for (Map.Entry<Integer, NitroEventListener> entry : NITRO_LISTENERS.entrySet()) {
+                NitroEventListener listener = entry.getValue();
+                if (listener != null && NITRO_LISTENERS.get(entry.getKey()) == listener && canDeliver(pending.eventName, pending.contentGeneration)) {
                     try {
                         listener.onEvent(pending.eventName, pending.payloadJson);
                     } catch (Throwable inner) {
@@ -166,6 +187,8 @@ public class JPushHelper {
                     }
                 }
                 for (ReactApplicationContext ctx : targets) {
+                    if (!canDeliver(pending.eventName, pending.contentGeneration)) break;
+                    if (!getTargetContexts().contains(ctx)) continue;
                     try {
                         WritableMap payload = (total > 1 && index > 0)
                             ? cloneWritableMap(baseWritable)
@@ -182,14 +205,16 @@ public class JPushHelper {
     }
 
     public static void sendEventMap(String eventName, Map<String, Object> params) {
-        if (isEmpty(eventName)) {
+        long contentGeneration = JCoreStorage.getContentGeneration();
+        if (isEmpty(eventName) || !canDeliver(eventName, contentGeneration)) {
             return;
         }
         try {
             String payloadJson = mapToJsonString(params);
             if (!NITRO_LISTENERS.isEmpty()) {
-                for (NitroEventListener listener : NITRO_LISTENERS.values()) {
-                    if (listener != null) {
+                for (Map.Entry<Integer, NitroEventListener> entry : NITRO_LISTENERS.entrySet()) {
+                    NitroEventListener listener = entry.getValue();
+                    if (listener != null && NITRO_LISTENERS.get(entry.getKey()) == listener && canDeliver(eventName, contentGeneration)) {
                         try {
                             listener.onEvent(eventName, payloadJson);
                         } catch (Throwable inner) {
@@ -201,7 +226,7 @@ public class JPushHelper {
                 if (PENDING_NITRO_EVENTS.size() >= 64) {
                     PENDING_NITRO_EVENTS.remove(0);
                 }
-                PENDING_NITRO_EVENTS.add(new PendingNitroEvent(eventName, payloadJson));
+                PENDING_NITRO_EVENTS.add(new PendingNitroEvent(eventName, payloadJson, contentGeneration));
             }
 
             Set<ReactApplicationContext> targets = getTargetContexts();
@@ -214,6 +239,8 @@ public class JPushHelper {
                     int index = 0;
                     int total = targets.size();
                     for (ReactApplicationContext ctx : targets) {
+                        if (!canDeliver(eventName, contentGeneration)) break;
+                        if (!getTargetContexts().contains(ctx)) continue;
                         WritableMap payload = (total > 1 && index > 0) ? cloneWritableMap(writable) : writable;
                         index++;
                         ctx.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class).emit(eventName, payload);
@@ -226,7 +253,7 @@ public class JPushHelper {
                 if (PENDING_EVENTS.size() >= 64) {
                     PENDING_EVENTS.remove(0);
                 }
-                PENDING_EVENTS.add(new PendingEvent(eventName, params));
+                PENDING_EVENTS.add(new PendingEvent(eventName, params, contentGeneration));
             }
         } catch (Throwable throwable) {
             JLogger.e("sendEventMap error:" + throwable.getMessage());
@@ -250,14 +277,16 @@ public class JPushHelper {
     }
 
     public static void sendEvent(String eventName, WritableMap params) {
-        if (isEmpty(eventName)) {
+        long contentGeneration = JCoreStorage.getContentGeneration();
+        if (isEmpty(eventName) || !canDeliver(eventName, contentGeneration)) {
             return;
         }
         try {
             String payloadJson = readableMapToJsonObject(params).toString();
             if (!NITRO_LISTENERS.isEmpty()) {
-                for (NitroEventListener listener : NITRO_LISTENERS.values()) {
-                    if (listener != null) {
+                for (Map.Entry<Integer, NitroEventListener> entry : NITRO_LISTENERS.entrySet()) {
+                    NitroEventListener listener = entry.getValue();
+                    if (listener != null && NITRO_LISTENERS.get(entry.getKey()) == listener && canDeliver(eventName, contentGeneration)) {
                         try {
                             listener.onEvent(eventName, payloadJson);
                         } catch (Throwable inner) {
@@ -269,7 +298,7 @@ public class JPushHelper {
                 if (PENDING_NITRO_EVENTS.size() >= 64) {
                     PENDING_NITRO_EVENTS.remove(0);
                 }
-                PENDING_NITRO_EVENTS.add(new PendingNitroEvent(eventName, payloadJson));
+                PENDING_NITRO_EVENTS.add(new PendingNitroEvent(eventName, payloadJson, contentGeneration));
             }
 
             Set<ReactApplicationContext> targets = getTargetContexts();
@@ -277,6 +306,8 @@ public class JPushHelper {
             int index = 0;
             int total = targets.size();
             for (ReactApplicationContext ctx : targets) {
+                if (!canDeliver(eventName, contentGeneration)) break;
+                if (!getTargetContexts().contains(ctx)) continue;
                 try {
                     WritableMap payload = (total > 1 && index > 0) ? cloneWritableMap(params) : params;
                     index++;
@@ -291,7 +322,7 @@ public class JPushHelper {
                 if (PENDING_EVENTS.size() >= 64) {
                     PENDING_EVENTS.remove(0);
                 }
-                PENDING_EVENTS.add(new PendingEvent(eventName, cloneWritableMap(params)));
+                PENDING_EVENTS.add(new PendingEvent(eventName, cloneWritableMap(params), contentGeneration));
             }
         } catch (Throwable throwable) {
             JLogger.e("sendEvent error:" + throwable.getMessage());

package/android/src/main/java/cn/jiguang/plugins/push/receiver/JPushModuleReceiver.java

@@ -88,9 +88,6 @@ public class JPushModuleReceiver extends JPushMessageReceiver {
               + notificationMessage.notificationId
       );
     }
-    if (!JPushModule.isAppForeground) {
-      JPushHelper.launchApp(context);
-    }
     Map<String, Object> map = JPushHelper.convertNotificationToMapObject(JConstants.NOTIFICATION_OPENED, notificationMessage);
     if (notificationMessage != null && notificationMessage.notificationType == 1) {
       JPushHelper.sendEventMap(JConstants.LOCAL_NOTIFICATION_EVENT, map);

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

@@ -98,7 +98,6 @@ public class JPushInterface {
 
     public static void stopPush(Context context) {
         JCoreStorage.setPushStopped(context, true);
-        ActionHelper.getInstance().setPushStatusWithCallBack(context, 4, 0);
         JCoreTcpEngine.getInstance().stop(context);
     }