Merge pull request #105 from channel-io/develop

0.7.11

Author: zoyi-jin

.gitignore

@@ -45,6 +45,9 @@ local.properties
 .classpath
 .vscode
 
+# JetBrains Fleet
+.fleet
+
 # BUCK
 buck-out/
 \.buckd/

CHANGELOG.md

@@ -1,3 +1,8 @@
+# 0.7.11
+
+## Update
+* support android channel-io 10.0.8
+
 # 0.7.10
 
 ## Update

android/build.gradle

@@ -55,5 +55,5 @@ repositories {
 
 dependencies {
     implementation 'com.facebook.react:react-native'
-    api 'io.channel:plugin-android:10.0.7'
+    api 'io.channel:plugin-android:10.0.8'
 }

android/src/main/java/com/zoyi/channel/rn/Const.java

@@ -8,6 +8,8 @@ public class Const {
 
   public static final String MODULE_NAME = "RNChannelIO";
 
+  public static final String USER = "user";
+
   public static final String KEY_PLUGIN_KEY = "pluginKey";
   public static final String KEY_MEMBER_ID = "memberId";
   public static final String KEY_MEMBER_HASH = "memberHash";
@@ -59,6 +61,7 @@ public class Const {
   // Event
   public static final String KEY_EVENT = "Event";
 
+  public static final String KEY_EVENT_USER_ID = "userId";
   public static final String KEY_EVENT_CHAT_ID = "chatId";
   public static final String KEY_EVENT_COUNT = "count";
   public static final String KEY_EVENT_URL = "url";
@@ -72,6 +75,7 @@ public class Const {
   public static final String KEY_ON_CHAT_CREATED = "ON_CHAT_CREATED";
   public static final String KEY_ON_URL_CLICKED = "ON_URL_CLICKED";
   public static final String KEY_ON_PRE_URL_CLICKED = "ON_PRE_URL_CLICKED";
+  public static final String KEY_ON_PUSH_NOTIFICATION_CLICKED = "ON_PUSH_NOTIFICATION_CLICKED";
 
   public static final String EVENT_ON_BADGE_CHANGED = "ChannelIO:Event:OnBadgeChanged";
   public static final String EVENT_ON_FOLLOW_UP_CHANGED = "ChannelIO:Event:OnFollowUpChanged";
@@ -81,4 +85,10 @@ public class Const {
   public static final String EVENT_ON_CHAT_CREATED = "ChannelIO:Event:OnChatCreated";
   public static final String EVENT_ON_URL_CLICKED = "ChannelIO:Event:OnUrlClicked";
   public static final String EVENT_ON_PRE_URL_CLICKED = "ChannelIO:Event:OnPreUrlClicked";
+  public static final String EVENT_ON_PUSH_NOTIFICATION_CLICKED = "ChannelIO:Event:OnPushNotificationClicked";
+
+  // Extra
+  public static final String EXTRA_CHAT_ID = "chatId";
+  public static final String EXTRA_PERSON_TYPE = "personType";
+  public static final String EXTRA_PERSON_ID = "personId";
 }

android/src/main/java/com/zoyi/channel/rn/RNChannelIO.java

@@ -2,11 +2,13 @@
 
 import android.app.Activity;
 import android.content.Context;
+import android.content.Intent;
 
 import androidx.annotation.Nullable;
 
 import com.facebook.react.bridge.*;
 import com.zoyi.channel.plugin.android.ChannelIO;
+import com.zoyi.channel.plugin.android.global.PrefSupervisor;
 import com.zoyi.channel.plugin.android.open.callback.BootCallback;
 import com.zoyi.channel.plugin.android.open.callback.UserUpdateCallback;
 import com.zoyi.channel.plugin.android.open.enumerate.BootStatus;
@@ -22,6 +24,8 @@ public class RNChannelIO extends ReactContextBaseJavaModule implements ChannelPl
 
   private ReactContext reactContext;
 
+  private boolean hasPushNotificationClickSubscriber = false;
+
   public RNChannelIO(ReactApplicationContext reactContext) {
     super(reactContext);
     this.reactContext = reactContext;
@@ -46,6 +50,7 @@ public Map<String, Object> getConstants() {
     eventMap.put(Const.KEY_ON_FOLLOW_UP_CHANGED, Const.EVENT_ON_FOLLOW_UP_CHANGED);
     eventMap.put(Const.KEY_ON_URL_CLICKED, Const.EVENT_ON_URL_CLICKED);
     eventMap.put(Const.KEY_ON_PRE_URL_CLICKED, Const.EVENT_ON_PRE_URL_CLICKED);
+    eventMap.put(Const.KEY_ON_PUSH_NOTIFICATION_CLICKED, Const.EVENT_ON_PUSH_NOTIFICATION_CLICKED);
 
     constants.put(Const.KEY_EVENT, eventMap);
 
@@ -240,9 +245,29 @@ public boolean onUrlClicked(String url) {
     return true;
   }
 
+  @ReactMethod
+  public void notifyPushNotificationClickSubscriberExistence(boolean hasPushNotificationClickSubscriber) {
+    this.hasPushNotificationClickSubscriber = hasPushNotificationClickSubscriber;
+  }
+
   @Override
-  public boolean onPushNotificationClicked(String chatId) {
-    return false;
+  public boolean onPushNotificationClicked(final String chatId) {
+    if (!hasPushNotificationClickSubscriber) { return false; }
+
+    // `PrefSupervisor` is an internal class that does not provide compatibility promise between SDK versions
+    //   -- avoid using it in third party libraries whenever possible as it may break at any time
+    final String userId = PrefSupervisor.getLatestPushUserId(getCurrentActivity());
+    if (userId == null) { return false; }
+
+    Utils.sendEvent(
+            reactContext,
+            Const.EVENT_ON_PUSH_NOTIFICATION_CLICKED,
+            ParseUtils.toWritableMap(new HashMap<String, Object>() {{
+              put(Const.KEY_USER_ID, userId);
+              put(Const.KEY_CHAT_ID, chatId);
+            }})
+    );
+    return true; // defer push notification click handling -- the JavaScript code will call `performDefaultPushNotificationClickAction` if needed.
   }
 
   @Override
@@ -259,6 +284,37 @@ public void handleUrlClicked(@Nullable String url) {
     }
   }
 
+  @ReactMethod
+  public void performDefaultPushNotificationClickAction(String userId, String chatId) {
+    if (reactContext == null) { return; }
+    final Context context = reactContext.getApplicationContext();
+
+    final Intent intent = reconstructHostAppIntent(userId, chatId);
+    if (intent == null) { return; }
+
+    context.startActivity(intent);
+  }
+
+  private Intent reconstructHostAppIntent(String userId, String chatId) {
+    // Channel Android SDK does not provide listeners a host app intent that the SDK prepared to
+    // launch when onPushNotificationClicked() returns false. So "reconstruct" a new one to
+    // emulate the default handling behavior of onPushNotificationClicked().
+
+    if (reactContext == null) { return null; }
+    Context context = reactContext.getApplicationContext();
+
+    Intent intent = context.getPackageManager().getLaunchIntentForPackage(context.getPackageName());
+    if (intent == null) { return null; }
+
+    intent.addCategory(Intent.CATEGORY_LAUNCHER);
+    // EXTRA_CHANNEL_ID is deliberately omitted because it is not used.
+    intent.putExtra(Const.EXTRA_PERSON_TYPE, Const.USER);
+    intent.putExtra(Const.EXTRA_PERSON_ID, userId);
+    intent.putExtra(Const.EXTRA_CHAT_ID, chatId);
+
+    return intent;
+  }
+
   @ReactMethod
   public void setPage(@Nullable String page) {
     ChannelIO.setPage(page);

index.js

@@ -369,6 +369,31 @@ export const ChannelIO = {
     }
   },
 
+  /**
+   * Event listener that triggers when user clicks a system push notification.
+   * Note that the callback only works on Android. A call to this method on an iOS
+   *  environment will be silently ignored.
+   *
+   * @param {Function} cb a callback function
+   */
+  onPushNotificationClicked: (cb) => {
+    if (Platform.OS !== 'android') { return }
+
+    if (cb) {
+      const subscription = ChannelEventEmitter.addListener(ChannelModule.Event.ON_PUSH_NOTIFICATION_CLICKED, data => {
+        const next = () => ChannelModule.performDefaultPushNotificationClickAction(data.userId, data.chatId);
+
+        cb(data.chatId, next);
+      });
+
+      ChannelModule.notifyPushNotificationClickSubscriberExistence(true);
+      replaceSubscriber(ChannelModule.Event.ON_PUSH_NOTIFICATION_CLICKED, subscription);
+    } else {
+      ChannelModule.notifyPushNotificationClickSubscriberExistence(false);
+      replaceSubscriber(ChannelModule.Event.ON_PUSH_NOTIFICATION_CLICKED, null);
+    }
+  },
+
   /**
    * @deprecated
    * Event listener that triggers when `ChannelIO` messenger is about to display

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-channel-plugin",
-  "version": "0.7.10",
+  "version": "0.7.11",
   "description": "react native module for channel io",
   "main": "index.js",
   "scripts": {