react-native-mapp-plugin 2.0.0-beta.1 → 2.0.1

package/CHANGELOG.md

@@ -1,4 +1,19 @@
-## Version 2.0.0 (unreleased)
+## Version 2.0.1 (2026/09/04)
+
+***Bug Fixes***
+
+- iOS: `Mapp.onInitCompletedListener()` now returns a `Promise<boolean>` instead of `null`.
+- iOS: When the SDK is already initialized, `Mapp.onInitCompletedListener()` resolves immediately with `true`.
+- iOS: When the SDK is still initializing, `Mapp.onInitCompletedListener()` waits for the existing `com.mapp.init` native event and removes its one-time listener after resolving.
+- Android: Preserved the existing native `AppoxeeObserver` implementation and behavior of `Mapp.onInitCompletedListener()`.
+- Android/iOS: Preserved the public `Mapp.onInitCompletedListener(): Promise<boolean>` API while providing consistent initialization-waiting behavior on both platforms.
+
+***Tests***
+
+- Added bridge coverage for both iOS readiness paths: already initialized and waiting for the native initialization event.
+- Updated platform-dispatch coverage to verify that Android continues to use the native listener and iOS uses its existing initialization event.
+
+## Version 2.0.0 (2026/09/03)
 
 ***Breaking Changes***
 
@@ -10,11 +25,15 @@
 
 ***Bug Fixes***
 
+- `Mapp.engage(...)` is now awaitable so singleton-dependent calls can safely run after native initialization; engagement failures reject instead of being logged silently.
 - Android: Failed Firebase token registration now rejects with `FCM_REGISTRATION_FAILED` instead of crashing while reading a failed task result.
 - Android: All Mapp engage calls run on the main looper. Background Firebase callbacks wait for a bounded engage attempt and safely return failure after SDK errors, timeout, or interruption.
 - Android/Expo: Mapp and custom push ownership now remove the SDK v7 Firebase service and remain idempotent when prebuild runs repeatedly or changes mode.
+- Android/Expo: The config plugin now writes required permissions, the Mapp messaging service, and the push receiver through `withAndroidManifest`; Firebase configuration remains customer-owned through `expo.android.googleServicesFile`.
 - Android: Exported Expo SDK 57 compatibility constraints stabilize WorkManager, Lifecycle, AndroidX Core, Play Services Location, and Kotlin stdlib for API 36/AGP 8.12/Kotlin 2.1.20 builds.
 - Android: Coroutines remain aligned at 1.11.0 to preserve the Mapp 7.1.2 native in-app dismissal ABI.
+- iOS/Expo: The config plugin now creates and embeds a standalone Notification Service Extension for Mapp rich-push media from `ios_apx_media`, with EAS app-extension metadata and no App Group or extra Pod.
+- iOS/Expo: Verified that Expo SDK 57 CocoaPods autolinking discovers `RNMappPlugin.podspec` and processes `RNMappPlugin` under the New Architecture.
 
 ***Compatibility***
 

package/MIGRATION_2.0.md

@@ -31,7 +31,7 @@ Read [Breaking changes in 2.0.0](BREAKING_CHANGES.md) first to determine which c
 | `Mapp.inAppMarkAsRead(templateId, eventId)` | Android no-op. | Android fetches the Mapp Engage 7.1.2 inbox message and updates it to `READ`. |
 | `Mapp.inAppMarkAsUnRead(templateId, eventId)` | Android no-op. | Android fetches the inbox message and updates it to `UNREAD`. |
 | `Mapp.inAppMarkAsDeleted(templateId, eventId)` | Android no-op. | Android fetches the inbox message and updates it to `DELETED`. |
-| `Mapp.engage(...)` | iOS JavaScript called the private native `autoengage` and `engageInapp` methods separately. | All platforms use the public native `engage` entry point. On iOS it still initializes both push and in-app, using `AppoxeeConfig.plist` as the credential source of truth. |
+| `Mapp.engage(...)` | iOS JavaScript called the private native `autoengage` and `engageInapp` methods separately, and Android engagement returned before its main-thread task completed. | All platforms use an awaitable native engagement entry point. Await it before calling singleton-dependent APIs. On iOS it still initializes both push and in-app, using `AppoxeeConfig.plist` as the credential source of truth. |
 | iOS event listeners | Events emitted before a JavaScript listener was attached were dropped. | Up to 50 cold-start events are buffered and delivered after a listener attaches. Consumers should tolerate receiving an initial queued event. |
 
 For the Android inbox methods, `eventId` remains accepted for source compatibility but Mapp Engage 7.1.2 identifies and fetches the message using `templateId`.

package/Mapp.js

@@ -127,7 +127,7 @@ export class Mapp {
     server: string,
     appID: string,
     tenantID: string
-  ) {
+  ): Promise<boolean> {
     return RNMappPluginModule.engage(
       sdkKey,
       googleProjectId,
@@ -163,10 +163,22 @@ export class Mapp {
    * @return {Promise.<boolean>} A promise with the result.
    */
   static onInitCompletedListener(): Promise<boolean> {
-    if (Platform.OS == "android") {
+    if (Platform.OS === "android") {
       return RNMappPluginModule.onInitCompletedListener();
     }
-    return null;
+
+    return RNMappPluginModule.isReady().then((ready) => {
+      if (ready) {
+        return true;
+      }
+
+      return new Promise((resolve) => {
+        const subscription = EventEmitter.addListener(IOS_INIT, () => {
+          subscription.remove();
+          resolve(true);
+        });
+      });
+    });
   }
 
   /**

package/README.md

@@ -59,6 +59,8 @@ Configure the installed package by name in `app.json` (values shown are examples
 
 The Android package must match the Firebase Android application in `google-services.json`. For iOS, configure an APNs-enabled App ID, matching bundle identifier, and Apple/EAS signing credentials. Values embedded in app config and native resources are public application configuration; do not put service-account keys or signing secrets there.
 
+The Firebase file is customer-owned configuration. Point Expo's built-in `expo.android.googleServicesFile` field at it; this plugin does not copy, generate, or modify `google-services.json`.
+
 Generate and run development builds:
 
 ```bash
@@ -86,9 +88,11 @@ const subscription = events.addListener('com.mapp.deep_link_received', event =>
   // Route the deep link.
 });
 
-Mapp.engage('ANDROID_SDK_KEY', 'FCM_PROJECT_ID', 'EMC', 'APP_ID', 'TENANT_ID');
+await Mapp.engage('ANDROID_SDK_KEY', 'FCM_PROJECT_ID', 'EMC', 'APP_ID', 'TENANT_ID');
 ```
 
+Always await `Mapp.engage(...)` before calling APIs that use the native Mapp singleton. The promise resolves after native engagement and bridge setup complete; use `Mapp.onInitCompletedListener()` or `Mapp.isReady()` when a feature specifically requires the SDK's later ready state.
+
 ### Android push ownership
 
 `pushHandling: "mapp"` is the default. It requires `expo.android.googleServicesFile` and retains `com.reactlibrary.MessageService` as the sole normal-priority Mapp FCM callback owner. The config plugin removes the Mapp SDK v7 service (`com.appoxee.shared.MappMessagingService`) from the merged app manifest.
@@ -113,6 +117,12 @@ Use `pushHandling: "custom"` when another integration, such as a client-owned `F
 
 Set `enableGeofencing` on each platform that needs it. Android then adds fine/background location permissions and `Mapp.requestGeofenceLocationPermission()` requests foreground permission before background permission. On iOS, also supply non-empty `locationWhenInUsePermission` and `locationAlwaysPermission` messages. Only request location access when your user-facing feature and store policy justify it.
 
+### iOS rich push
+
+The Expo config plugin creates a `MappNotificationService` Notification Service Extension with the bundle identifier `<expo.ios.bundleIdentifier>.mappnotificationservice`. The extension reads the public Mapp `ios_apx_media` payload key, downloads the media, and attaches it to the notification. It follows the app minimum deployment target and is set to iOS 15+, uses an App Group shared with the main app, and does not require an additional CocoaPod or React Native code.
+
+The extension is also declared in Expo's experimental EAS app-extension metadata so EAS can prepare its signing credentials. Regenerate the iOS project after changing the application bundle identifier.
+
 ### Tested compatibility
 
 | Component | Tested baseline |
@@ -143,6 +153,8 @@ cd ios && pod install
 
 Modern React Native autolinking discovers the Android package and CocoaPod automatically. Do not run `react-native link`, edit `settings.gradle`, or add `compile project(...)`.
 
+No `MainActivity` or `MainApplication` edit is required. The native module is registered by autolinking. In Expo projects, the config plugin applies Android permissions, the Mapp messaging service, and the push receiver during prebuild without modifying consumer Gradle files. React Native CLI projects receive the same declarations through the library manifest merge. On iOS, CocoaPods discovers `RNMappPlugin.podspec` automatically; do not add the pod manually.
+
 For a manually maintained iOS native project, add Push Notifications, Remote Notifications background mode, and (only if needed) Location Updates, then include an `AppoxeeConfig.plist` in the application target. Expo clients should use the config plugin above instead.
 
 Basic usage:
@@ -150,7 +162,7 @@ Basic usage:
 ```js
 import { Mapp } from 'react-native-mapp-plugin';
 
-Mapp.engage('SDK_KEY', 'FCM_PROJECT_ID', 'EMC', 'APP_ID', 'TENANT_ID');
+await Mapp.engage('SDK_KEY', 'FCM_PROJECT_ID', 'EMC', 'APP_ID', 'TENANT_ID');
 ```
 
 See the [Mapp integration documentation](https://mapp-wiki.atlassian.net/wiki/spaces/MIC/pages/1154875400/React+Native+Integration+for+Mapp+Cloud) for the full JavaScript API and native Mapp configuration values.

package/android/src/main/java/com/reactlibrary/MappEngagementDispatcher.java

@@ -22,14 +22,40 @@ final class MappEngagementDispatcher {
 
     private MappEngagementDispatcher() {}
 
+    interface EngagementCallback {
+        void onSuccess();
+        void onFailure(@NonNull Exception error);
+    }
+
     static void engageAsync(
             @NonNull Application application,
             @Nullable AppoxeeOptions options,
             @Nullable Runnable afterEngage
+    ) {
+        engageAsync(application, options, afterEngage, null);
+    }
+
+    static void engageAsync(
+            @NonNull Application application,
+            @Nullable AppoxeeOptions options,
+            @Nullable Runnable afterEngage,
+            @Nullable EngagementCallback callback
     ) {
         Runnable operation = () -> {
-            if (engageNow(application, options) && afterEngage != null) {
-                afterEngage.run();
+            try {
+                Appoxee.engage(application, options);
+                if (afterEngage != null) {
+                    afterEngage.run();
+                }
+            } catch (Exception error) {
+                Log.e(TAG, "Mapp initialization failed", error);
+                if (callback != null) {
+                    callback.onFailure(error);
+                }
+                return;
+            }
+            if (callback != null) {
+                callback.onSuccess();
             }
         };
         if (Looper.myLooper() == Looper.getMainLooper()) {
@@ -37,7 +63,13 @@ final class MappEngagementDispatcher {
             return;
         }
         if (!new Handler(Looper.getMainLooper()).post(operation)) {
-            Log.e(TAG, "Unable to post Mapp initialization to the main looper");
+            IllegalStateException error = new IllegalStateException(
+                    "Unable to post Mapp initialization to the main looper"
+            );
+            Log.e(TAG, error.getMessage(), error);
+            if (callback != null) {
+                callback.onFailure(error);
+            }
         }
     }
 
@@ -94,7 +126,7 @@ final class MappEngagementDispatcher {
         try {
             Appoxee.engage(application, options);
             return true;
-        } catch (RuntimeException error) {
+        } catch (Exception error) {
             Log.e(TAG, "Mapp initialization failed", error);
             return false;
         }

package/android/src/main/java/com/reactlibrary/NativeRNMappPluginModuleSpec.java

@@ -76,7 +76,7 @@ public abstract class NativeRNMappPluginModuleSpec extends ReactContextBaseJavaM
 
   @ReactMethod
   @DoNotStrip
-  public abstract void engage(String sdkKey, String googleProjectId, String server, String appID, String tenantID);
+  public abstract void engage(String sdkKey, String googleProjectId, String server, String appID, String tenantID, Promise promise);
 
   @ReactMethod
   @DoNotStrip

package/android/src/main/java/com/reactlibrary/RNMappPluginModule.java

@@ -384,19 +384,42 @@ public class RNMappPluginModule extends NativeRNMappPluginModuleSpec implements
     }
 
     @ReactMethod
-    public void engage(String sdkKey, String googleProjectId, String server, String appID, String tenantID) {
-        AppoxeeOptions opt = createOptions(server, sdkKey, appID, tenantID);
-        opt.setNotificationMode(NotificationMode.BACKGROUND_AND_FOREGROUND);
+    public void engage(String sdkKey, String googleProjectId, String server, String appID,
+                       String tenantID, Promise promise) {
+        final AppoxeeOptions opt;
+        try {
+            opt = createOptions(server, sdkKey, appID, tenantID);
+            opt.setNotificationMode(NotificationMode.BACKGROUND_AND_FOREGROUND);
+        } catch (RuntimeException error) {
+            promise.reject("MAPP_ENGAGE_INVALID_CONFIGURATION", error.getMessage(), error);
+            return;
+        }
 
-        MappEngagementDispatcher.engageAsync(Objects.requireNonNull(application), opt, () -> {
-            Appoxee.instance().subscribe(new AppoxeeObserver() {
-                @Override
-                public void onReadyStatusChanged(boolean status, MappResult<DevicePayload> result) {
+        MappEngagementDispatcher.engageAsync(
+                Objects.requireNonNull(application),
+                opt,
+                this::configureAfterEngage,
+                new MappEngagementDispatcher.EngagementCallback() {
+                    @Override
+                    public void onSuccess() {
+                        promise.resolve(true);
+                    }
+
+                    @Override
+                    public void onFailure(@NonNull Exception error) {
+                        promise.reject("MAPP_ENGAGE_FAILED", "Mapp initialization failed", error);
+                    }
                 }
-            });
+        );
+    }
 
-            Appoxee.instance().setPushBroadcast(MyPushBroadcastReceiver.class);
+    private void configureAfterEngage() {
+        Appoxee.instance().subscribe(new AppoxeeObserver() {
+            @Override
+            public void onReadyStatusChanged(boolean status, MappResult<DevicePayload> result) {
+            }
         });
+        Appoxee.instance().setPushBroadcast(MyPushBroadcastReceiver.class);
     }
 
     @ReactMethod

package/android/src/main/jni/RNMappPlugin-generated.cpp

@@ -64,7 +64,7 @@ static facebook::jsi::Value __hostFunction_NativeRNMappPluginModuleSpecJSI_engag
 
 static facebook::jsi::Value __hostFunction_NativeRNMappPluginModuleSpecJSI_engage(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
   static jmethodID cachedMethodId = nullptr;
-  return static_cast<JavaTurboModule &>(turboModule).invokeJavaMethod(rt, VoidKind, "engage", "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V", args, count, cachedMethodId);
+  return static_cast<JavaTurboModule &>(turboModule).invokeJavaMethod(rt, PromiseKind, "engage", "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/facebook/react/bridge/Promise;)V", args, count, cachedMethodId);
 }
 
 static facebook::jsi::Value __hostFunction_NativeRNMappPluginModuleSpecJSI_engageTestServer(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {

package/android/src/main/jni/react/renderer/components/RNMappPlugin/RNMappPluginJSI.h

@@ -154,12 +154,12 @@ private:
     static_assert(
       bridging::getParameterCount(&T::engage) == 6,
       "Expected engage(...) to have 6 parameters");
-    bridging::callFromJs<void>(rt, &T::engage,  static_cast<NativeRNMappPluginModuleCxxSpec*>(&turboModule)->jsInvoker_, static_cast<T*>(&turboModule),
+    return bridging::callFromJs<jsi::Value>(rt, &T::engage,  static_cast<NativeRNMappPluginModuleCxxSpec*>(&turboModule)->jsInvoker_, static_cast<T*>(&turboModule),
       count <= 0 ? throw jsi::JSError(rt, "Expected argument in position 0 to be passed") : args[0].asString(rt),
       count <= 1 ? throw jsi::JSError(rt, "Expected argument in position 1 to be passed") : args[1].asString(rt),
       count <= 2 ? throw jsi::JSError(rt, "Expected argument in position 2 to be passed") : args[2].asString(rt),
       count <= 3 ? throw jsi::JSError(rt, "Expected argument in position 3 to be passed") : args[3].asString(rt),
-      count <= 4 ? throw jsi::JSError(rt, "Expected argument in position 4 to be passed") : args[4].asString(rt));return jsi::Value::undefined();
+      count <= 4 ? throw jsi::JSError(rt, "Expected argument in position 4 to be passed") : args[4].asString(rt));
   }
 
   static jsi::Value __engageTestServer(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {

package/ios/RNMappPluginModule.h

@@ -5,11 +5,23 @@
 #import "AppoxeeLocationManager.h"
 #import <UserNotifications/UNUserNotificationCenter.h>
 #if RCT_NEW_ARCH_ENABLED
+#import <ReactCommon/RCTTurboModule.h>
+#if __has_include(<RNMappPluginSpec/RNMappPluginSpec.h>)
+#import <RNMappPluginSpec/RNMappPluginSpec.h>
+#define RNMAPP_HAS_TURBO_MODULE_SPEC 1
+#elif __has_include(<RNMappPlugin/RNMappPlugin.h>)
 #import <RNMappPlugin/RNMappPlugin.h>
+#define RNMAPP_HAS_TURBO_MODULE_SPEC 1
+#elif __has_include("RNMappPlugin.h")
+#import "RNMappPlugin.h"
+#define RNMAPP_HAS_TURBO_MODULE_SPEC 1
+#else
+#define RNMAPP_HAS_TURBO_MODULE_SPEC 0
+#endif
 #endif
 
 @interface RNMappPluginModule : NSObject <RCTBridgeModule,AppoxeeInappDelegate, AppoxeeNotificationDelegate, AppoxeeLocationManagerDelegate
-#if RCT_NEW_ARCH_ENABLED
+#if RCT_NEW_ARCH_ENABLED && RNMAPP_HAS_TURBO_MODULE_SPEC
 , NativeRNMappPluginModuleSpec
 #endif
 >

package/ios/RNMappPluginModule.mm

@@ -2,12 +2,24 @@
 #import "RNMappEventEmmiter.h"
 #if RCT_NEW_ARCH_ENABLED
 #import <ReactCommon/RCTTurboModule.h>
+#if __has_include(<RNMappPluginSpec/RNMappPluginSpec.h>)
+#import <RNMappPluginSpec/RNMappPluginSpec.h>
+#define RNMAPP_HAS_TURBO_MODULE_SPEC 1
+#elif __has_include(<RNMappPlugin/RNMappPlugin.h>)
+#import <RNMappPlugin/RNMappPlugin.h>
+#define RNMAPP_HAS_TURBO_MODULE_SPEC 1
+#elif __has_include("RNMappPlugin.h")
+#import "RNMappPlugin.h"
+#define RNMAPP_HAS_TURBO_MODULE_SPEC 1
+#else
+#define RNMAPP_HAS_TURBO_MODULE_SPEC 0
+#endif
 #endif
 
 
 @implementation RNMappPluginModule
 
-#if RCT_NEW_ARCH_ENABLED
+#if RCT_NEW_ARCH_ENABLED && RNMAPP_HAS_TURBO_MODULE_SPEC
 - (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:
     (const facebook::react::ObjCTurboModule::InitParams &)params
 {
@@ -82,7 +94,7 @@ RCT_EXPORT_METHOD(getToken:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRej
 RCT_EXPORT_METHOD(engage2) {}
 
 RCT_EXPORT_METHOD(engageTestServer:(NSString *)cepUrl sdkKey:(NSString *)sdkKey googleProjectId:(NSString *)projectId server:(NSString *)server appID:(NSString *)appID tenantID:(NSString *)tenantID) {
-    [self engage:sdkKey googleProjectId:projectId server:server appID:appID tenantID:tenantID];
+    [self performEngage:sdkKey googleProjectId:projectId server:server appID:appID tenantID:tenantID];
 }
 
 RCT_EXPORT_METHOD(onInitCompletedListener:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
@@ -119,13 +131,33 @@ RCT_EXPORT_METHOD(removeAndroidListeners:(NSInteger)count) {}
 
 #pragma mark Exported methods - Notifications
 
-RCT_EXPORT_METHOD(engage: (NSString *)sdkKey googleProjectId: (NSString *)projectId server:(NSString *)server appID:(NSString *)appID tenantID:(NSString *)tenantID) {
+- (void)performEngage:(NSString *)sdkKey
+      googleProjectId:(NSString *)projectId
+               server:(NSString *)server
+                appID:(NSString *)appID
+             tenantID:(NSString *)tenantID {
     SERVER serv = [self getServerKeyFor:server];
     [[Appoxee shared] engageAndAutoIntegrateWithLaunchOptions:nil andDelegate:[RNMappEventEmmiter shared] with:serv];
     [[Appoxee shared] addObserver: [RNMappEventEmmiter shared] forKeyPath:@"isReady" options:NSKeyValueObservingOptionNew context:nil];
     [[AppoxeeInapp shared] engageWithDelegate:[RNMappEventEmmiter shared] with:[self getInappServerKeyFor:server]];
 }
 
+RCT_EXPORT_METHOD(engage:(NSString *)sdkKey
+                  googleProjectId:(NSString *)projectId
+                  server:(NSString *)server
+                  appID:(NSString *)appID
+                  tenantID:(NSString *)tenantID
+                  resolve:(RCTPromiseResolveBlock)resolve
+                  reject:(RCTPromiseRejectBlock)reject) {
+    @try {
+        [self performEngage:sdkKey googleProjectId:projectId server:server appID:appID tenantID:tenantID];
+        resolve(@YES);
+    } @catch (NSException *exception) {
+        NSString *message = exception.reason ?: @"Mapp initialization failed";
+        reject(@"MAPP_ENGAGE_FAILED", message, nil);
+    }
+}
+
 RCT_EXPORT_METHOD(getAlias:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
     [[Appoxee shared] getDeviceAliasWithCompletionHandler:^(NSError * _Nullable appoxeeError, id  _Nullable data) {
         if (appoxeeError == nil && data != nil) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-mapp-plugin",
-  "version": "2.0.0-beta.1",
+  "version": "2.0.1",
   "description": "Mapp SDK for React Native.",
   "main": "index.js",
   "files": [
@@ -99,7 +99,12 @@
     ],
     "transform": {
       "^.+\\.js$": "babel-jest",
-      "^.+\\.ts$": ["ts-jest", { "tsconfig": "plugin/tsconfig.json" }]
+      "^.+\\.ts$": [
+        "ts-jest",
+        {
+          "tsconfig": "plugin/tsconfig.json"
+        }
+      ]
     },
     "moduleNameMapper": {
       "^react-native$": "<rootDir>/__mocks__/react-native.js"

package/plugin/build/android.d.ts

@@ -1,4 +1,4 @@
 import { ConfigPlugin } from '@expo/config-plugins';
 import type { NormalizedMappExpoPluginProps } from './types';
-export declare function updatePushHandling(androidManifest: any, pushHandling: NormalizedMappExpoPluginProps['android']['pushHandling']): any;
+export declare function updateAndroidManifest(androidManifest: any, props: NormalizedMappExpoPluginProps['android']): any;
 export declare const withMappEngageAndroid: ConfigPlugin<NormalizedMappExpoPluginProps['android']>;

package/plugin/build/android.js

@@ -1,28 +1,68 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.withMappEngageAndroid = void 0;
-exports.updatePushHandling = updatePushHandling;
+exports.updateAndroidManifest = updateAndroidManifest;
 const config_plugins_1 = require("@expo/config-plugins");
 const messageService = 'com.reactlibrary.MessageService';
+const pushBroadcastReceiver = 'com.reactlibrary.MyPushBroadcastReceiver';
 const sdkMessagingServices = [
     'com.appoxee.shared.MappMessagingService',
     'com.appoxee.push.fcm.MappMessagingService',
 ];
 const managedMessagingServices = [messageService, ...sdkMessagingServices];
+const receiveBootCompleted = 'android.permission.RECEIVE_BOOT_COMPLETED';
+const internet = 'android.permission.INTERNET';
+const postNotifications = 'android.permission.POST_NOTIFICATIONS';
 const fineLocation = 'android.permission.ACCESS_FINE_LOCATION';
 const backgroundLocation = 'android.permission.ACCESS_BACKGROUND_LOCATION';
+const firebaseMessagingEvent = 'com.google.firebase.MESSAGING_EVENT';
 function removeAll(items, predicate) {
     return (items ?? []).filter(item => !predicate(item));
 }
-function updatePushHandling(androidManifest, pushHandling) {
+function addPermission(androidManifest, permission) {
+    const permissions = androidManifest.manifest['uses-permission'] ?? [];
+    if (!permissions.some((item) => item.$?.['android:name'] === permission)) {
+        permissions.push({ $: { 'android:name': permission } });
+    }
+    androidManifest.manifest['uses-permission'] = permissions;
+}
+function updateAndroidManifest(androidManifest, props) {
     const manifest = androidManifest.manifest;
     const application = config_plugins_1.AndroidConfig.Manifest.getMainApplicationOrThrow(androidManifest);
     application.service = removeAll(application.service, service => {
-        return managedMessagingServices.includes(service.$?.['android:name'])
-            && service.$?.['tools:node'] === 'remove';
+        return managedMessagingServices.includes(service.$?.['android:name']);
     });
+    application.receiver = removeAll(application.receiver, receiver => (receiver.$?.['android:name'] === pushBroadcastReceiver));
     manifest.$ = manifest.$ ?? {};
     manifest.$['xmlns:tools'] = 'http://schemas.android.com/tools';
+    for (const permission of [receiveBootCompleted, internet, postNotifications]) {
+        addPermission(androidManifest, permission);
+    }
+    if (props.enableGeofencing) {
+        addPermission(androidManifest, fineLocation);
+        addPermission(androidManifest, backgroundLocation);
+    }
+    application.receiver.push({
+        $: {
+            'android:name': pushBroadcastReceiver,
+            'android:enabled': 'true',
+            'android:exported': 'false',
+        },
+        'intent-filter': [{
+                action: [
+                    { $: { 'android:name': 'com.appoxee.PUSH_OPENED' } },
+                    { $: { 'android:name': 'com.appoxee.PUSH_RECEIVED' } },
+                    { $: { 'android:name': 'com.appoxee.PUSH_DISMISSED' } },
+                    { $: { 'android:name': 'com.appoxee.BUTTON_CLICKED' } },
+                    { $: { 'android:name': 'android.intent.action.VIEW' } },
+                ],
+                category: [
+                    { $: { 'android:name': '${applicationId}' } },
+                    { $: { 'android:name': 'android.intent.category.DEFAULT' } },
+                    { $: { 'android:name': 'android.intent.category.BROWSABLE' } },
+                ],
+            }],
+    });
     for (const serviceName of sdkMessagingServices) {
         application.service.push({
             $: {
@@ -31,7 +71,18 @@ function updatePushHandling(androidManifest, pushHandling) {
             },
         });
     }
-    if (pushHandling === 'custom') {
+    if (props.pushHandling === 'mapp') {
+        application.service.push({
+            $: {
+                'android:name': messageService,
+                'android:exported': 'false',
+            },
+            'intent-filter': [{
+                    action: [{ $: { 'android:name': firebaseMessagingEvent } }],
+                }],
+        });
+    }
+    else {
         application.service.push({
             $: {
                 'android:name': messageService,
@@ -42,11 +93,8 @@ function updatePushHandling(androidManifest, pushHandling) {
     return androidManifest;
 }
 const withMappEngageAndroid = (config, props) => {
-    if (props.enableGeofencing) {
-        config = config_plugins_1.AndroidConfig.Permissions.withPermissions(config, [fineLocation, backgroundLocation]);
-    }
     return (0, config_plugins_1.withAndroidManifest)(config, configWithManifest => {
-        configWithManifest.modResults = updatePushHandling(configWithManifest.modResults, props.pushHandling);
+        configWithManifest.modResults = updateAndroidManifest(configWithManifest.modResults, props);
         return configWithManifest;
     });
 };

package/plugin/build/index.d.ts

@@ -3,6 +3,6 @@ import type { MappExpoPluginProps } from './types';
 export declare const withMappEngage: ConfigPlugin<MappExpoPluginProps>;
 export type { MappExpoPluginProps } from './types';
 export { withMappEngageAndroid } from './android';
-export { withMappEngageIos, buildAppoxeeConfig, writeAppoxeeConfig } from './ios';
+export { withMappEngageIos, buildAppoxeeConfig, writeAppoxeeConfig, buildNotificationServiceInfoPlist, writeNotificationServiceFiles, } from './ios';
 export { validateAndNormalizeProps } from './validation';
 export default withMappEngage;

package/plugin/build/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.validateAndNormalizeProps = exports.writeAppoxeeConfig = exports.buildAppoxeeConfig = exports.withMappEngageIos = exports.withMappEngageAndroid = exports.withMappEngage = void 0;
+exports.validateAndNormalizeProps = exports.writeNotificationServiceFiles = exports.buildNotificationServiceInfoPlist = exports.writeAppoxeeConfig = exports.buildAppoxeeConfig = exports.withMappEngageIos = exports.withMappEngageAndroid = exports.withMappEngage = void 0;
 const config_plugins_1 = require("@expo/config-plugins");
 const android_1 = require("./android");
 const ios_1 = require("./ios");
@@ -19,6 +19,8 @@ var ios_2 = require("./ios");
 Object.defineProperty(exports, "withMappEngageIos", { enumerable: true, get: function () { return ios_2.withMappEngageIos; } });
 Object.defineProperty(exports, "buildAppoxeeConfig", { enumerable: true, get: function () { return ios_2.buildAppoxeeConfig; } });
 Object.defineProperty(exports, "writeAppoxeeConfig", { enumerable: true, get: function () { return ios_2.writeAppoxeeConfig; } });
+Object.defineProperty(exports, "buildNotificationServiceInfoPlist", { enumerable: true, get: function () { return ios_2.buildNotificationServiceInfoPlist; } });
+Object.defineProperty(exports, "writeNotificationServiceFiles", { enumerable: true, get: function () { return ios_2.writeNotificationServiceFiles; } });
 var validation_2 = require("./validation");
 Object.defineProperty(exports, "validateAndNormalizeProps", { enumerable: true, get: function () { return validation_2.validateAndNormalizeProps; } });
 exports.default = exports.withMappEngage;

package/plugin/build/ios.d.ts

@@ -2,4 +2,6 @@ import { ConfigPlugin } from '@expo/config-plugins';
 import type { NormalizedMappExpoPluginProps } from './types';
 export declare function buildAppoxeeConfig(props: NormalizedMappExpoPluginProps['ios']): Record<string, unknown>;
 export declare function writeAppoxeeConfig(platformProjectRoot: string, props: NormalizedMappExpoPluginProps['ios']): Promise<string>;
+export declare function buildNotificationServiceInfoPlist(): Record<string, unknown>;
+export declare function writeNotificationServiceFiles(platformProjectRoot: string, bundleIdentifier: string): Promise<string[]>;
 export declare const withMappEngageIos: ConfigPlugin<NormalizedMappExpoPluginProps['ios']>;

package/plugin/build/ios.js

@@ -6,11 +6,84 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.withMappEngageIos = void 0;
 exports.buildAppoxeeConfig = buildAppoxeeConfig;
 exports.writeAppoxeeConfig = writeAppoxeeConfig;
+exports.buildNotificationServiceInfoPlist = buildNotificationServiceInfoPlist;
+exports.writeNotificationServiceFiles = writeNotificationServiceFiles;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const config_plugins_1 = require("@expo/config-plugins");
 const plist_1 = __importDefault(require("@expo/plist"));
 const plistName = 'AppoxeeConfig.plist';
+const notificationServiceTargetName = 'MappNotificationService';
+const notificationServiceInfoPlistName = 'Info.plist';
+const notificationServiceEntitlementsName = 'MappNotificationService.entitlements';
+const notificationServiceSourceName = 'NotificationService.swift';
+const notificationServiceDeploymentTarget = '15.0';
+const notificationServiceSource = `import UserNotifications
+
+class NotificationService: UNNotificationServiceExtension {
+
+    var contentHandler: ((UNNotificationContent) -> Void)?
+
+    var bestAttemptContent: UNMutableNotificationContent?
+
+    override func didReceive(_ request: UNNotificationRequest, withContentHandler contentHandler: @escaping (UNNotificationContent) -> Void) {
+
+        self.contentHandler = contentHandler
+
+        bestAttemptContent = (request.content.mutableCopy() as? UNMutableNotificationContent)
+
+        print("categori identifier: ", request.content)
+
+        UNUserNotificationCenter.current().getNotificationCategories { (categories) in
+
+            if let categoryIdentifier = self.bestAttemptContent?.categoryIdentifier, let lc = request.content.userInfo["aps"] {
+
+                self.bestAttemptContent?.categoryIdentifier = categoryIdentifier + "_" + ((lc as! NSDictionary)["lc"] as! String)
+
+                let categoryExistArray = categories.filter { (category) -> Bool in
+                    category.identifier == self.bestAttemptContent?.categoryIdentifier
+                }
+
+                if categoryExistArray.isEmpty {
+                    self.bestAttemptContent?.categoryIdentifier = categoryIdentifier + "_en"
+                }
+            }
+
+            if let urlString = request.content.userInfo["ios_apx_media"], let fileUrl = URL(string: urlString as? String ?? "") {
+
+                URLSession.shared.downloadTask(with: fileUrl ) { (location, response, error) in
+
+                    if let location = location {
+                        let tmpDirectory = NSTemporaryDirectory()
+                        let tmpFile = "file://".appending(tmpDirectory).appending(fileUrl.lastPathComponent)
+                        let tmpUrl = URL(string: tmpFile)!
+
+                        try! FileManager.default.moveItem(at: location, to: tmpUrl)
+
+                        if let attachment = try? UNNotificationAttachment(identifier: "", url: tmpUrl) {
+                            self.bestAttemptContent?.attachments = [attachment]
+                        }
+                    }
+
+                    print("categori identifier: ", self.bestAttemptContent?.categoryIdentifier ?? "no category identifier")
+
+                    self.contentHandler!(self.bestAttemptContent!)
+
+                }.resume()
+
+            } else {
+                self.contentHandler!(self.bestAttemptContent!)
+            }
+        }
+    }
+
+    override func serviceExtensionTimeWillExpire() {
+        if let contentHandler = contentHandler, let bestAttemptContent = bestAttemptContent {
+            contentHandler(bestAttemptContent)
+        }
+    }
+}
+`;
 function buildAppoxeeConfig(props) {
     return {
         inapp: {
@@ -33,11 +106,96 @@ async function writeAppoxeeConfig(platformProjectRoot, props) {
     await fs_1.default.promises.writeFile(outputPath, plist_1.default.build(buildAppoxeeConfig(props)));
     return outputPath;
 }
+function buildNotificationServiceInfoPlist() {
+    return {
+        NSExtension: {
+            NSExtensionPointIdentifier: 'com.apple.usernotifications.service',
+            NSExtensionPrincipalClass: '$(PRODUCT_MODULE_NAME).NotificationService',
+        },
+    };
+}
+async function writeFileIfChanged(filePath, contents) {
+    const current = await fs_1.default.promises.readFile(filePath, 'utf8').catch(() => undefined);
+    if (current !== contents) {
+        await fs_1.default.promises.writeFile(filePath, contents);
+    }
+}
+async function writeNotificationServiceFiles(platformProjectRoot, bundleIdentifier) {
+    const extensionRoot = path_1.default.join(platformProjectRoot, notificationServiceTargetName);
+    const infoPlistPath = path_1.default.join(extensionRoot, notificationServiceInfoPlistName);
+    const entitlementsPath = path_1.default.join(extensionRoot, notificationServiceEntitlementsName);
+    const sourcePath = path_1.default.join(extensionRoot, notificationServiceSourceName);
+    await fs_1.default.promises.mkdir(extensionRoot, { recursive: true });
+    await writeFileIfChanged(infoPlistPath, plist_1.default.build(buildNotificationServiceInfoPlist()));
+    await writeFileIfChanged(entitlementsPath, plist_1.default.build(buildNotificationServiceEntitlements(bundleIdentifier)));
+    await writeFileIfChanged(sourcePath, notificationServiceSource);
+    return [infoPlistPath, entitlementsPath, sourcePath];
+}
+function getNotificationServiceBundleIdentifier(config) {
+    return `${config.ios.bundleIdentifier}.mappnotificationservice`;
+}
+function getAppGroupIdentifier(bundleIdentifier) {
+    return `group.${bundleIdentifier}`;
+}
+function buildNotificationServiceEntitlements(bundleIdentifier) {
+    return {
+        'com.apple.security.application-groups': [getAppGroupIdentifier(bundleIdentifier)],
+    };
+}
+function addNotificationServiceToEasConfig(config, bundleIdentifier) {
+    config.extra = config.extra ?? {};
+    config.extra.eas = config.extra.eas ?? {};
+    config.extra.eas.build = config.extra.eas.build ?? {};
+    config.extra.eas.build.experimental = config.extra.eas.build.experimental ?? {};
+    config.extra.eas.build.experimental.ios = config.extra.eas.build.experimental.ios ?? {};
+    const ios = config.extra.eas.build.experimental.ios;
+    const appExtensions = Array.isArray(ios.appExtensions) ? ios.appExtensions : [];
+    ios.appExtensions = [
+        ...appExtensions.filter((extension) => extension?.targetName !== notificationServiceTargetName),
+        { targetName: notificationServiceTargetName, bundleIdentifier },
+    ];
+}
+function addNotificationServiceTarget(project, bundleIdentifier) {
+    const existingTarget = config_plugins_1.IOSConfig.Target.getNativeTargets(project).find(([, target]) => (config_plugins_1.IOSConfig.XcodeUtils.unquote(target.name) === notificationServiceTargetName));
+    if (existingTarget) {
+        return;
+    }
+    project.hash.project.objects.PBXContainerItemProxy =
+        project.hash.project.objects.PBXContainerItemProxy ?? {};
+    project.hash.project.objects.PBXTargetDependency =
+        project.hash.project.objects.PBXTargetDependency ?? {};
+    const target = project.addTarget(notificationServiceTargetName, 'app_extension', notificationServiceTargetName, bundleIdentifier);
+    project.addBuildPhase([], 'PBXSourcesBuildPhase', 'Sources', target.uuid);
+    project.addBuildPhase([], 'PBXFrameworksBuildPhase', 'Frameworks', target.uuid);
+    const groupKey = project.pbxCreateGroup(notificationServiceTargetName, notificationServiceTargetName);
+    const { firstProject } = project.getFirstProject();
+    project.getPBXGroupByKey(firstProject.mainGroup).children.push({
+        value: groupKey,
+        comment: notificationServiceTargetName,
+    });
+    project.addFile(notificationServiceInfoPlistName, groupKey);
+    project.addFile(notificationServiceEntitlementsName, groupKey);
+    project.addSourceFile(notificationServiceSourceName, { target: target.uuid }, groupKey);
+    project.addFramework('UserNotifications.framework', { target: target.uuid });
+    for (const [, buildConfiguration] of config_plugins_1.IOSConfig.XcodeUtils.getBuildConfigurationsForListId(project, target.pbxNativeTarget.buildConfigurationList)) {
+        const settings = buildConfiguration.buildSettings;
+        settings.CODE_SIGN_STYLE = 'Automatic';
+        settings.CODE_SIGN_ENTITLEMENTS = `"${notificationServiceTargetName}/${notificationServiceEntitlementsName}"`;
+        settings.GENERATE_INFOPLIST_FILE = 'NO';
+        settings.INFOPLIST_FILE = `"${notificationServiceTargetName}/${notificationServiceInfoPlistName}"`;
+        settings.IPHONEOS_DEPLOYMENT_TARGET = notificationServiceDeploymentTarget;
+        settings.PRODUCT_BUNDLE_IDENTIFIER = `"${bundleIdentifier}"`;
+        settings.SWIFT_VERSION = '5.0';
+        settings.TARGETED_DEVICE_FAMILY = '"1,2"';
+    }
+}
 function appendUnique(values, value) {
     const result = Array.isArray(values) ? values.filter(item => typeof item === 'string') : [];
     return result.includes(value) ? result : [...result, value];
 }
 const withMappEngageIos = (config, props) => {
+    const notificationServiceBundleIdentifier = getNotificationServiceBundleIdentifier(config);
+    addNotificationServiceToEasConfig(config, notificationServiceBundleIdentifier);
     config = (0, config_plugins_1.withInfoPlist)(config, configWithPlist => {
         configWithPlist.modResults.UIBackgroundModes = appendUnique(configWithPlist.modResults.UIBackgroundModes, 'remote-notification');
         if (props.enableGeofencing) {
@@ -50,10 +208,12 @@ const withMappEngageIos = (config, props) => {
     config = (0, config_plugins_1.withEntitlementsPlist)(config, configWithEntitlements => {
         configWithEntitlements.modResults['aps-environment'] =
             configWithEntitlements.modResults['aps-environment'] ?? 'development';
+        configWithEntitlements.modResults['com.apple.security.application-groups'] = appendUnique(configWithEntitlements.modResults['com.apple.security.application-groups'], getAppGroupIdentifier(config.ios.bundleIdentifier));
         return configWithEntitlements;
     });
     config = (0, config_plugins_1.withDangerousMod)(config, ['ios', async (configWithFiles) => {
             await writeAppoxeeConfig(configWithFiles.modRequest.platformProjectRoot, props);
+            await writeNotificationServiceFiles(configWithFiles.modRequest.platformProjectRoot, config.ios.bundleIdentifier);
             return configWithFiles;
         }]);
     return (0, config_plugins_1.withXcodeProject)(config, configWithProject => {
@@ -71,6 +231,7 @@ const withMappEngageIos = (config, props) => {
                 targetUuid: target.uuid,
             });
         }
+        addNotificationServiceTarget(project, notificationServiceBundleIdentifier);
         return configWithProject;
     });
 };

package/specs/NativeRNMappPluginModule.js

@@ -16,7 +16,7 @@ export interface Spec extends TurboModule {
   getAlias(): Promise<string>;
   /** @deprecated Use engage(...). */
   engage2(): void;
-  engage(sdkKey: string, googleProjectId: string, server: string, appID: string, tenantID: string): void;
+  engage(sdkKey: string, googleProjectId: string, server: string, appID: string, tenantID: string): Promise<boolean>;
   engageTestServer(cepURl: string, sdkKey: string, googleProjectId: string, server: string, appID: string, tenantID: string): void;
   onInitCompletedListener(): Promise<boolean>;
   isReady(): Promise<boolean>;