react-native-mapp-plugin 1.3.6 → 1.4.1

package/CHANGELOG.md

@@ -1,21 +1,30 @@
-## Version 1.3.6
+## Version 1.4.1
+
+***Dependency Updates***
 
-***Improvements***
+- 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.
 
--iOS: Updated bundled Mapp Engage SDK binaries to version 6.1.3 (AppoxeeSDK.xcframework).
+***Architecture***
 
--iOS: Updated CocoaPods integration to use vendored `.xcframework` and bundled resources directly from this plugin.
+- Android: Updated plugin to support New Architecture (TurboModule).
 
--iOS: Removed direct CocoaPods dependencies on `MappSDK`, `MappSDKInapp`, and `MappSDKGeotargeting` from the podspec to keep native SDK versions aligned with the plugin package.
+## Version 1.4.0
 
-***Compatibility***
+***Bug Fixes***
 
--No JavaScript API changes.
+- Android: `requestPostNotificationPermission` now requests the runtime notification permission instead of only checking its current state.
+- Android: If the runtime prompt is unavailable or the permission is blocked, the plugin now opens the app notification settings screen and resolves the promise in every path.
 
--No Android SDK changes in this release.
+***Dependency Updates***
 
-**Note:**
--This is a packaging and dependency-alignment release focused on iOS integration consistency. No breaking changes are expected.
+- Aligned with Mapp Engage Android SDK 7.0.2.
+
+## Version 1.3.6
+
+***Dependency Updates***
+
+-Aligned with Mapp Engage iOS SDK 6.1.3
 
 ## Version 1.3.5
 

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";
@@ -142,6 +144,26 @@ export class Mapp {
     );
   }
 
+  static engageTestServer(
+    cepUrl: string,
+    sdkKey: string,
+    googleProjectId: string,
+    server: string,
+    appID: string,
+    tenantID: string
+  ) {
+    if (Platform.OS == "android") {
+      return RNMappPluginModule.engageTestServer(
+        cepUrl,
+        sdkKey,
+        googleProjectId,
+        server,
+        appID,
+        tenantID
+      );
+    }
+  }
+
   /**
    * On Init Completed Listener
    *
@@ -409,9 +431,10 @@ export class Mapp {
   }
 
   /**
-   * Check if permission for posting notifications on Android 13 and up is granted or not.
-   * If permission is not granted, then system dialog will be invoked and shown.
-   * @returns true if permission is granted, false if it is not
+   * Requests notification permission on Android 13 and up.
+   * If the runtime prompt is unavailable or the permission is blocked, native code
+   * falls back to opening the app notification settings screen.
+   * @returns true if permission is already granted or the user grants it, false otherwise
    */
   static requestPostNotificationPermission(): Promise<any> {
     if (Platform.OS == "android") {

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/RNMappPlugin.podspec

@@ -9,13 +9,14 @@ Pod::Spec.new do |s|
   s.description  = <<-DESC
                     Mapp SDK for React Native
                    DESC
-  s.homepage     = "https://github.com/MappCloud/React-native-plugin"
+  s.homepage     = "https://github.com/mapp-digital/Mapp-Engage-ReactNative-Plugin"
   s.license      = "MIT"
   s.author      = "Mapp"
   s.platforms    = { :ios => "10.0" }
-  s.source       = { :git => "https://github.com/MappCloud/React-native-plugin", :tag => "#{s.version}" }
+  s.source       = { :git => "https://github.com/mapp-digital/Mapp-Engage-ReactNative-Plugin", :tag => "#{s.version}" }
 
   s.source_files = "ios/**/*.{h,c,m,swift}"
+  s.exclude_files = "ios/RNMappPluginTests/**/*"
   s.vendored_framework = "ios/Frameworks/AppoxeeSDK.xcframework", "ios/Frameworks/AppoxeeLocationServices.xcframework", "ios/Frameworks/AppoxeeInapp.xcframework"
   s.resources = "ios/Frameworks/AppoxeeSDKResources.bundle", "ios/Frameworks/AppoxeeInappResources.bundle"
   s.preserve_path = "ios/Frameworks/"
@@ -24,7 +25,5 @@ Pod::Spec.new do |s|
   s.frameworks = "WebKit"
   s.library = 'sqlite3'
   s.dependency "React" 
-  s.dependency 'RCT-Folly'
 
 end
-

package/android/build.gradle

@@ -1,16 +1,16 @@
-plugins {
-    id("com.android.library")
-    id("org.jetbrains.kotlin.android")
-    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"
     }
@@ -19,24 +19,44 @@ android {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
     }
+
+    testOptions {
+        unitTests {
+            returnDefaultValues = true
+            includeAndroidResources = true
+        }
+    }
 }
 
 dependencies {
-    implementation "com.facebook.react:react-android:0.81.4"
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:2.2.20"
-    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.9.4'
-    implementation platform('com.google.firebase:firebase-bom:34.5.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:mapp-android:6.1.3")
+    implementation("com.mapp.sdk:engage-android:7.1.1")
+    testImplementation 'junit:junit:4.13.2'
+    testImplementation 'org.mockito:mockito-core:5.23.0'
+    testImplementation 'org.mockito:mockito-inline:5.2.0'
+    testImplementation 'org.json:json:20260522'
+    testImplementation 'org.robolectric:robolectric:4.16.1'
 }
-
-react {
-    jsRootDir = rootDir
-    libraryName = "RNMappPlugin"
-    codegenJavaPackageName = "com.reactlibrary"
-}

package/android/gradle/gradle-daemon-jvm.properties

@@ -0,0 +1,12 @@
+#This file is generated by updateDaemonJvm
+toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/ec7520a1e057cd116f9544c42142a16b/redirect
+toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/4c4f879899012ff0a8b2e2117df03b0e/redirect
+toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/ec7520a1e057cd116f9544c42142a16b/redirect
+toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/4c4f879899012ff0a8b2e2117df03b0e/redirect
+toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/73bcfb608d1fde9fb62e462f834a3299/redirect
+toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/846ee0d876d26a26f37aa1ce8de73224/redirect
+toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/ec7520a1e057cd116f9544c42142a16b/redirect
+toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/4c4f879899012ff0a8b2e2117df03b0e/redirect
+toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/9482ddec596298c84656d31d16652665/redirect
+toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/39701d92e1756bb2f141eb67cd4c660e/redirect
+toolchainVersion=21

package/android/gradle/wrapper/gradle-wrapper.properties

@@ -3,5 +3,5 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-all.zip
 android.enableAapt2=false

package/android/gradle.properties

@@ -39,6 +39,4 @@ newArchEnabled=true
 # If set to false, you will be using JSC instead.
 hermesEnabled=false
 
-NODE_BINARY=/Users/semsudin.tafilovic/.nvm/versions/node/v20.19.0/bin/node
-
 org.gradle.java.home=/Library/Java/JavaVirtualMachines/jdk-17.jdk/Contents/Home

package/android/gradlew

@@ -0,0 +1,18 @@
+#!/bin/sh
+
+set -eu
+
+APP_HOME=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)
+CLASSPATH="$APP_HOME/gradle/wrapper/gradle-wrapper.jar"
+
+if [ -n "${JAVA_HOME:-}" ]; then
+  JAVACMD="$JAVA_HOME/bin/java"
+else
+  JAVACMD="java"
+fi
+
+exec "$JAVACMD" \
+  -Dorg.gradle.appname=gradlew \
+  -classpath "$CLASSPATH" \
+  org.gradle.wrapper.GradleWrapperMain \
+  "$@"

package/android/gradlew.bat

@@ -0,0 +1,15 @@
+@ECHO OFF
+SETLOCAL
+
+SET DIRNAME=%~dp0
+IF "%DIRNAME%"=="" SET DIRNAME=.
+SET APP_HOME=%DIRNAME%
+SET CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+IF DEFINED JAVA_HOME (
+  SET JAVA_EXE=%JAVA_HOME%\bin\java.exe
+) ELSE (
+  SET JAVA_EXE=java.exe
+)
+
+"%JAVA_EXE%" -Dorg.gradle.appname=gradlew -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*

package/android/settings.gradle

@@ -5,9 +5,8 @@ pluginManagement {
         gradlePluginPortal()
     }
     plugins {
-        id("com.android.library") version("8.13.0") // 👈 for library
-        id("com.facebook.react") version("0.81.4")  // 👈 for React Native
-        id("org.jetbrains.kotlin.android") version("2.2.20") // 👈 for Kotlin
+        id("com.android.library") version("9.1.1") // 👈 for library
+        id("com.facebook.react") version("0.84.1")  // 👈 for React Native
     }
 }
 
@@ -21,4 +20,3 @@ dependencyResolutionManagement {
 includeBuild("../node_modules/@react-native/gradle-plugin")
 
 rootProject.name="MappEngagePlugin"
-include(":MappEngagePlugin")

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

@@ -8,8 +8,6 @@ import android.os.Bundle;
 
 
 
-import com.appoxee.Appoxee;
-
 /**
  * Created by Aleksandar Marinkovic on 1/30/19.
  * Copyright (c) 2019 MAPP.
@@ -27,14 +25,14 @@ public class ActivityListener extends Activity {
         launchIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
         launchIntent.setPackage(this.getPackageName());
         startActivity(launchIntent);
-        Appoxee.handleRichPush(this,intent);
+        // handleRichPush() removed in SDK v7
         finish();
     }
 
     @Override
     protected void onNewIntent(Intent intent) {
         super.onNewIntent(intent);
-        Appoxee.handleRichPush(this, intent);
+        // handleRichPush() removed in SDK v7
     }
 
     private Intent getDefaultActivityIntent() {

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

@@ -27,7 +27,7 @@ public class HelperActivity extends Activity {
             return;
         }
 
-        if (intent.getAction() != null && !intent.getAction().equals("")) {
+        if (intent.getAction() != null && !intent.getAction().isEmpty()) {
             Intent launchIntent = getDefaultActivityIntent();
             launchIntent.setPackage(this.getPackageName());
             launchIntent.putExtra("action", intent.getAction());
@@ -56,7 +56,7 @@ public class HelperActivity extends Activity {
         String packageName = getPackageName();
 
         if (Objects.equals(name.getPackageName(), packageName)) {
-            if (intent.getAction() != null && !intent.getAction().equals("")) {
+            if (intent.getAction() != null && !intent.getAction().isEmpty()) {
                 EventEmitter.shared().sendEvent(new IntentNotificationEvent(Objects.requireNonNull(intent.getData()), intent.getAction()));
             }
         }

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

@@ -5,38 +5,43 @@ import android.util.Log;
 import androidx.annotation.NonNull;
 
 import com.appoxee.Appoxee;
-import com.appoxee.internal.logger.LoggerFactory;
+import com.appoxee.shared.AppoxeeOptions;
 import com.google.firebase.messaging.FirebaseMessagingService;
 import com.google.firebase.messaging.RemoteMessage;
 
-import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
 
+/**
+ * Updated for Engage SDK v7:
+ * - isPushMessageFromMapp() replaces data.containsKey("p") check
+ * - handlePushMessage() replaces setRemoteMessage()
+ * - updateFirebaseToken() replaces setToken()
+ */
 public class MessageService extends FirebaseMessagingService {
+
     @Override
     public void onCreate() {
         super.onCreate();
-        Appoxee.engage(getApplication());
+        Appoxee.engage(getApplication(), null);
     }
 
     @Override
     public void onMessageReceived(@NonNull RemoteMessage remoteMessage) {
         Log.d("onMessageReceived", remoteMessage.toString());
-        Map<String, String> data = remoteMessage.getData();
-        if (data.containsKey("p")) {
+        if (Appoxee.instance().isPushMessageFromMapp(remoteMessage)) {
             waitInitialization();
-            Appoxee.instance().setRemoteMessage(remoteMessage);
+            Appoxee.instance().handlePushMessage(remoteMessage);
         } else {
             super.onMessageReceived(remoteMessage);
         }
     }
 
     @Override
-    public void onNewToken(@NonNull String s) {
+    public void onNewToken(@NonNull String token) {
         waitInitialization();
-        Appoxee.instance().setToken(s);
-        super.onNewToken(s);
+        Appoxee.instance().updateFirebaseToken(token).enqueue(result -> {});
+        super.onNewToken(token);
     }
 
     private void waitInitialization() {
@@ -47,7 +52,7 @@ public class MessageService extends FirebaseMessagingService {
                 limit--;
             }
         } catch (Exception e) {
-            LoggerFactory.getDevLogger().e(e.getMessage());
+            Log.e("MessageService", "waitInitialization interrupted", e);
         }
     }
 }

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

@@ -2,43 +2,50 @@ package com.reactlibrary;
 
 import android.util.Log;
 
-import com.appoxee.push.PushData;
-import com.appoxee.push.PushDataReceiver;
+import com.appoxee.shared.LocalPushBroadcast;
+import com.appoxee.shared.MappPush;
+
 /**
  * Created by Aleksandar Marinkovic on 2019-05-15.
  * Copyright (c) 2019 MAPP.
+ *
+ * Updated for Engage SDK v7: extends LocalPushBroadcast instead of PushDataReceiver.
  */
-public  class MyPushBroadcastReceiver extends PushDataReceiver {
-    @Override
-    public void onPushReceived(PushData pushData) {
-        Log.d("APX", "Push received " + pushData);
+public class MyPushBroadcastReceiver extends LocalPushBroadcast {
 
-        EventEmitter.shared().sendEvent(new PushNotificationEvent(pushData,"onPushReceived"));
-        super.onPushReceived(pushData);
+    @Override
+    public void onReceived(MappPush mappPush) {
+        Log.d("APX", "Push received " + mappPush);
+        EventEmitter.shared().sendEvent(new PushNotificationEvent(mappPush, "onPushReceived"));
     }
 
     @Override
-    public void onPushOpened(PushData pushData) {
-        Log.d("APX", "Push opened " + pushData);
-        EventEmitter.shared().sendEvent(new PushNotificationEvent(pushData,"onPushOpened"));
-       super.onPushOpened(pushData);
+    public void onOpened(MappPush mappPush) {
+        Log.d("APX", "Push opened " + mappPush);
+        EventEmitter.shared().sendEvent(new PushNotificationEvent(mappPush, "onPushOpened"));
     }
 
     @Override
-    public void onPushDismissed(PushData pushData) {
-        Log.d("APX", "Push dismissed " + pushData);
-        EventEmitter.shared().sendEvent(new PushNotificationEvent(pushData,"onPushDismissed"));
-        super.onPushDismissed(pushData);
+    public void onDismissed(MappPush mappPush) {
+        Log.d("APX", "Push dismissed " + mappPush);
+        EventEmitter.shared().sendEvent(new PushNotificationEvent(mappPush, "onPushDismissed"));
     }
 
-
     @Override
-    public void onSilentPush(PushData pushData) {
-        Log.d("APX", "Push Silent " + pushData);
-        EventEmitter.shared().sendEvent(new PushNotificationEvent(pushData,"onSilentPush"));
-        super.onSilentPush(pushData);
-
+    public void onSilent(MappPush mappPush) {
+        Log.d("APX", "Push silent " + mappPush);
+        EventEmitter.shared().sendEvent(new PushNotificationEvent(mappPush, "onSilentPush"));
     }
 
+    @Override
+    public void onButtonClick(MappPush mappPush) {
+        Log.d("APX", "Push button clicked " + mappPush);
+        EventEmitter.shared().sendEvent(new PushNotificationEvent(mappPush, "onPushButtonClicked"));
+    }
 
+    @Override
+    public void onRichPush(MappPush mappPush) {
+        Log.d("APX", "Rich push " + mappPush);
+        EventEmitter.shared().sendEvent(new PushNotificationEvent(mappPush, "onRichPush"));
+    }
 }