react-native-mapp-plugin 1.3.0 → 1.3.2

package/.idea/misc.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectRootManager">
+    <output url="file://$PROJECT_DIR$/out" />
+  </component>
+</project>

package/.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/Mapp-Engage-ReactNative-Plugin.iml" filepath="$PROJECT_DIR$/.idea/Mapp-Engage-ReactNative-Plugin.iml" />
+    </modules>
+  </component>
+</project>

package/.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>

package/CHANGELOG.md

@@ -0,0 +1,21 @@
+# Version 1.3.2
+- Resolved an issue introduced in version 1.3.1 where changes to the setAlias function declaration caused compatibility problems. The function has been updated to ensure backward compatibility.
+
+# Version 1.3.1
+*** Features ***
+- Updated react native version to 0.81.4
+- Updated Gradle to version 8.14.2
+- android minSdk updated to version 24
+- android targetSdk updated to version 36
+
+### Android requrements
+* minimum required node version is 20.19.4
+* minimum requred Gradle version 8.14.2
+
+### iOS Requirements
+
+* Additional flag needs to be added under the buildSettings -> OTHER_CPLUSPLUSFLAGS
+    -DFOLLY_CFG_NO_COROUTINES=1,
+    -DFOLLY_HAVE_CLOCK_GETTIME=1
+* Mapp SDK 6.0.10 -> 6.1.0
+* Mapp Geolocation -> 6.0.7

package/Mapp.js

@@ -86,9 +86,14 @@ export class Mapp {
    * Sets user alias
    *
    * @param alias
+   * @param resendAttributes
    */
-  static setAlias(alias: string): Promise<Boolean> {
-    return RNMappPluginModule.setAlias(alias);
+  static setAlias(alias: string, resendAttributes: boolean): Promise<Boolean> {
+    if (resendAttributes !== undefined && resendAttributes !== null) {
+      return RNMappPluginModule.setAliasWithResend(alias, resendAttributes);
+    } else {
+      return RNMappPluginModule.setAlias(alias);
+    }
   }
 
   /**
@@ -205,6 +210,22 @@ export class Mapp {
     }
   }
 
+  /**
+   * Set Custom Attributes
+   *
+   */
+  static setAttributes(attributes: object) {
+    return RNMappPluginModule.setAttributes(attributes);
+  }
+
+  /**
+   * Get Custom Attributes
+   *
+   */
+  static getAttributes(attributes: array): Promise<Object> {
+    return RNMappPluginModule.getAttributes(attributes);
+  }
+
   /**
    * Set Custom Attribute
    *
@@ -300,13 +321,21 @@ export class Mapp {
     return RNMappPluginModule.stopGeoFencing();
   }
 
-  static fetchLatestInboxMessage(): Promise<any>{
+  static fetchLatestInboxMessage(): Promise<any> {
     if (Platform.OS == "ios") {
-      print("fatch latest message for iOS part")
+      print("fatch latest message for iOS part");
       RNMappPluginModule.fetchLatestInboxMessage();
-      this.addInboxMessagesListener(messages => {
-        print("message arrived ", messages, " length", messages[messages.length - 1])
-        messages.sort((message1, message2) => message1["template_id"] > message2["template_id"]);
+      this.addInboxMessagesListener((messages) => {
+        print(
+          "message arrived ",
+          messages,
+          " length",
+          messages[messages.length - 1]
+        );
+        messages.sort(
+          (message1, message2) =>
+            message1["template_id"] > message2["template_id"]
+        );
         alert(JSON.stringify(messages[0]));
         return JSON.stringify(messages[0]);
       });

package/RNMappPlugin.podspec

@@ -24,9 +24,9 @@ Pod::Spec.new do |s|
   s.frameworks = "WebKit"
   s.library = 'sqlite3'
   s.dependency "React" 
-  s.dependency "MappSDK" , '~> 6.0.10'
+  s.dependency "MappSDK" , '~> 6.1.0'
   s.dependency "MappSDKInapp"
-  s.dependency "MappSDKGeotargeting", '~> 6.0.6'
+  s.dependency "MappSDKGeotargeting", '~> 6.0.7'
 
 end
 

package/android/.settings/org.eclipse.buildship.core.prefs

@@ -5,7 +5,7 @@ connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER)
 connection.project.dir=
 eclipse.preferences.version=1
 gradle.user.home=
-java.home=/Users/semsudin.tafilovic/.sdkman/candidates/java/17.0.15-tem
+java.home=/Users/semsudin.tafilovic/.sdkman/candidates/java/11.0.26-tem
 jvm.arguments=
 offline.mode=false
 override.workspace.settings=true

package/android/build.gradle

@@ -6,11 +6,11 @@ plugins {
 
 android {
     namespace "com.reactlibrary"
-    compileSdk = 35
+    compileSdk = 36
 
     defaultConfig {
-        minSdk = 21
-        targetSdk = 35
+        minSdk = 24
+        targetSdk = 36
         versionCode = 1
         versionName = "1.0"
     }
@@ -22,17 +22,17 @@ android {
 }
 
 dependencies {
-    implementation "com.facebook.react:react-android:0.79.3"
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:2.1.21"
-    implementation 'com.google.code.gson:gson:2.13.0'
+    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'
     implementation 'androidx.appcompat:appcompat:1.7.1'
-    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.9.1'
-    implementation platform('com.google.firebase:firebase-bom:33.15.0')
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.9.4'
+    implementation platform('com.google.firebase:firebase-bom:34.3.0')
     implementation('com.google.firebase:firebase-messaging')
     api('com.google.android.gms:play-services-location:21.3.0')
-    implementation 'androidx.media:media:1.7.0'
+    implementation 'androidx.media:media:1.7.1'
     implementation 'androidx.legacy:legacy-support-v13:1.0.0'
-    implementation("com.mapp.sdk:mapp-android:6.0.29-alpha02")
+    implementation("com.mapp.sdk:mapp-android:6.1.2")
 }
 
 react {

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.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-all.zip
 android.enableAapt2=false

package/android/settings.gradle

@@ -5,9 +5,9 @@ pluginManagement {
         gradlePluginPortal()
     }
     plugins {
-        id("com.android.library") version("8.10.1") // 👈 for library
-        id("com.facebook.react") version("0.79.3")  // 👈 for React Native
-        id("org.jetbrains.kotlin.android") version("2.1.21") // 👈 for Kotlin
+        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
     }
 }
 

package/android/src/main/AndroidManifest.xml

@@ -26,16 +26,16 @@
         </receiver>
         <activity
                 android:name=".HelperActivity"
-                android:exported="false"
+                android:exported="true"
+                android:taskAffinity=""
                 android:theme="@style/HelperActivityStyle">
-
             <intent-filter android:label="mapp">
 
                     <data android:scheme="apx" />
                     <data android:host="deeplink" />
 
                     <action android:name="com.appoxee.VIEW_DEEPLINK" />
-
+                    <action android:name="android.intent.action.VIEW" />
                     <category android:name="android.intent.category.DEFAULT" />
                     <category android:name="android.intent.category.BROWSABLE" />
                     <category android:name="${applicationId}" />

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

@@ -15,6 +15,7 @@ import androidx.core.content.ContextCompat;
 import com.appoxee.Appoxee;
 import com.appoxee.AppoxeeOptions;
 import com.appoxee.DeviceInfo;
+import com.appoxee.GetCustomAttributesCallback;
 import com.appoxee.internal.inapp.model.APXInboxMessage;
 import com.appoxee.internal.inapp.model.ApxInAppExtras;
 import com.appoxee.internal.inapp.model.InAppInboxCallback;
@@ -37,6 +38,8 @@ 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.bridge.WritableArray;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.bridge.WritableNativeMap;
@@ -49,6 +52,10 @@ import com.google.firebase.messaging.RemoteMessage;
 import org.json.JSONException;
 import org.json.JSONObject;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -205,7 +212,13 @@ public class RNMappPluginModule extends ReactContextBaseJavaModule {
 
     @ReactMethod
     public void setAlias(String alias, Promise promise) {
-        Appoxee.instance().setAlias(alias);
+        Appoxee.instance().setAlias(alias, false);
+        promise.resolve(true);
+    }
+
+    @ReactMethod
+    public void setAliasWithResend(String alias, boolean resendCustomAttributes, Promise promise) {
+        Appoxee.instance().setAlias(alias, resendCustomAttributes);
         promise.resolve(true);
     }
 
@@ -283,6 +296,60 @@ public class RNMappPluginModule extends ReactContextBaseJavaModule {
         });
     }
 
+    @ReactMethod
+    public void setAttributes(ReadableMap attributes, Promise promise) {
+        if (attributes != null) {
+            Map<String, Object> internapMap = new HashMap<>();
+            attributes.getEntryIterator().forEachRemaining(entry -> {
+                Object value = entry.getValue() == null ? "" : entry.getValue();
+                String key = entry.getKey();
+
+                if (value instanceof Number) {
+                    internapMap.put(key, ((Number) value).doubleValue());
+                } else if (value instanceof Boolean) {
+                    internapMap.put(key, ((Boolean) value).booleanValue());
+                } else if (value instanceof Date) {
+                    internapMap.put(key, ((Date) value).getDate());
+                } else {
+                    internapMap.put(key, ((String) value));
+                }
+            });
+            Appoxee.instance().setAttributes(internapMap);
+        }
+        promise.resolve(true);
+    }
+
+    @ReactMethod
+    public void getAttributes(ReadableArray keys, Promise promise) {
+        List<String> internalKeys = new ArrayList<>();
+
+        if (keys != null && keys.size() > 0) {
+            for (int i = 0; i < keys.size(); i++) {
+                internalKeys.add(keys.getString(i));
+            }
+        }
+
+        if (internalKeys.size() > 0) {
+            Appoxee.instance().getCustomAttributes(internalKeys, new GetCustomAttributesCallback() {
+                @Override
+                public void onSuccess(Map<String, String> customAttributes) {
+                    WritableMap resultMap = new WritableNativeMap();
+                    for (Map.Entry<String, String> entry : customAttributes.entrySet()) {
+                        resultMap.putString(entry.getKey(), entry.getValue());
+                    }
+                    promise.resolve(resultMap);
+                }
+
+                @Override
+                public void onError(String errorMessage) {
+                    promise.reject(new Throwable(errorMessage));
+                }
+            });
+        } else {
+            promise.resolve(Collections.emptyMap());
+        }
+    }
+
     @ReactMethod
     public void setAttribute(String key, String value) {
         Appoxee.instance().setAttribute(key, value);

package/build/generated/ios/MappEngagePluginSpec/MappEngagePluginSpec-generated.mm

@@ -0,0 +1,16 @@
+/**
+ * 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: GenerateModuleObjCpp
+ *
+ * We create an umbrella header (and corresponding implementation) here since
+ * Cxx compilation in BUCK has a limitation: source-code producing genrule()s
+ * must have a single output. More files => more genrule()s => slower builds.
+ */
+
+#import "MappEngagePluginSpec.h"
+
+

package/build/generated/ios/MappEngagePluginSpec/MappEngagePluginSpec.h

@@ -0,0 +1,38 @@
+/**
+ * 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: GenerateModuleObjCpp
+ *
+ * We create an umbrella header (and corresponding implementation) here since
+ * Cxx compilation in BUCK has a limitation: source-code producing genrule()s
+ * must have a single output. More files => more genrule()s => slower builds.
+ */
+
+#ifndef __cplusplus
+#error This file must be compiled as Obj-C++. If you are importing it, you must change your file extension to .mm.
+#endif
+
+// Avoid multiple includes of MappEngagePluginSpec symbols
+#ifndef MappEngagePluginSpec_H
+#define MappEngagePluginSpec_H
+
+#import <Foundation/Foundation.h>
+#import <RCTRequired/RCTRequired.h>
+#import <RCTTypeSafety/RCTConvertHelpers.h>
+#import <RCTTypeSafety/RCTTypedModuleConstants.h>
+#import <React/RCTBridgeModule.h>
+#import <React/RCTCxxConvert.h>
+#import <React/RCTManagedPointer.h>
+#import <ReactCommon/RCTTurboModule.h>
+#import <optional>
+#import <vector>
+
+
+NS_ASSUME_NONNULL_BEGIN
+
+
+NS_ASSUME_NONNULL_END
+#endif // MappEngagePluginSpec_H

package/build/generated/ios/MappEngagePluginSpecJSI-generated.cpp

@@ -0,0 +1,17 @@
+/**
+ * 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: GenerateModuleCpp.js
+ */
+
+#include "MappEngagePluginSpecJSI.h"
+
+namespace facebook::react {
+
+
+
+
+} // namespace facebook::react

package/build/generated/ios/MappEngagePluginSpecJSI.h

@@ -0,0 +1,19 @@
+/**
+ * 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: GenerateModuleH.js
+ */
+
+#pragma once
+
+#include <ReactCommon/TurboModule.h>
+#include <react/bridging/Bridging.h>
+
+namespace facebook::react {
+
+
+
+} // namespace facebook::react

package/build/generated/ios/RCTAppDependencyProvider.h

@@ -0,0 +1,25 @@
+/*
+ * 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.
+ */
+
+
+#import <Foundation/Foundation.h>
+
+#if __has_include(<React-RCTAppDelegate/RCTDependencyProvider.h>)
+#import <React-RCTAppDelegate/RCTDependencyProvider.h>
+#elif __has_include(<React_RCTAppDelegate/RCTDependencyProvider.h>)
+#import <React_RCTAppDelegate/RCTDependencyProvider.h>
+#else
+#import "RCTDependencyProvider.h"
+#endif
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface RCTAppDependencyProvider : NSObject <RCTDependencyProvider>
+
+@end
+
+NS_ASSUME_NONNULL_END

package/build/generated/ios/RCTAppDependencyProvider.mm

@@ -0,0 +1,35 @@
+/*
+ * 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.
+ */
+
+#import "RCTAppDependencyProvider.h"
+#import <ReactCodegen/RCTModulesConformingToProtocolsProvider.h>
+#import <ReactCodegen/RCTThirdPartyComponentsProvider.h>
+#import <ReactCodegen/RCTModuleProviders.h>
+
+@implementation RCTAppDependencyProvider
+
+- (nonnull NSArray<NSString *> *)URLRequestHandlerClassNames {
+  return RCTModulesConformingToProtocolsProvider.URLRequestHandlerClassNames;
+}
+
+- (nonnull NSArray<NSString *> *)imageDataDecoderClassNames {
+  return RCTModulesConformingToProtocolsProvider.imageDataDecoderClassNames;
+}
+
+- (nonnull NSArray<NSString *> *)imageURLLoaderClassNames {
+  return RCTModulesConformingToProtocolsProvider.imageURLLoaderClassNames;
+}
+
+- (nonnull NSDictionary<NSString *,Class<RCTComponentViewProtocol>> *)thirdPartyFabricComponents {
+  return RCTThirdPartyComponentsProvider.thirdPartyFabricComponents;
+}
+
+- (nonnull NSDictionary<NSString *, id<RCTModuleProvider>> *)moduleProviders {
+  return RCTModuleProviders.moduleProviders;
+}
+
+@end

package/build/generated/ios/RCTModuleProviders.h

@@ -0,0 +1,16 @@
+/*
+ * 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.
+ */
+
+#import <Foundation/Foundation.h>
+
+@protocol RCTModuleProvider;
+
+@interface RCTModuleProviders: NSObject
+
++ (NSDictionary<NSString *, id<RCTModuleProvider>> *)moduleProviders;
+
+@end

package/build/generated/ios/RCTModuleProviders.mm

@@ -0,0 +1,51 @@
+/*
+ * 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.
+ */
+
+#import <Foundation/Foundation.h>
+
+#import "RCTModuleProviders.h"
+#import <ReactCommon/RCTTurboModule.h>
+#import <React/RCTLog.h>
+
+@implementation RCTModuleProviders
+
++ (NSDictionary<NSString *, id<RCTModuleProvider>> *)moduleProviders
+{
+  static NSDictionary<NSString *, id<RCTModuleProvider>> *providers = nil;
+  static dispatch_once_t onceToken;
+
+  dispatch_once(&onceToken, ^{
+    NSDictionary<NSString *, NSString *> * moduleMapping = @{
+      
+    };
+
+    NSMutableDictionary *dict = [[NSMutableDictionary alloc] initWithCapacity:moduleMapping.count];
+
+    for (NSString *key in moduleMapping) {
+      NSString * moduleProviderName = moduleMapping[key];
+      Class klass = NSClassFromString(moduleProviderName);
+      if (!klass) {
+        RCTLogError(@"Module provider %@ cannot be found in the runtime", moduleProviderName);
+        continue;
+      }
+
+      id instance = [klass new];
+      if (![instance respondsToSelector:@selector(getTurboModule:)]) {
+        RCTLogError(@"Module provider %@ does not conform to RCTModuleProvider", moduleProviderName);
+        continue;
+      }
+
+      [dict setObject:instance forKey:key];
+    }
+
+    providers = dict;
+  });
+
+  return providers;
+}
+
+@end

package/build/generated/ios/RCTModulesConformingToProtocolsProvider.h

@@ -0,0 +1,18 @@
+/*
+ * 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.
+ */
+
+#import <Foundation/Foundation.h>
+
+@interface RCTModulesConformingToProtocolsProvider: NSObject
+
++(NSArray<NSString *> *)imageURLLoaderClassNames;
+
++(NSArray<NSString *> *)imageDataDecoderClassNames;
+
++(NSArray<NSString *> *)URLRequestHandlerClassNames;
+
+@end

package/build/generated/ios/RCTModulesConformingToProtocolsProvider.mm

@@ -0,0 +1,54 @@
+/*
+ * 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.
+ */
+
+#import "RCTModulesConformingToProtocolsProvider.h"
+
+@implementation RCTModulesConformingToProtocolsProvider
+
++(NSArray<NSString *> *)imageURLLoaderClassNames
+{
+  static NSArray<NSString *> *classNames = nil;
+  static dispatch_once_t onceToken;
+  
+  dispatch_once(&onceToken, ^{
+    classNames = @[
+      
+    ];
+  });
+  
+  return classNames;
+}
+
++(NSArray<NSString *> *)imageDataDecoderClassNames
+{
+  static NSArray<NSString *> *classNames = nil;
+  static dispatch_once_t onceToken;
+  
+  dispatch_once(&onceToken, ^{
+    classNames = @[
+      
+    ];
+  });
+  
+  return classNames;
+}
+
++(NSArray<NSString *> *)URLRequestHandlerClassNames
+{
+  static NSArray<NSString *> *classNames = nil;
+  static dispatch_once_t onceToken;
+  
+  dispatch_once(&onceToken, ^{
+    classNames = @[
+      
+    ];
+  });
+  
+  return classNames;
+}
+
+@end

package/build/generated/ios/RCTThirdPartyComponentsProvider.h

@@ -0,0 +1,16 @@
+/*
+ * 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.
+ */
+
+#import <Foundation/Foundation.h>
+
+@protocol RCTComponentViewProtocol;
+
+@interface RCTThirdPartyComponentsProvider: NSObject
+
++ (NSDictionary<NSString *, Class<RCTComponentViewProtocol>> *)thirdPartyFabricComponents;
+
+@end

package/build/generated/ios/RCTThirdPartyComponentsProvider.mm

@@ -0,0 +1,30 @@
+/*
+ * 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.
+ */
+
+
+#import <Foundation/Foundation.h>
+
+#import "RCTThirdPartyComponentsProvider.h"
+#import <React/RCTComponentViewProtocol.h>
+
+@implementation RCTThirdPartyComponentsProvider
+
++ (NSDictionary<NSString *, Class<RCTComponentViewProtocol>> *)thirdPartyFabricComponents
+{
+  static NSDictionary<NSString *, Class<RCTComponentViewProtocol>> *thirdPartyComponents = nil;
+  static dispatch_once_t nativeComponentsToken;
+
+  dispatch_once(&nativeComponentsToken, ^{
+    thirdPartyComponents = @{
+
+    };
+  });
+
+  return thirdPartyComponents;
+}
+
+@end