reactnative-plugin-appice 1.7.46 → 1.7.49

package/android/build.gradle

@@ -97,7 +97,7 @@ dependencies {
     annotationProcessor "androidx.lifecycle:lifecycle-compiler:2.3.1"
 
     //appice
-    implementation "appice.io.android:sdk:2.6.44"
+    implementation "appice.io.android:sdk:2.6.46"
 
     //glide
     implementation "com.github.bumptech.glide:glide:4.11.0"

package/android/src/main/AndroidManifest.xml

@@ -97,15 +97,6 @@
             android:permission="android.permission.BIND_JOB_SERVICE">
         </service>
 
-        <receiver
-            android:protectionLevel="signature"
-            android:name="semusi.context.ui.Carousel.CarouselEventReceiver"
-            android:exported="false">
-            <intent-filter>
-                <action android:name="io.appice.CAROUSELNOTIFICATIONFIRED" />
-            </intent-filter>
-        </receiver>
-
         <receiver
             android:name="semusi.ruleengine.pushmanager.AppICEMessageHandler"
             android:exported="true"

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

@@ -3,6 +3,8 @@ package com.appice.react;
 import static com.appice.react.AppIceReactPluginModule.isDeviceReadyFlag;
 import static com.appice.react.AppIceReactPluginModule.pendingEventQueue;
 
+import static semusi.ruleengine.pushmanager.NotificationClickHandler.K_PAYLOAD;
+
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
@@ -25,6 +27,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 +38,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;
@@ -170,8 +174,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;
     }
@@ -502,44 +520,98 @@ 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) {
+        if (intent == null) {
+            printLog("ActionPushDebug", "Intent is null");
+            return;
+        }
+
+        Bundle bundle = intent.getExtras();
+        if (bundle == null) {
+            printLog("ActionPushDebug", "Bundle is null");
+            return;
+        }
+
+        NotificationClickHandler pushClickData = null;
+
         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");
-                                }
-                            }
-                        });
-                    }
+            pushClickData = NotificationClickHandler.fromBundle(bundle);
+            String payload = pushClickData.getPayload();
+
+            if (!Utility.isValidObject(payload)) {
+                return;
+            }
+
+            JSONObject payloadJson = new JSONObject(payload);
+            int pos = bundle.getInt("pos", -1);
+            int notificationId = bundle.getInt("n", -1);
+
+            // Notification body click
+            if (pos == -1) {
+                if (ContextSdk.isPayloadHaveExternalUrl(payload)) {
+                    ContextSdk.pushNotificationClicked(payload, context);
+                    ContextSdk.handleExternalUrl(payload, context);
+                    return;
                 }
-            } else
-                printLog("ActionPushDebug", " | intent is null ");
-        } catch (Throwable e) {
-            printLog("ActionPushDebug"," | exception in null ");
+
+                CampaignCampsReceiver campsReceiver = new CampaignCampsReceiver();
+                campsReceiver.sendCallback(bundle, context);
+                return;
+            }
+
+            // Notification action button click
+            if (notificationId >= 0) {
+                payloadJson.put("notificationId", notificationId);
+            }
+            payloadJson.put("selectedIndex", pos);
+
+            Campaign campaign = ContextSdk.handlePush(payloadJson.toString(), context);
+
+            if (campaign == null) {
+                return;
+            }
+
+            Action action = campaign.getSelectedAction();
+            if (action == null) {
+                return;
+            }
+
+            String type = action.getActionType();
+
+            if (Utility.isValidObject(type) && (type.equalsIgnoreCase("lp") || type.equalsIgnoreCase("dl"))) {
+                Map<String, Object> map = new HashMap<>();
+                map.put("campid", campaign.getCampId());
+                map.put("abt", action.getActionTitle());
+                map.put("mid", campaign.getMessageId());
+                ContextSdk.tagEventObj("Campaign_Clicked", map, context);
+
+                if (type.equalsIgnoreCase("lp")) {
+                    Utility.openExternalLinkUrl(action.getActionUrl(), context);
+                } else {
+                    Utility.openDeepLinkUrl(action.getActionUrl(), context);
+                }
+                return;
+            }
+
+            WritableMap params = Arguments.createMap();
+            String campaignStr = campaign.toJson().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());
+
+        } catch (Exception e) {
+            printLog("ActionPushDebug","Notification click handling failed: " + e.getMessage());
+        } finally {
+            // Executes even when an earlier branch returns.
+            if (pushClickData != null) {
+                pushClickData.deleteKeyFromIntent(intent, K_PAYLOAD);
+            }
         }
     }
-}
+}

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

@@ -45,6 +45,7 @@ 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();
@@ -59,6 +60,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/campaign.js

@@ -1,39 +1,11 @@
-const { Linking, Platform } = require('react-native');
 
-async function handleClickOnPush(campaign) {
-  if (campaign && campaign._data) {
-    campaign = campaign._data;
-  }
-
-  const url = campaign.actionUrl || campaign.acu || campaign.eurl;
-  const actionType = campaign.actionType || campaign.act || campaign.et;
-
-  if (!url || typeof url !== 'string') {
-    console.log('Error: URL is not provided.');
-    return;
-  }
-
-  const httpUrls = url.startsWith('http://') || url.startsWith('https://');
-
-  if (httpUrls) {
-    try {
-      if (Platform.OS === 'ios') {
-        campaign = normalizeCampaignPayloadForPlatform(campaign);
-        return campaign;
-        // iOS handle redirection on native side for landing page.
-      }
-
-      await Linking.openURL(url);
-      console.log(`Successfully opened URL: ${url}`);
-    } catch (error) {
-      console.log('Error while opening URL:', error?.message || error);
-    }
-  }
+const { Platform } = require('react-native');
 
-  if (actionType === 'dl' && !httpUrls) {
-    // handle custom deeplink
+async function handleClickOnPush(campaign) {
+    // not removing this fucntion, as UBI is using it for IOS and IOS was returning campaign class object without checking anything
+    campaign = normalizeCampaignPayloadForPlatform(campaign);
     return campaign;
-  }
+
 }
 
 
@@ -73,7 +45,7 @@ class Campaign {
       // if parse fails, keep eventData as-is (object expected)
       data = eventData || {};
     }
-    
+
     // Keep app-side listener thin by normalizing payload shape in campaign layer.
     data = normalizeCampaignPayloadForPlatform(data);
     const isLegacy = data && (data.camp_id || data.eurl || data.et || data.abt || data.act || data.acc);
@@ -81,6 +53,7 @@ class Campaign {
     if (isLegacy) {
       // Map legacy fields into _data in a normalized way
       this._data.campId = data.campId || data.camp_id || '';
+      this._data.mid = data.mid || '';
       this._data.actionType = data.actionType || data.et || data.act || '';
       this._data.actionUrl = data.actionUrl || data.eurl || data.acu || '';
       this._data.actionContent = data.actionContent || data.acc || '';
@@ -94,8 +67,9 @@ class Campaign {
       this._data.customData = data.customData || data.cdata || data.custom || {};
 
       // Actions mapping (legacy may have abt/act/acc/acu)
-      this._data.actions = Array.isArray(data.actions)
-        ? data.actions.map((action) => ({
+      const actions = data.actions || data.actionButtons;
+      this._data.actions = Array.isArray(actions)
+        ? actions.map((action) => ({
             actionTitle: action.actionTitle || action.abt || '',
             actionType: action.actionType || action.act || '',
             actionContent: action.actionContent || action.acc || '',
@@ -117,6 +91,7 @@ class Campaign {
   // ===========================
   toCampaign(jsonData) {
     this._data.campId = jsonData.campId || jsonData.camp_id || '';
+    this._data.mid = jsonData.mid || '';
     this._data.nh = jsonData.title || jsonData.nh || '';
     this._data.nd = jsonData.description || jsonData.nd || '';
     this._data.end = jsonData.expandedDescription || jsonData.end || '';
@@ -131,8 +106,9 @@ class Campaign {
     this._data.expiry = jsonData.expiry || 0;
     this._data.customData = jsonData.customData || jsonData.custom || {};
     // Actions array mapping
-    this._data.actions = Array.isArray(jsonData.actions)
-      ? jsonData.actions.map(function (action) {
+    const actions = jsonData.actions || jsonData.actionButtons;
+    this._data.actions = Array.isArray(actions)
+      ? actions.map(function (action) {
           return {
             actionTitle: action.actionTitle || action.abt || '',
             actionType: action.actionType || action.act || '',
@@ -215,6 +191,9 @@ class Campaign {
   getCampaignId() {
     return this._data.campId || this._data.camp_id || '';
   }
+  getMid() {
+    return this._data.mid || '';
+  }
   getActionUrl() {
     return this._data.actionUrl || this._data.acu || this._data.eurl || '';
   }
@@ -243,6 +222,23 @@ class Campaign {
     return this._data.selectedActionUrl;
   }
 
+  // ===========================
+  // Campaign Click Tracking
+  // ===========================
+  async pushActionNotificationClicked(AppICE) {
+    const dataObj = {
+      campid: this.getCampaignId(),
+      abt: this.getSelectedActionTitle(),
+      mid: this.getMid()
+    };
+
+    try {
+      await AppICE.tagEvent('Campaign_Clicked', dataObj);
+    } catch (error) {
+      console.error('Campaign_Clicked tracking failed:', error);
+    }
+  }
+
   // Convert to JSON
   toJSON() {
     return this._data;

package/example/package.json

@@ -17,7 +17,7 @@
     "install": "^0.13.0",
     "react": "18.0.0",
     "react-native": "0.69.4",
-    "reactnative-plugin-appice": "1.7.43",
+    "reactnative-plugin-appice": "1.7.48",
     "react-native-mmkv": "2.12.2"
   },
   "devDependencies": {

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
+               @"actions": actionButtons
      };
     } else {
         return @{};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "reactnative-plugin-appice",
-  "version": "1.7.46",
+  "version": "1.7.49",
   "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.27"
+  s.dependency "AppICE-IOS-SDK", "1.8.28"
   # ...
   # s.dependency "..."
 end