reactnative-plugin-appice 1.7.45 → 1.7.47

package/android/src/main/java/com/appice/react/AppICEUtils.java

@@ -25,6 +25,7 @@ import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 
 import org.json.JSONArray;
@@ -35,6 +36,7 @@ import semusi.context.counthandler.CampaignActionListener;
 import semusi.context.ui.appInbox.AppICEInboxMessage;
 
 import semusi.context.utility.Utility;
+import semusi.model.campaign.Action;
 import semusi.model.campaign.Campaign;
 import semusi.model.user.User;
 import semusi.ruleengine.pushmanager.NotificationClickHandler;
@@ -54,8 +56,6 @@ public class AppICEUtils {
     }
 
 
-    // removed old logic that became overcomplicated with AI. later on when I reworked think 
-    //of using different approach which flushevent when flag got updated
     protected static void flushEventQueue(ReactApplicationContext ctx) {
         if (!isDeviceReadyFlag || pendingEventQueue.isEmpty()) {
             printLog("ActionPushDebug flushEventQueue", "Nothing to flush. flag=" + isDeviceReadyFlag + " queueSize=" + pendingEventQueue.size());
@@ -170,8 +170,22 @@ public class AppICEUtils {
                 inboxObject.putString(EnumConstants.INBOX_MESSAGE.getValue(), inboxMessage.getMessageBody());
                 inboxObject.putString(EnumConstants.INBOX_MESSAGE_ICON.getValue(), inboxMessage.getMessageIcon());
                 inboxObject.putMap(EnumConstants.INBOX_CUSTOM_DATA.getValue(), toWritableMap(inboxMessage.getCustomData()));
+                inboxObject.putString(EnumConstants.INBOX_EXPANDED_IMAGE.getValue(), inboxMessage.getExpandedImage());
+                List<Action> actionList = inboxMessage.getActions();
+                if (actionList !=null && !actionList.isEmpty()){
+                    ArrayList<String> actionArray = new ArrayList<>();
+                    for (int i = 0; i < actionList.size(); i++) {
+                        Action action = actionList.get(i);
+                        if (action !=null) {
+                            actionArray.add(action.toJson().toString());
+                        }
+                    }
+                    WritableArray writableArray = toWritableArray(actionArray);
+                    inboxObject.putArray(EnumConstants.INBOX_ACTIONS.getValue(), writableArray);
+                }
             }
         } catch (Throwable throwable) {
+            Utility.loginfo("exception in convertClassToWritableMap "+throwable);
         }
         return inboxObject;
     }
@@ -499,42 +513,28 @@ public class AppICEUtils {
         }
     }
 
-    // this function will handle both normal push and action button push.
-    // through listner user will identify.
     public static void handleClickOnPush(Intent intent, Context context) {
         try {
             if (intent != null) {
                 if (intent.getExtras() != null) {
                     Bundle bundle = intent.getExtras();
-                    boolean isAppICEPush = bundle.getBoolean("ai_push", false);
-                    if (isAppICEPush) {
-                        CampaignCampsReceiver campsReceiver = new CampaignCampsReceiver();
-                        campsReceiver.sendCallback(bundle, context);
-                        intent.removeExtra("ai_push");
-                    }else {
-                        NotificationClickHandler.handleClickCallback(intent, context, new CampaignActionListener() {
-                            @Override
-                            public void onActionButtonClicked(Campaign campaign) {
-                                WritableMap params = Arguments.createMap();
-                                JSONObject campaignJson = campaign.toJson();
-
-                                if (campaignJson != null && campaignJson.length() > 0) {
-                                    String campaignStr = campaignJson.toString();
-                                    params.putString(EnumConstants.APPICE_PUSH_NOTIFICATION_ACTION_BUTTON_CLICKED.getValue(), campaignStr);
-
-                                    printLog("ActionPushDebug onActionButtonClicked", "action button clicked | campaign: " + campaignStr);
-                                    printLog("ActionPushDebug onActionButtonClicked", "isDeviceReadyFlag: " + isDeviceReadyFlag);
-                                    printLog("ActionPushDebug onActionButtonClicked", "queue size before send: " + pendingEventQueue.size());
-
-                                    AppIceReactPluginModule.sendEvent(EnumConstants.APPICE_PUSH_NOTIFICATION_ACTION_BUTTON_CLICKED.getValue(), params);
-
-                                    printLog("ActionPushDebug onActionButtonClicked", "queue size after send: " + pendingEventQueue.size());
-                                } else {
-                                    printLog("ActionPushDebug onActionButtonClicked", "campaignJson is null or empty — event NOT sent");
-                                }
-                            }
-                        });
-                    }
+                    if (bundle != null) {
+
+                        NotificationClickHandler pushClickData = NotificationClickHandler.fromBundle(bundle);
+                        String payload = pushClickData.getPayload();
+
+                        int pos = bundle.getInt("pos", -1);
+                        int notificationId = bundle.getInt("n", 0);
+
+                        if (pos == -1) {
+                            CampaignCampsReceiver campsReceiver = new CampaignCampsReceiver();
+                            campsReceiver.sendCallback(bundle, context);
+                            intent.removeExtra("pos");
+                        } else {
+                            handleActionClick(payload, notificationId, intent, pushClickData, pos, context);
+                        }
+                    }else
+                        printLog("ActionPushDebug", " | bundle is null ");
                 }
             } else
                 printLog("ActionPushDebug", " | intent is null ");
@@ -542,4 +542,89 @@ public class AppICEUtils {
             printLog("ActionPushDebug"," | exception in null ");
         }
     }
+
+    private static void handleActionClick(String aiContent, int notificationId, Intent intent, NotificationClickHandler pushClickData, int pos, Context context) {
+        if (aiContent == null || aiContent.isEmpty()) {
+            return;
+        }
+        try {
+            JSONObject payloadJson = new JSONObject(aiContent);
+            payloadJson.put("notificationId", notificationId);
+            payloadJson.put("selectedIndex", pos);
+            Campaign campaign = ContextSdk.handlePush(payloadJson.toString(), context);
+            Action selectedAction = campaign != null ? campaign.getSelectedAction() : null;
+            if (selectedAction != null) {
+                payloadJson.put("selectedAction", selectedAction.toJson());
+            } else {
+                ContextSdk.pushNotificationClicked(payloadJson.toString(), context);
+            }
+            handleCampaignAction(campaign,context);
+            pushClickData.deleteKeyFromIntent(intent, NotificationClickHandler.K_PAYLOAD);
+        } catch (Exception e) {
+            printLog("ActionPushDebug","Action button: action click failed - " + e.getMessage());
+        }
+    }
+
+    private static void handleCampaignAction(Campaign campaign, Context context) {
+        if (campaign == null) {
+            printLog("ActionPushDebug","Action button: campaign is null");
+            return;
+        }
+
+        try {
+            Action selectedAction = campaign.getSelectedAction();
+            if (selectedAction == null) {
+                printLog("ActionPushDebug","Action button: selectedAction is null");
+                return;
+            }
+            String actionType = selectedAction.getActionType() != null ? selectedAction.getActionType().toLowerCase(Locale.ROOT) : null;
+            String actionContent = selectedAction.getActionContent();
+            String actionTitle = selectedAction.getActionTitle();
+            String actionURL = selectedAction.getActionUrl();
+
+            printLog("ActionPushDebug","Action button clicked - type: " + actionType + ", title: " + actionTitle);
+
+            if (actionType == null) {
+                printLog("ActionPushDebug","Action button: action type is null");
+                return;
+            }
+
+            switch (actionType) {
+                case "lp":
+                    Utility.openExternalLinkUrl(actionURL, context);
+                    break;
+                case "dl":
+                    Utility.openDeepLinkUrl(actionURL, context);
+                    break;
+                case "cp":
+                    ContextSdk.copyToClipboard(actionContent, context);
+                    break;
+                case "sh":
+                    ContextSdk.shareActionContent(actionContent, actionContent, context);
+                    break;
+                case "cus":
+                    WritableMap params = Arguments.createMap();
+                    JSONObject campaignJson = campaign.toJson();
+                    if (campaignJson != null && campaignJson.length() > 0) {
+                        String campaignStr = campaignJson.toString();
+                        params.putString(EnumConstants.APPICE_PUSH_NOTIFICATION_ACTION_BUTTON_CLICKED.getValue(), campaignStr);
+
+                        printLog("ActionPushDebug onActionButtonClicked", "action button clicked | campaign: " + campaignStr);
+                        printLog("ActionPushDebug onActionButtonClicked", "isDeviceReadyFlag: " + isDeviceReadyFlag);
+                        printLog("ActionPushDebug onActionButtonClicked", "queue size before send: " + pendingEventQueue.size());
+                        AppIceReactPluginModule.sendEvent(EnumConstants.APPICE_PUSH_NOTIFICATION_ACTION_BUTTON_CLICKED.getValue(), params);
+                        printLog("ActionPushDebug onActionButtonClicked", "queue size after send: " + pendingEventQueue.size());
+                    } else {
+                        printLog("ActionPushDebug onActionButtonClicked", "campaignJson is null or empty — event NOT sent");
+                    }
+                    break;
+                default:
+                    printLog("ActionPushDebug","Action button: unknown action type - " + actionType);
+                    break;
+            }
+
+        } catch (Exception e) {
+            printLog("ActionPushDebug","Action button: handleCampaignAction failed - " + e.getMessage());
+        }
+    }
 }

package/android/src/main/java/com/appice/react/CampaignCampsReceiver.java

@@ -45,7 +45,10 @@ public class CampaignCampsReceiver extends BroadcastReceiver {
                     AppIceReactPluginModule.sendEvent(EnumConstants.APPICE_INAPP_NOTIFICATION_CLICKED.getValue(), params);
                 }
             }
+            printLog("CampaignEvent |","sendCallback |isHTMLInApp "+isHTMLInApp+"| campaignStr "+campaignStr);
+
             if (isHTMLInApp){
+
                 if (Utility.isValidObject(campaignStr)) {
                     WritableMap params = Arguments.createMap();
                     params.putString(EnumConstants.APPICE_HTML_INAPP_NOTIFICATION_CLICKED.getValue(), campaignStr);
@@ -59,6 +62,7 @@ public class CampaignCampsReceiver extends BroadcastReceiver {
                     WritableMap params = Arguments.createMap();
                     if (pushContent != null){
                         params.putString(EnumConstants.APPICE_PUSH_NOTIFICATION_CLICKED.getValue(), pushContent.toString());
+                        printLog("ActionPushDebug", " | APPICE_PUSH_NOTIFICATION_CLICKED | pushContent = "+pushContent);
                         AppIceReactPluginModule.sendEvent(EnumConstants.APPICE_PUSH_NOTIFICATION_CLICKED.getValue(), params);
                     }
                 }

package/android/src/main/java/com/appice/react/EnumConstants.java

@@ -52,6 +52,8 @@ public enum EnumConstants {
     INBOX_MESSAGE_CATEGORY("INBOX_MESSAGE_CATEGORY"),
     INBOX_MESSAGE_ICON("INBOX_MESSAGE_ICON"),
     INBOX_CUSTOM_DATA("INBOX_CUSTOM_DATA"),
+    INBOX_EXPANDED_IMAGE("INBOX_EXPANDED_IMAGE"),
+    INBOX_ACTIONS("INBOX_ACTIONS"),
 
     //==================================
     // custom user data
@@ -211,6 +213,14 @@ public enum EnumConstants {
                 return StringConstants.INBOX_CUSTOM_DATA;
             }
 
+            case INBOX_EXPANDED_IMAGE:{
+                return StringConstants.INBOX_EXPANDED_IMAGE;
+            }
+
+            case INBOX_ACTIONS:{
+                return StringConstants.INBOX_ACTIONS;
+            }
+
             case FIRST_SEEN:{
                 return StringConstants.FIRST_SEEN;
             }

package/android/src/main/java/com/appice/react/StringConstants.java

@@ -21,6 +21,8 @@ public interface StringConstants{
     String INBOX_MESSAGE_CATEGORY = "category";
     String INBOX_MESSAGE_ICON = "icon";
     String INBOX_CUSTOM_DATA = "cdata";
+    String INBOX_EXPANDED_IMAGE = "expandedImage";
+    String INBOX_ACTIONS = "actions";
     String FIRST_SEEN = "fsn";
     String LAST_SEEN = "lsn";
     String CUSTOM_DATA = "cdata";

package/ios/AppIceReactPlugin.m

@@ -440,6 +440,10 @@ RCT_EXPORT_METHOD(synchronizeInbox:(int)timeout callback:(RCTResponseSenderBlock
 // Add a method to format AppICEInboxMessage to a dictionary
 - (NSDictionary *)formatInboxMessage:(AppICEInboxMessage *)inboxMessage {
     if (inboxMessage) {
+           NSMutableArray *actionButtons = [NSMutableArray array];
+           for (Action *action in inboxMessage.actions) {
+               [actionButtons addObject:[action toDictionary]];
+           }
            return @{
                @"messageId": inboxMessage.messageId,
                @"id": inboxMessage.messageMid,
@@ -452,7 +456,8 @@ RCT_EXPORT_METHOD(synchronizeInbox:(int)timeout callback:(RCTResponseSenderBlock
                @"cdata": inboxMessage.customData,
                @"messageExpiryTime": @(inboxMessage.messageExpiryTime),
                @"campType": inboxMessage.campType,
-               @"eni": inboxMessage.expandedImage //messageExpandedImage replaced to expandedImage as discussed
+               @"expandedImage": inboxMessage.expandedImage, //messageExpandedImage replaced to expandedImage as discussed
+               @"actionButtons": actionButtons
      };
     } else {
         return @{};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "reactnative-plugin-appice",
-  "version": "1.7.45",
+  "version": "1.7.47",
   "description": "appICE React Native SDK",
   "main": "index.js",
   "files": [

package/reactnative-plugin-appice.podspec

@@ -23,7 +23,7 @@ Pod::Spec.new do |s|
   s.requires_arc = true
 
   s.dependency "React"
-  s.dependency "AppICE-IOS-SDK", "1.8.23"
+  s.dependency "AppICE-IOS-SDK", "1.8.27"
   # ...
   # s.dependency "..."
 end