react-native-mapp-plugin 1.4.0 → 1.4.1

package/CHANGELOG.md

@@ -1,3 +1,14 @@
+## Version 1.4.1
+
+***Dependency Updates***
+
+- Android: Aligned with Mapp Engage Android SDK 7.1.1.
+- iOS: Aligned with Mapp Engage Inapp iOS SDK 6.0.11, which provides improved in-app statistics.
+
+***Architecture***
+
+- Android: Updated plugin to support New Architecture (TurboModule).
+
 ## Version 1.4.0
 
 ***Bug Fixes***

package/Mapp.js

@@ -6,8 +6,10 @@ import { NativeModules, Platform } from "react-native";
 import CustomEvent from "./CustomEvent.js";
 
 import MappEventEmitter from "./MappEventEmitter.js";
+import NativeRNMappPluginModule from "./specs/NativeRNMappPluginModule";
 
-const { RNMappPluginModule } = NativeModules;
+const RNMappPluginModule =
+  NativeRNMappPluginModule || NativeModules.RNMappPluginModule;
 const EventEmitter = new MappEventEmitter();
 
 const IOS_INIT = "com.mapp.init";

package/MappEventEmitter.js

@@ -7,7 +7,10 @@ import {
   Platform
 } from 'react-native';
 
-const RNMappPluginModule = NativeModules.RNMappPluginModule;
+import NativeRNMappPluginModule from './specs/NativeRNMappPluginModule';
+
+const RNMappPluginModule =
+  NativeRNMappPluginModule || NativeModules.RNMappPluginModule;
 
 class MappEventEmitter extends NativeEventEmitter {
 

package/android/build.gradle

@@ -1,15 +1,16 @@
-plugins {
-    id("com.android.library")
-    id("com.facebook.react") // This is required for New Architecture & Codegen
+apply plugin: "com.android.library"
+
+def getExtOrDefault = { name, fallback ->
+    rootProject.ext.has(name) ? rootProject.ext.get(name) : fallback
 }
 
 android {
     namespace "com.reactlibrary"
-    compileSdk = 36
+    compileSdk = getExtOrDefault("compileSdkVersion", 36)
 
     defaultConfig {
-        minSdk = 24
-        targetSdk = 36
+        minSdk = getExtOrDefault("minSdkVersion", 24)
+        targetSdk = getExtOrDefault("targetSdkVersion", 36)
         versionCode = 1
         versionName = "1.0"
     }
@@ -28,25 +29,34 @@ android {
 }
 
 dependencies {
-    implementation "com.facebook.react:react-android:0.84.1"
-    implementation 'com.google.code.gson:gson:2.13.2'
+    //noinspection GradleDynamicVersion
+    implementation "com.facebook.react:react-native:+"
+    constraints {
+        implementation("androidx.core:core") {
+            version {
+                strictly "1.18.0"
+            }
+            because "androidx.core 1.19.0 requires AGP 9.1+, while React Native dependencies currently require the app to stay on AGP 8"
+        }
+        implementation("androidx.core:core-ktx") {
+            version {
+                strictly "1.18.0"
+            }
+            because "androidx.core-ktx 1.19.0 requires AGP 9.1+, while React Native dependencies currently require the app to stay on AGP 8"
+        }
+    }
+    implementation 'com.google.code.gson:gson:2.14.0'
     implementation 'androidx.appcompat:appcompat:1.7.1'
-    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.10.0'
-    implementation platform('com.google.firebase:firebase-bom:34.11.0')
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.7'
+    implementation platform('com.google.firebase:firebase-bom:33.16.0')
     implementation('com.google.firebase:firebase-messaging')
     api('com.google.android.gms:play-services-location:21.3.0')
-    implementation 'androidx.media:media:1.7.1'
+    implementation 'androidx.media:media:1.8.0'
     implementation 'androidx.legacy:legacy-support-v13:1.0.0'
-    implementation("com.mapp.sdk:engage-android:7.0.2")
+    implementation("com.mapp.sdk:engage-android:7.1.1")
     testImplementation 'junit:junit:4.13.2'
-    testImplementation 'org.mockito:mockito-core:5.14.2'
+    testImplementation 'org.mockito:mockito-core:5.23.0'
     testImplementation 'org.mockito:mockito-inline:5.2.0'
-    testImplementation 'org.json:json:20240303'
-    testImplementation 'org.robolectric:robolectric:4.13'
-}
-
-react {
-    jsRootDir = rootDir
-    libraryName = "RNMappPlugin"
-    codegenJavaPackageName = "com.reactlibrary"
+    testImplementation 'org.json:json:20260522'
+    testImplementation 'org.robolectric:robolectric:4.16.1'
 }

package/android/settings.gradle

@@ -5,7 +5,7 @@ pluginManagement {
         gradlePluginPortal()
     }
     plugins {
-        id("com.android.library") version("9.1.0") // 👈 for library
+        id("com.android.library") version("9.1.1") // 👈 for library
         id("com.facebook.react") version("0.84.1")  // 👈 for React Native
     }
 }

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

@@ -0,0 +1,232 @@
+
+/**
+ * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+ *
+ * Do not edit this file as changes may cause incorrect behavior and will be lost
+ * once the code is regenerated.
+ *
+ * @generated by codegen project: GenerateModuleJavaSpec.js
+ *
+ * @nolint
+ */
+
+package com.reactlibrary;
+
+import com.facebook.proguard.annotations.DoNotStrip;
+import com.facebook.react.bridge.Promise;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReactContextBaseJavaModule;
+import com.facebook.react.bridge.ReactMethod;
+import com.facebook.react.bridge.ReadableArray;
+import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.turbomodule.core.interfaces.TurboModule;
+import javax.annotation.Nonnull;
+
+public abstract class NativeRNMappPluginModuleSpec extends ReactContextBaseJavaModule implements TurboModule {
+  public static final String NAME = "RNMappPluginModule";
+
+  public NativeRNMappPluginModuleSpec(ReactApplicationContext reactContext) {
+    super(reactContext);
+  }
+
+  @Override
+  public @Nonnull String getName() {
+    return NAME;
+  }
+
+  @ReactMethod
+  @DoNotStrip
+  public abstract void requestGeofenceLocationPermission(Promise promise);
+
+  @ReactMethod
+  @DoNotStrip
+  public abstract void requestPostNotificationPermission(Promise promise);
+
+  @ReactMethod
+  @DoNotStrip
+  public abstract void setRemoteMessage(String msgJson, Promise promise);
+
+  @ReactMethod
+  @DoNotStrip
+  public abstract void isPushFromMapp(String msgJson, Promise promise);
+
+  @ReactMethod
+  @DoNotStrip
+  public abstract void setToken(String token, Promise promise);
+
+  @ReactMethod
+  @DoNotStrip
+  public abstract void getToken(Promise promise);
+
+  @ReactMethod
+  @DoNotStrip
+  public abstract void setAlias(String alias, Promise promise);
+
+  @ReactMethod
+  @DoNotStrip
+  public abstract void setAliasWithResend(String alias, boolean resendCustomAttributes, Promise promise);
+
+  @ReactMethod
+  @DoNotStrip
+  public abstract void getAlias(Promise promise);
+
+  @ReactMethod
+  @DoNotStrip
+  public abstract void engage2();
+
+  @ReactMethod
+  @DoNotStrip
+  public abstract void engage(String sdkKey, String googleProjectId, String server, String appID, String tenantID);
+
+  @ReactMethod
+  @DoNotStrip
+  public abstract void engageTestServer(String cepURl, String sdkKey, String googleProjectId, String server, String appID, String tenantID);
+
+  @ReactMethod
+  @DoNotStrip
+  public abstract void onInitCompletedListener(Promise promise);
+
+  @ReactMethod
+  @DoNotStrip
+  public abstract void isReady(Promise promise);
+
+  @ReactMethod
+  @DoNotStrip
+  public abstract void setPushEnabled(boolean optIn);
+
+  @ReactMethod
+  @DoNotStrip
+  public abstract void isPushEnabled(Promise promise);
+
+  @ReactMethod
+  @DoNotStrip
+  public abstract void setAttributes(ReadableMap attributes, Promise promise);
+
+  @ReactMethod
+  @DoNotStrip
+  public abstract void getAttributes(ReadableArray keys, Promise promise);
+
+  @ReactMethod
+  @DoNotStrip
+  public abstract void setAttribute(String key, String value);
+
+  @ReactMethod
+  @DoNotStrip
+  public abstract void setAttributeBoolean(String key, boolean value);
+
+  @ReactMethod
+  @DoNotStrip
+  public abstract void setAttributeInt(String key, double value);
+
+  @ReactMethod
+  @DoNotStrip
+  public abstract void removeAttribute(String attribute);
+
+  @ReactMethod
+  @DoNotStrip
+  public abstract void getAttributeStringValue(String key, Promise promise);
+
+  @ReactMethod
+  @DoNotStrip
+  public abstract void addTag(String tag);
+
+  @ReactMethod
+  @DoNotStrip
+  public abstract void removeTag(String tag);
+
+  @ReactMethod
+  @DoNotStrip
+  public abstract void getTags(Promise promise);
+
+  @ReactMethod
+  @DoNotStrip
+  public abstract void getDeviceInfo(Promise promise);
+
+  @ReactMethod
+  @DoNotStrip
+  public abstract void getDeviceDmcInfo(Promise promise);
+
+  @ReactMethod
+  @DoNotStrip
+  public abstract void isDeviceRegistered(Promise promise);
+
+  @ReactMethod
+  @DoNotStrip
+  public abstract void lockScreenOrientation(double orientation);
+
+  @ReactMethod
+  @DoNotStrip
+  public abstract void removeBadgeNumber();
+
+  @ReactMethod
+  @DoNotStrip
+  public abstract void startGeofencing(Promise promise);
+
+  @ReactMethod
+  @DoNotStrip
+  public abstract void stopGeofencing(Promise promise);
+
+  @ReactMethod
+  @DoNotStrip
+  public abstract void startGeoFencing();
+
+  @ReactMethod
+  @DoNotStrip
+  public abstract void stopGeoFencing();
+
+  @ReactMethod
+  @DoNotStrip
+  public abstract void fetchLatestInboxMessage(Promise promise);
+
+  @ReactMethod
+  @DoNotStrip
+  public abstract void fetchInboxMessage(Promise promise);
+
+  @ReactMethod
+  @DoNotStrip
+  public abstract void triggerInApp(String key);
+
+  @ReactMethod
+  @DoNotStrip
+  public abstract void inAppMarkAsRead(double templateId, String eventId);
+
+  @ReactMethod
+  @DoNotStrip
+  public abstract void inAppMarkAsUnRead(double templateId, String eventId);
+
+  @ReactMethod
+  @DoNotStrip
+  public abstract void inAppMarkAsDeleted(double templateId, String eventId);
+
+  @ReactMethod
+  @DoNotStrip
+  public abstract void triggerStatistic(double templateId, String originalEventId, String trackingKey, double displayMillis, String reason, String link);
+
+  @ReactMethod
+  @DoNotStrip
+  public abstract void addAndroidListener(String eventName);
+
+  @ReactMethod
+  @DoNotStrip
+  public abstract void removeAndroidListeners(double count);
+
+  @ReactMethod
+  @DoNotStrip
+  public abstract void addListener(String eventName);
+
+  @ReactMethod
+  @DoNotStrip
+  public abstract void removeListeners(double count);
+
+  @ReactMethod
+  @DoNotStrip
+  public abstract void clearNotifications();
+
+  @ReactMethod
+  @DoNotStrip
+  public abstract void clearNotification(double id);
+
+  @ReactMethod
+  @DoNotStrip
+  public abstract void logOut(boolean pushEnabled);
+}

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

@@ -23,7 +23,7 @@ import androidx.core.content.ContextCompat;
 
 import com.appoxee.Appoxee;
 import com.appoxee.internal.model.response.DevicePayload;
-import com.appoxee.internal.model.response.inbox.InboxMessage;
+import com.appoxee.shared.InboxMessage;
 import com.appoxee.sdk.BuildConfig;
 import com.appoxee.shared.AppoxeeObserver;
 import com.appoxee.shared.AppoxeeOptions;
@@ -34,7 +34,6 @@ import com.facebook.react.bridge.Callback;
 import com.facebook.react.bridge.LifecycleEventListener;
 import com.facebook.react.bridge.Promise;
 import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
@@ -77,7 +76,7 @@ import java.util.concurrent.ConcurrentHashMap;
  */
 @SuppressWarnings("ALL")
 @ReactModule(name = RNMappPluginModule.NAME)
-public class RNMappPluginModule extends ReactContextBaseJavaModule implements PermissionListener {
+public class RNMappPluginModule extends NativeRNMappPluginModuleSpec implements PermissionListener {
 
     public static final String NAME = "RNMappPluginModule";
     private static final int POST_NOTIFICATION_PERMISSION_REQUEST_CODE = 1001;
@@ -511,7 +510,7 @@ public class RNMappPluginModule extends ReactContextBaseJavaModule implements Pe
     }
 
     @ReactMethod
-    public void setAttributeBoolean(String key, Boolean value) {
+    public void setAttributeBoolean(String key, boolean value) {
         Map<String, Object> attr = new HashMap<>();
         attr.put(key, value);
         Appoxee.instance().addCustomAttributes(attr).enqueue(result -> {
@@ -519,9 +518,9 @@ public class RNMappPluginModule extends ReactContextBaseJavaModule implements Pe
     }
 
     @ReactMethod
-    public void setAttributeInt(String key, Integer value) {
+    public void setAttributeInt(String key, double value) {
         Map<String, Object> attr = new HashMap<>();
-        attr.put(key, value);
+        attr.put(key, (int) value);
         Appoxee.instance().addCustomAttributes(attr).enqueue(result -> {
         });
     }
@@ -653,7 +652,7 @@ public class RNMappPluginModule extends ReactContextBaseJavaModule implements Pe
     // -------------------------------------------------------------------------
 
     @ReactMethod
-    public void lockScreenOrientation(Integer orientation) {
+    public void lockScreenOrientation(double orientation) {
         // setOrientation() removed in SDK v7 — no-op
     }
 
@@ -744,7 +743,7 @@ public class RNMappPluginModule extends ReactContextBaseJavaModule implements Pe
      * The @ReactMethod signature is preserved to avoid breaking the JS public API.
      */
     @ReactMethod
-    public void inAppMarkAsRead(Integer templateId, String eventId) {
+    public void inAppMarkAsRead(double templateId, String eventId) {
         // no-op in v7
     }
 
@@ -752,7 +751,7 @@ public class RNMappPluginModule extends ReactContextBaseJavaModule implements Pe
      * @see #inAppMarkAsRead
      */
     @ReactMethod
-    public void inAppMarkAsUnRead(Integer templateId, String eventId) {
+    public void inAppMarkAsUnRead(double templateId, String eventId) {
         // no-op in v7
     }
 
@@ -760,7 +759,7 @@ public class RNMappPluginModule extends ReactContextBaseJavaModule implements Pe
      * @see #inAppMarkAsRead
      */
     @ReactMethod
-    public void inAppMarkAsDeleted(Integer templateId, String eventId) {
+    public void inAppMarkAsDeleted(double templateId, String eventId) {
         // no-op in v7
     }
 
@@ -768,8 +767,8 @@ public class RNMappPluginModule extends ReactContextBaseJavaModule implements Pe
      * @see #inAppMarkAsRead
      */
     @ReactMethod
-    public void triggerStatistic(Integer templateId, String originalEventId,
-                                 String trackingKey, int displayMillis,
+    public void triggerStatistic(double templateId, String originalEventId,
+                                 String trackingKey, double displayMillis,
                                  String reason, String link) {
         // no-op in v7
     }
@@ -784,8 +783,8 @@ public class RNMappPluginModule extends ReactContextBaseJavaModule implements Pe
     }
 
     @ReactMethod
-    public void removeAndroidListeners(int count) {
-        EventEmitter.shared().removeAndroidListeners(count);
+    public void removeAndroidListeners(double count) {
+        EventEmitter.shared().removeAndroidListeners((int) count);
     }
 
     @ReactMethod
@@ -794,7 +793,7 @@ public class RNMappPluginModule extends ReactContextBaseJavaModule implements Pe
     }
 
     @ReactMethod
-    public void removeListeners(Integer count) {
+    public void removeListeners(double count) {
         removeAndroidListeners(count);
     }
 
@@ -808,8 +807,8 @@ public class RNMappPluginModule extends ReactContextBaseJavaModule implements Pe
     }
 
     @ReactMethod
-    public void clearNotification(int id) {
-        NotificationManagerCompat.from(reactContext.getApplicationContext()).cancel(id);
+    public void clearNotification(double id) {
+        NotificationManagerCompat.from(reactContext.getApplicationContext()).cancel((int) id);
     }
 
     // -------------------------------------------------------------------------

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

@@ -1,33 +1,30 @@
 package com.reactlibrary;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
-import com.facebook.react.ReactPackage;
+import com.facebook.react.BaseReactPackage;
 import com.facebook.react.bridge.NativeModule;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.module.model.ReactModuleInfo;
 import com.facebook.react.module.model.ReactModuleInfoProvider;
-import com.facebook.react.uimanager.ViewManager;
 
-import java.util.Collections;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
-public class RNMappPluginPackage implements ReactPackage {
+public class RNMappPluginPackage extends BaseReactPackage {
 
-  @NonNull
   @Override
-  public List<NativeModule> createNativeModules(@NonNull ReactApplicationContext reactContext) {
-    return Collections.singletonList(new RNMappPluginModule(reactContext));
+  @Nullable
+  public NativeModule getModule(@NonNull String name, @NonNull ReactApplicationContext reactContext) {
+    if (RNMappPluginModule.NAME.equals(name)) {
+      return new RNMappPluginModule(reactContext);
+    }
+    return null;
   }
 
   @NonNull
   @Override
-  public List<ViewManager> createViewManagers(@NonNull ReactApplicationContext reactContext) {
-    return Collections.emptyList();
-  }
-
   public ReactModuleInfoProvider getReactModuleInfoProvider() {
     return () -> {
       Map<String, ReactModuleInfo> moduleInfos = new HashMap<>();
@@ -39,7 +36,6 @@ public class RNMappPluginPackage implements ReactPackage {
                       RNMappPluginModule.NAME,
                       false, // canOverrideExistingModule
                       false, // needsEagerInit
-                      true,  // hasConstants
                       false, // isCxxModule
                       true   // isTurboModule -> THIS IS IMPORTANT
               )
@@ -49,4 +45,3 @@ public class RNMappPluginPackage implements ReactPackage {
     };
   }
 }
-

package/android/src/main/jni/CMakeLists.txt

@@ -0,0 +1,28 @@
+# Copyright (c) Meta Platforms, Inc. and affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+
+cmake_minimum_required(VERSION 3.13)
+set(CMAKE_VERBOSE_MAKEFILE on)
+
+file(GLOB react_codegen_SRCS CONFIGURE_DEPENDS *.cpp react/renderer/components/RNMappPlugin/*.cpp)
+
+add_library(
+  react_codegen_RNMappPlugin
+  OBJECT
+  ${react_codegen_SRCS}
+)
+
+target_include_directories(react_codegen_RNMappPlugin PUBLIC . react/renderer/components/RNMappPlugin)
+
+target_link_libraries(
+  react_codegen_RNMappPlugin
+  fbjni
+  jsi
+  # We need to link different libraries based on whether we are building rncore or not, that's necessary
+  # because we want to break a circular dependency between react_codegen_rncore and reactnative
+  reactnative
+)
+
+target_compile_reactnative_options(react_codegen_RNMappPlugin PRIVATE)