react-native-mapp-plugin 1.4.2 → 2.0.0

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

@@ -11,8 +11,6 @@ import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.os.Build;
-import android.os.Handler;
-import android.os.Looper;
 import android.util.DisplayMetrics;
 import android.provider.Settings;
 
@@ -24,6 +22,7 @@ import androidx.core.content.ContextCompat;
 import com.appoxee.Appoxee;
 import com.appoxee.internal.model.response.DevicePayload;
 import com.appoxee.shared.InboxMessage;
+import com.appoxee.shared.MessageStatus;
 import com.appoxee.sdk.BuildConfig;
 import com.appoxee.shared.AppoxeeObserver;
 import com.appoxee.shared.AppoxeeOptions;
@@ -80,12 +79,15 @@ public class RNMappPluginModule extends NativeRNMappPluginModuleSpec implements
 
     public static final String NAME = "RNMappPluginModule";
     private static final int POST_NOTIFICATION_PERMISSION_REQUEST_CODE = 1001;
+    private static final int GEOFENCE_PERMISSION_REQUEST_CODE = 2001;
     private final ReactApplicationContext reactContext;
     private Map<Callback, String> mFeedSubscriberMap = new ConcurrentHashMap<>();
     private Map<Callback, Boolean> mCallbackWasCalledMap = new ConcurrentHashMap<>();
     private final Map<Integer, Promise> notificationPermissionPromises = new ConcurrentHashMap<>();
+    private final Map<Integer, Promise> geofencePermissionPromises = new ConcurrentHashMap<>();
     private Application application = null;
     private int nextNotificationPermissionRequestCode = POST_NOTIFICATION_PERMISSION_REQUEST_CODE;
+    private int nextGeofencePermissionRequestCode = GEOFENCE_PERMISSION_REQUEST_CODE;
 
     public RNMappPluginModule(ReactApplicationContext reactContext) {
         super(reactContext);
@@ -128,10 +130,32 @@ public class RNMappPluginModule extends NativeRNMappPluginModuleSpec implements
             promise.resolve(true);
             return;
         }
-        int fineLocation = ContextCompat.checkSelfPermission(reactContext, Manifest.permission.ACCESS_FINE_LOCATION);
-        int backgroundLocation = ContextCompat.checkSelfPermission(reactContext, Manifest.permission.ACCESS_BACKGROUND_LOCATION);
-        promise.resolve(fineLocation == PackageManager.PERMISSION_GRANTED
-                && backgroundLocation == PackageManager.PERMISSION_GRANTED);
+        if (hasFineLocationPermission() && hasBackgroundLocationPermission()) {
+            promise.resolve(true);
+            return;
+        }
+        Activity activity = getCurrentActivity();
+        if (!(activity instanceof PermissionAwareActivity)) {
+            promise.resolve(false);
+            return;
+        }
+        int requestCode = nextGeofencePermissionRequestCode++;
+        geofencePermissionPromises.put(requestCode, promise);
+        String[] permissions = hasFineLocationPermission()
+                ? new String[]{Manifest.permission.ACCESS_BACKGROUND_LOCATION}
+                : new String[]{Manifest.permission.ACCESS_FINE_LOCATION};
+        ((PermissionAwareActivity) activity).requestPermissions(permissions, requestCode, this);
+    }
+
+    private boolean hasFineLocationPermission() {
+        return ContextCompat.checkSelfPermission(reactContext, Manifest.permission.ACCESS_FINE_LOCATION)
+                == PackageManager.PERMISSION_GRANTED;
+    }
+
+    private boolean hasBackgroundLocationPermission() {
+        return Build.VERSION.SDK_INT < Build.VERSION_CODES.Q
+                || ContextCompat.checkSelfPermission(reactContext, Manifest.permission.ACCESS_BACKGROUND_LOCATION)
+                == PackageManager.PERMISSION_GRANTED;
     }
 
     @ReactMethod
@@ -168,6 +192,31 @@ public class RNMappPluginModule extends NativeRNMappPluginModuleSpec implements
 
     @Override
     public boolean onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+        Promise geofencePromise = geofencePermissionPromises.remove(requestCode);
+        if (geofencePromise != null) {
+            boolean granted = grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED;
+            if (!granted) {
+                geofencePromise.resolve(false);
+                return true;
+            }
+            if (!hasBackgroundLocationPermission()) {
+                Activity activity = getCurrentActivity();
+                if (!(activity instanceof PermissionAwareActivity)) {
+                    geofencePromise.resolve(false);
+                    return true;
+                }
+                int backgroundRequestCode = nextGeofencePermissionRequestCode++;
+                geofencePermissionPromises.put(backgroundRequestCode, geofencePromise);
+                ((PermissionAwareActivity) activity).requestPermissions(
+                        new String[]{Manifest.permission.ACCESS_BACKGROUND_LOCATION},
+                        backgroundRequestCode,
+                        this
+                );
+                return true;
+            }
+            geofencePromise.resolve(hasFineLocationPermission());
+            return true;
+        }
         Promise promise = notificationPermissionPromises.remove(requestCode);
         if (promise == null) {
             return false;
@@ -287,11 +336,24 @@ public class RNMappPluginModule extends NativeRNMappPluginModuleSpec implements
         FirebaseMessaging.getInstance().getToken().addOnCompleteListener(new OnCompleteListener<String>() {
             @Override
             public void onComplete(@NonNull Task<String> task) {
-                promise.resolve(task.getResult());
+                settleTokenTask(task, promise);
             }
         });
     }
 
+    static void settleTokenTask(@NonNull Task<String> task, @NonNull Promise promise) {
+        if (task.isSuccessful()) {
+            promise.resolve(task.getResult());
+            return;
+        }
+
+        Exception exception = task.getException();
+        String message = exception != null && exception.getMessage() != null
+                ? exception.getMessage()
+                : "FCM registration failed";
+        promise.reject("FCM_REGISTRATION_FAILED", message, exception);
+    }
+
     // -------------------------------------------------------------------------
     // Alias
     // -------------------------------------------------------------------------
@@ -318,7 +380,7 @@ public class RNMappPluginModule extends NativeRNMappPluginModuleSpec implements
     @ReactMethod
     @Deprecated(forRemoval = true)
     public void engage2() {
-        Appoxee.engage(application,null);
+        MappEngagementDispatcher.engageAsync(Objects.requireNonNull(application), null, null);
     }
 
     @ReactMethod
@@ -326,9 +388,7 @@ public class RNMappPluginModule extends NativeRNMappPluginModuleSpec implements
         AppoxeeOptions opt = createOptions(server, sdkKey, appID, tenantID);
         opt.setNotificationMode(NotificationMode.BACKGROUND_AND_FOREGROUND);
 
-        new Handler(Looper.getMainLooper()).post(() -> {
-            Appoxee.engage(Objects.requireNonNull(application), opt);
-
+        MappEngagementDispatcher.engageAsync(Objects.requireNonNull(application), opt, () -> {
             Appoxee.instance().subscribe(new AppoxeeObserver() {
                 @Override
                 public void onReadyStatusChanged(boolean status, MappResult<DevicePayload> result) {
@@ -344,9 +404,7 @@ public class RNMappPluginModule extends NativeRNMappPluginModuleSpec implements
                                  String appID, String tenantID) {
         AppoxeeOptions opt = createOptions(server, sdkKey, appID, tenantID);
 
-        new Handler(Looper.getMainLooper()).post(() -> {
-            Appoxee.engage(Objects.requireNonNull(application), opt);
-
+        MappEngagementDispatcher.engageAsync(Objects.requireNonNull(application), opt, () -> {
             Appoxee.instance().subscribe(new AppoxeeObserver() {
                 @Override
                 public void onReadyStatusChanged(boolean status, MappResult<DevicePayload> result) {
@@ -738,33 +796,41 @@ public class RNMappPluginModule extends NativeRNMappPluginModuleSpec implements
         });
     }
 
-    /**
-     * Stubbed: InApp statistics internal classes were removed in v7.
-     * The @ReactMethod signature is preserved to avoid breaking the JS public API.
-     */
     @ReactMethod
     public void inAppMarkAsRead(double templateId, String eventId) {
-        // no-op in v7
+        updateInboxMessageStatus((long) templateId, MessageStatus.READ);
     }
 
-    /**
-     * @see #inAppMarkAsRead
-     */
     @ReactMethod
     public void inAppMarkAsUnRead(double templateId, String eventId) {
-        // no-op in v7
+        updateInboxMessageStatus((long) templateId, MessageStatus.UNREAD);
     }
 
-    /**
-     * @see #inAppMarkAsRead
-     */
     @ReactMethod
     public void inAppMarkAsDeleted(double templateId, String eventId) {
-        // no-op in v7
+        updateInboxMessageStatus((long) templateId, MessageStatus.DELETED);
     }
 
     /**
-     * @see #inAppMarkAsRead
+     * Mapp Engage v7 updates inbox state using the SDK's InboxMessage object,
+     * so fetch the message by template ID before sending the status update.
+     * The legacy eventId argument is not required by the v7 API.
+     */
+    private void updateInboxMessageStatus(long templateId, MessageStatus status) {
+        final Appoxee appoxee = Appoxee.instance();
+        appoxee.fetchInboxMessage(templateId).enqueue(fetchResult -> {
+            if (fetchResult == null || !fetchResult.isSuccess() || fetchResult.getData() == null) {
+                return;
+            }
+
+            appoxee.updateInboxMessageStatus(fetchResult.getData(), status).enqueue(updateResult -> {
+            });
+        });
+    }
+
+    /**
+     * Stubbed: InApp statistics internal classes were removed in v7.
+     * The @ReactMethod signature is preserved to avoid breaking the JS public API.
      */
     @ReactMethod
     public void triggerStatistic(double templateId, String originalEventId,

package/app.plugin.js

@@ -0,0 +1,4 @@
+'use strict';
+
+module.exports = require('./plugin/build').withMappEngage;
+

package/ios/RNMappEventEmmiter.m

@@ -43,6 +43,11 @@ NSString *const MappRNInappMessage = @"com.mapp.inapp_message";
 
 -(void)startObserving {
     hasListeners = YES;
+    NSArray *events = [self.pendingEvents copy];
+    [self.pendingEvents removeAllObjects];
+    for (NSDictionary *event in events) {
+        [super sendEventWithName:event[@"name"] body:event[@"body"]];
+    }
 }
 
 -(void)stopObserving {
@@ -50,7 +55,22 @@ NSString *const MappRNInappMessage = @"com.mapp.inapp_message";
 }
 
 - (NSArray<NSString *> *)supportedEvents {
-    return @[MappRNInitEvent, MappRNInboxMessageReceived, MappRNInboxMessagesReceived, MappRNLocationEnter, MappRNCustomLinkReceived, MappRNDeepLinkReceived, MappRNRichMessage,MappRNPushMessage, MappErrorMessage,MappRNInappMessage];
+    return @[MappRNInitEvent, MappRNInboxMessageReceived, MappRNInboxMessagesReceived, MappRNLocationEnter, MappRNLocationExit, MappRNCustomLinkReceived, MappRNDeepLinkReceived, MappRNRichMessage,MappRNPushMessage, MappErrorMessage,MappRNInappMessage];
+}
+
+- (void)sendEventWithName:(NSString *)name body:(id)body {
+    if (hasListeners) {
+        [super sendEventWithName:name body:body];
+        return;
+    }
+    if (!self.pendingEvents) {
+        self.pendingEvents = [NSMutableArray array];
+    }
+    // Bound the cold-start queue so repeated background callbacks cannot grow it forever.
+    if (self.pendingEvents.count >= 50) {
+        [self.pendingEvents removeObjectAtIndex:0];
+    }
+    [self.pendingEvents addObject:@{ @"name": name, @"body": body ?: [NSNull null] }];
 }
 
 - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary<NSKeyValueChangeKey,id> *)change context:(void *)context {
@@ -224,4 +244,3 @@ NSString *const MappRNInappMessage = @"com.mapp.inapp_message";
 }
 @end
 
-

package/ios/RNMappPluginModule.h

@@ -4,7 +4,26 @@
 #import "AppoxeeInapp.h"
 #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 >
+@interface RNMappPluginModule : NSObject <RCTBridgeModule,AppoxeeInappDelegate, AppoxeeNotificationDelegate, AppoxeeLocationManagerDelegate
+#if RCT_NEW_ARCH_ENABLED && RNMAPP_HAS_TURBO_MODULE_SPEC
+, NativeRNMappPluginModuleSpec
+#endif
+>
 
 @end

package/ios/{RNMappPluginModule.m → RNMappPluginModule.mm}

@@ -1,9 +1,32 @@
 #import "RNMappPluginModule.h"
 #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 && RNMAPP_HAS_TURBO_MODULE_SPEC
+- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:
+    (const facebook::react::ObjCTurboModule::InitParams &)params
+{
+    return std::make_shared<facebook::react::NativeRNMappPluginModuleSpecJSI>(params);
+}
+#endif
+
 
 - (void)setBridge:(RCTBridge *)bridge {
     [RNMappEventEmmiter shared].bridge = bridge;
@@ -35,20 +58,87 @@ RCT_EXPORT_METHOD(removeListeners:(NSInteger)count) {
     [[RNMappEventEmmiter shared] removeListeners:count];
 }
 
-#pragma mark Exported methods - Notifications
+// Cross-platform TurboModule methods that need iOS-specific behavior or have no
+// meaningful iOS equivalent. Keeping them here makes the generated spec safe to
+// invoke under the New Architecture instead of relying on legacy interop.
+RCT_EXPORT_METHOD(requestGeofenceLocationPermission:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
+    CLAuthorizationStatus status = [CLLocationManager authorizationStatus];
+    if (status == kCLAuthorizationStatusNotDetermined) {
+        [[[CLLocationManager alloc] init] requestAlwaysAuthorization];
+    }
+    resolve(@(status == kCLAuthorizationStatusAuthorizedAlways));
+}
+
+RCT_EXPORT_METHOD(requestPostNotificationPermission:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
+    [[UNUserNotificationCenter currentNotificationCenter]
+        requestAuthorizationWithOptions:(UNAuthorizationOptionAlert | UNAuthorizationOptionBadge | UNAuthorizationOptionSound)
+        completionHandler:^(BOOL granted, NSError *error) {
+            if (error) reject(@"NOTIFICATION_PERMISSION_ERROR", @"Unable to request notification permission", error);
+            else resolve(@(granted));
+        }];
+}
+
+RCT_EXPORT_METHOD(setRemoteMessage:(NSString *)msgJson resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
+    // iOS delivery is handled by APNs/Appoxee auto-integration, not FCM RemoteMessage JSON.
+    resolve(@NO);
+}
+
+RCT_EXPORT_METHOD(isPushFromMapp:(NSString *)msgJson resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
+    resolve(@NO);
+}
 
-RCT_EXPORT_METHOD(engage: (NSString *)sdkKey projectId: (NSString *)projectId cepUrl:(NSString *)cepUrl appID:(NSString *)appID tenantID:(NSString *)tenantID) {
-    SERVER serv = [self getServerKeyFor:cepUrl];
-    [[Appoxee shared] engageWithLaunchOptions:nil andDelegate:[RNMappEventEmmiter shared] andSDKID:sdkKey with: serv];
+RCT_EXPORT_METHOD(getToken:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
+    reject(@"APNS_TOKEN_UNAVAILABLE", @"Mapp auto-integration owns the native APNs token on iOS", nil);
 }
 
-RCT_REMAP_METHOD(autoengage,engage:(NSString *) server) {
+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];
+}
+
+RCT_EXPORT_METHOD(onInitCompletedListener:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
+    resolve(@([[Appoxee shared] isReady]));
+}
+
+RCT_EXPORT_METHOD(setAttributeBoolean:(NSString *)key value:(BOOL)value) {
+    [[Appoxee shared] setNumberValue:@(value) forKey:key withCompletionHandler:nil];
+}
+
+RCT_EXPORT_METHOD(removeAttribute:(NSString *)attribute) {
+    // The vendored iOS SDK has no single-field removal API.
+}
+
+RCT_EXPORT_METHOD(getDeviceDmcInfo:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
+    [self getDeviceInfo:resolve reject:reject];
+}
+
+RCT_EXPORT_METHOD(lockScreenOrientation:(NSInteger)orientation) {}
+
+RCT_EXPORT_METHOD(startGeofencing:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
+    [[AppoxeeLocationManager shared] enableLocationMonitoring];
+    resolve(@"started");
+}
+
+RCT_EXPORT_METHOD(stopGeofencing:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
+    [[AppoxeeLocationManager shared] disableLocationMonitoring];
+    resolve(@"stopped");
+}
+
+RCT_EXPORT_METHOD(triggerStatistic:(NSInteger)templateId originalEventId:(NSString *)originalEventId trackingKey:(NSString *)trackingKey displayMillis:(NSInteger)displayMillis reason:(NSString *)reason link:(NSString *)link) {}
+RCT_EXPORT_METHOD(addAndroidListener:(NSString *)eventName) {}
+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) {
     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(getAlias:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
+RCT_EXPORT_METHOD(getAlias:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
     [[Appoxee shared] getDeviceAliasWithCompletionHandler:^(NSError * _Nullable appoxeeError, id  _Nullable data) {
         if (appoxeeError == nil && data != nil) {
             resolve(data);
@@ -58,24 +148,34 @@ RCT_EXPORT_METHOD(getAlias:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseR
     }];
 }
 
-RCT_EXPORT_METHOD(setAlias:(NSString *) alias) {
+RCT_EXPORT_METHOD(setAlias:(NSString *) alias resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
     [[Appoxee shared] setDeviceAlias:alias withCompletionHandler:^(NSError * _Nullable appoxeeError, id  _Nullable data) {
         if (appoxeeError != nil) {
-            NSLog(@"%@", appoxeeError.debugDescription);
+            reject(@"SET_ALIAS_ERROR", @"Failed to set alias", appoxeeError);
+        } else {
+            resolve(@YES);
         }
     }];
 }
 
-RCT_EXPORT_METHOD(setAliasWithResend:(NSString *) alias withResendAttributes:(BOOL) resendAttributes) {
+RCT_EXPORT_METHOD(setAliasWithResend:(NSString *) alias resendCustomAttributes:(BOOL) resendAttributes resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
     [[Appoxee shared] setDeviceAlias:alias withResendAttributes:resendAttributes withCompletionHandler:^(NSError * _Nullable appoxeeError, id  _Nullable data) {
         if (appoxeeError != nil) {
-            NSLog(@"%@", appoxeeError.debugDescription);
+            reject(@"SET_ALIAS_ERROR", @"Failed to set alias", appoxeeError);
+        } else {
+            resolve(@YES);
         }
     }];
 }
 
-RCT_EXPORT_METHOD(setToken:(NSString *) token) {
-    [[Appoxee shared] didRegisterForRemoteNotificationsWithDeviceToken:[[NSData alloc] initWithBase64EncodedString:token options:NSUTF8StringEncoding]];
+RCT_EXPORT_METHOD(setToken:(NSString *) token resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
+    NSData *deviceToken = [[NSData alloc] initWithBase64EncodedString:token options:0];
+    if (!deviceToken) {
+        reject(@"INVALID_APNS_TOKEN", @"setToken expects a base64-encoded native APNs device token, not an Expo push token", nil);
+        return;
+    }
+    [[Appoxee shared] didRegisterForRemoteNotificationsWithDeviceToken:deviceToken];
+    resolve(@YES);
 }
 
 RCT_EXPORT_METHOD(removeDeviceAlias) {
@@ -90,11 +190,11 @@ RCT_EXPORT_METHOD(logOut: (BOOL) pushEnabled) {
     [[Appoxee shared] logoutWithOptin:pushEnabled];
 }
 
-RCT_EXPORT_METHOD(isReady:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
+RCT_EXPORT_METHOD(isReady:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
     resolve(@([[Appoxee shared] isReady]));
 }
 
-RCT_EXPORT_METHOD(isPushEnabled:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
+RCT_EXPORT_METHOD(isPushEnabled:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
     [[Appoxee shared] isPushEnabled:^(NSError * _Nullable appoxeeError, id  _Nullable data) {
         if (appoxeeError == nil) {
             resolve(data);
@@ -132,15 +232,17 @@ RCT_EXPORT_METHOD(incrementNumericKey: (NSString *) key value: (NSNumber *) numb
     }];
 }
 
-RCT_EXPORT_METHOD(setAttributes: (NSDictionary *)attributes)  {
+RCT_EXPORT_METHOD(setAttributes: (NSDictionary *)attributes resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)  {
     [[Appoxee shared] setCustomAttributtes:attributes withCompletionHandler:^(NSError * _Nullable appoxeeError, id  _Nullable data) {
         if (appoxeeError) {
-            NSLog(@"%@", appoxeeError.debugDescription);
+            reject(@"SET_ATTRIBUTES_ERROR", @"Failed to set attributes", appoxeeError);
+        } else {
+            resolve(@YES);
         }
     }];
 }
 
-RCT_EXPORT_METHOD(getAttributes: (NSArray *)attributes and:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)  {
+RCT_EXPORT_METHOD(getAttributes: (NSArray *)attributes resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)  {
     [[Appoxee shared] getCustomAttributes:attributes withCompletionHandler:^(NSError * _Nullable appoxeeError, id  _Nullable data) {
         if (appoxeeError) {
             NSLog(@"%@", appoxeeError.debugDescription);
@@ -157,8 +259,8 @@ RCT_EXPORT_METHOD(setAttribute: (NSString *)key value: (NSString *) value)  {
     }];
 }
 
-RCT_EXPORT_METHOD(setAttributeInt: (NSString *)key value: (NSNumber *) value) {
-    [[Appoxee shared] setNumberValue:value forKey:key withCompletionHandler:^(NSError * _Nullable appoxeeError, id  _Nullable data) {
+RCT_EXPORT_METHOD(setAttributeInt: (NSString *)key value: (NSInteger) value) {
+    [[Appoxee shared] setNumberValue:@(value) forKey:key withCompletionHandler:^(NSError * _Nullable appoxeeError, id  _Nullable data) {
         if(appoxeeError != nil) {
             NSLog(@"%@", appoxeeError.debugDescription);
         }
@@ -181,7 +283,7 @@ RCT_EXPORT_METHOD(addTag: (NSString *) tag) {
     }];
 }
 
-RCT_EXPORT_METHOD(getTags:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
+RCT_EXPORT_METHOD(getTags:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
     [[Appoxee shared] fetchDeviceTags:^(NSError * _Nullable appoxeeError, id  _Nullable data) {
         if (!appoxeeError && [data isKindOfClass:[NSArray class]]) {
             NSArray *deviceTags = (NSArray *)data;
@@ -192,7 +294,7 @@ RCT_EXPORT_METHOD(getTags:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRe
     }];
 }
 
-RCT_EXPORT_METHOD(getDeviceInfo:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
+RCT_EXPORT_METHOD(getDeviceInfo:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
     [[Appoxee shared] deviceInformationwithCompletionHandler:^(NSError * _Nullable appoxeeError, id  _Nullable data) {
         if (!appoxeeError && [data isKindOfClass:[APXClientDevice class]]) {
             APXClientDevice *device = (APXClientDevice *)data;
@@ -204,7 +306,7 @@ RCT_EXPORT_METHOD(getDeviceInfo:(RCTPromiseResolveBlock)resolve rejecter:(RCTPro
     }];
 }
 
-RCT_EXPORT_METHOD(getAttributeStringValue: (NSString *) key resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
+RCT_EXPORT_METHOD(getAttributeStringValue: (NSString *) key resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
     [[Appoxee shared] fetchCustomFieldByKey:key withCompletionHandler:^(NSError * _Nullable appoxeeError, id  _Nullable data) {
         NSLog(@"%@", data);
         if (!appoxeeError && [data isKindOfClass:[NSDictionary class]]) {
@@ -245,23 +347,18 @@ RCT_EXPORT_METHOD(clearNotifications) {
     [[UNUserNotificationCenter currentNotificationCenter] removeAllDeliveredNotifications];
 }
 
-RCT_EXPORT_METHOD(clearNotification: (NSNumber *) index ){
-    [[UNUserNotificationCenter currentNotificationCenter] removeDeliveredNotificationsWithIdentifiers: @[[index stringValue]]];
+RCT_EXPORT_METHOD(clearNotification: (NSInteger) index ){
+    [[UNUserNotificationCenter currentNotificationCenter] removeDeliveredNotificationsWithIdentifiers: @[[NSString stringWithFormat:@"%ld", (long)index]]];
 }
 
 #pragma mark Exported methods - Inapp
 
-RCT_REMAP_METHOD(engageInapp,engageInapp:(NSString *) server) {
-    INAPPSERVER serv = [self getInappServerKeyFor:server];
-    [[AppoxeeInapp shared] engageWithDelegate:[RNMappEventEmmiter shared] with:serv];
-}
-
-RCT_EXPORT_METHOD(fetchInboxMessage: (RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
+RCT_EXPORT_METHOD(fetchInboxMessage: (RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
     [[AppoxeeInapp shared] fetchAPXInBoxMessages];
     resolve(@"Fetching, set event listener for iOS");
 }
 
-RCT_EXPORT_METHOD(fetchLatestInboxMessage: (RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
+RCT_EXPORT_METHOD(fetchLatestInboxMessage: (RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
     [[AppoxeeInapp shared] fetchAPXInBoxMessages];
     resolve(@"Fetching, set event listener for iOS");
 }
@@ -270,28 +367,28 @@ RCT_EXPORT_METHOD(triggerInApp: (NSString *) event) {
     [[AppoxeeInapp shared] reportInteractionEventWithName:event andAttributes:nil];
 }
 
-RCT_EXPORT_METHOD(inAppMarkAsRead: (NSNumber * _Nonnull) templateId event: (NSString * _Nonnull) eventId) {
-    APXInBoxMessage *message = [[RNMappEventEmmiter shared] getMessageWith:templateId event:eventId];
+RCT_EXPORT_METHOD(inAppMarkAsRead: (NSInteger) templateId eventId: (NSString * _Nonnull) eventId) {
+    APXInBoxMessage *message = [[RNMappEventEmmiter shared] getMessageWith:@(templateId) event:eventId];
     if (message) {
         [message markAsRead];
     }
 }
 
-RCT_EXPORT_METHOD(inAppMarkAsUnRead: (NSNumber * _Nonnull) templateId event: (NSString * _Nonnull) eventId) {
-    APXInBoxMessage *message = [[RNMappEventEmmiter shared] getMessageWith:templateId event:eventId];
+RCT_EXPORT_METHOD(inAppMarkAsUnRead: (NSInteger) templateId eventId: (NSString * _Nonnull) eventId) {
+    APXInBoxMessage *message = [[RNMappEventEmmiter shared] getMessageWith:@(templateId) event:eventId];
     if (message) {
         [message markAsUnread];
     }
 }
 
-RCT_EXPORT_METHOD(inAppMarkAsDeleted: (NSNumber * _Nonnull) templateId event: (NSString * _Nonnull) eventId) {
-    APXInBoxMessage *message = [[RNMappEventEmmiter shared] getMessageWith:templateId event:eventId];
+RCT_EXPORT_METHOD(inAppMarkAsDeleted: (NSInteger) templateId eventId: (NSString * _Nonnull) eventId) {
+    APXInBoxMessage *message = [[RNMappEventEmmiter shared] getMessageWith:@(templateId) event:eventId];
     if (message) {
         [message markAsDeleted];
     }
 }
 
-RCT_EXPORT_METHOD(isDeviceRegistered:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
+RCT_EXPORT_METHOD(isDeviceRegistered:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
     resolve(@([[Appoxee shared] isReady]));
 }
 
@@ -371,4 +468,3 @@ RCT_EXPORT_METHOD(stopGeoFencing) {
 
 
 @end
-