react-native-mapp-plugin 1.1.3 → 1.2.1

package/Mapp.js

@@ -301,7 +301,18 @@ export class Mapp {
   }
 
   static fetchLatestInboxMessage(): Promise<any>{
-    return RNMappPluginModule.fetchLatestInboxMessage();
+    if (Platform.OS == "ios") {
+      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"]);
+        alert(JSON.stringify(messages[0]));
+        return JSON.stringify(messages[0]);
+      });
+    } else {
+      return RNMappPluginModule.fetchLatestInboxMessage();
+    }
   }
 
   static fetchInboxMessage(): Promise<any> {

package/RNMappPlugin.podspec

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

package/__package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-mapp-plugin",
-  "version": "1.0.3beta12",
+  "version": "1.0.3beta13",
   "description": "Mapp SDK for React Native.",
   "main": "index.js",
   "keywords": [

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

@@ -1,4 +1,4 @@
-arguments=--init-script /var/folders/t6/pvjmf_n16v706r03q_t_vlx58tvf6j/T/d146c9752a26f79b52047fb6dc6ed385d064e120494f96f08ca63a317c41f94c.gradle --init-script /var/folders/t6/pvjmf_n16v706r03q_t_vlx58tvf6j/T/52cde0cfcf3e28b8b7510e992210d9614505e0911af0c190bd590d7158574963.gradle
+arguments=--init-script /var/folders/t6/pvjmf_n16v706r03q_t_vlx58tvf6j/T/db3b08fc4a9ef609cb16b96b200fa13e563f396e9bb1ed0905fdab7bc3bc513b.gradle --init-script /var/folders/t6/pvjmf_n16v706r03q_t_vlx58tvf6j/T/52cde0cfcf3e28b8b7510e992210d9614505e0911af0c190bd590d7158574963.gradle
 auto.sync=true
 build.scans.enabled=false
 connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER)

package/android/build.gradle

@@ -57,15 +57,15 @@ dependencies {
     implementation('com.facebook.react:react-native:0.20.1')
     implementation 'com.google.code.gson:gson:2.10.1'
     //implementation 'com.google.dagger:dagger:2.24'
-    implementation 'androidx.appcompat:appcompat:1.6.1'
-    implementation 'androidx.lifecycle:lifecycle-viewmodel:2.7.0'
-    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.7.0'
+    implementation 'androidx.appcompat:appcompat:1.7.0'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel:2.8.3'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.3'
     annotationProcessor 'com.google.dagger:dagger-compiler:2.24'
-    implementation platform('com.google.firebase:firebase-bom:32.7.4')
+    implementation platform('com.google.firebase:firebase-bom:33.6.0')
     implementation('com.google.firebase:firebase-messaging')
-    api('com.google.android.gms:play-services-location:21.2.0')
+    api('com.google.android.gms:play-services-location:21.3.0')
     implementation 'androidx.media:media:1.7.0'
     implementation 'androidx.legacy:legacy-support-v13:1.0.0'
-    implementation("com.mapp.sdk:mapp-android:6.0.23")
+    implementation("com.mapp.sdk:mapp-android:6.0.25")
 }
 

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

@@ -79,9 +79,11 @@ public class RNMappPluginModule extends ReactContextBaseJavaModule {
         getReactApplicationContext().addLifecycleEventListener(new LifecycleEventListener() {
             @Override
             public void onHostResume() {
-                Appoxee.engage(application);
-                Appoxee.setOrientation(application, ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
-                Appoxee.instance().setReceiver(MyPushBroadcastReceiver.class);
+//                Commented out for now.
+//                It prevents the app from channging registered channel with a new one.
+//                Appoxee.engage(application);
+//                Appoxee.setOrientation(application, ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
+//                Appoxee.instance().setReceiver(MyPushBroadcastReceiver.class);
             }
 
             @Override
@@ -215,6 +217,7 @@ public class RNMappPluginModule extends ReactContextBaseJavaModule {
         opt.notificationMode = NotificationMode.BACKGROUND_AND_FOREGROUND;
         opt.tenantID = tenantID;
         Appoxee.engage(Objects.requireNonNull(application), opt);
+
         Appoxee.instance().addInitListener(new Appoxee.OnInitCompletedListener() {
             @Override
             public void onInitCompleted(boolean successful, Exception failReason) {

package/ios/RNMappEventEmmiter.m

@@ -170,12 +170,18 @@ NSString *const MappRNInappMessage = @"com.mapp.inapp_message";
 -(NSDictionary *) getRichMessage: (APXRichMessage *) message {
     NSMutableDictionary *dict = [[NSMutableDictionary alloc] init];
     [dict setObject:[[NSNumber numberWithInteger:message.uniqueID] stringValue] forKey:@"id"];
-    [dict setObject:message.title forKey:@"title"];
+    if (message.title)
+        [dict setObject:message.title forKey:@"title"];
+    if (message.content)
     [dict setObject:message.content forKey:@"content"];
-    [dict setObject:message.title forKey:@"title"];
-    [dict setObject:message.messageLink forKey:@"messageLink"];
-    [dict setObject:[self stringFromDate: message.postDate inUTC:false] forKey:@"postDate"];
-    [dict setObject:[self stringFromDate: message.postDate inUTC:true] forKey:@"postDateUTC"];
+    if (message.title)
+        [dict setObject:message.title forKey:@"title"];
+    if (message.messageLink)
+        [dict setObject:message.messageLink forKey:@"messageLink"];
+    if (message.postDate)
+        [dict setObject:[self stringFromDate: message.postDate inUTC:false] forKey:@"postDate"];
+    if (message.postDate)
+        [dict setObject:[self stringFromDate: message.postDate inUTC:true] forKey:@"postDateUTC"];
     return dict;
 
 }

package/ios/RNMappPluginModule.m

@@ -228,25 +228,30 @@ RCT_EXPORT_METHOD(fetchInboxMessage: (RCTPromiseResolveBlock)resolve rejecter:(R
     resolve(@"Fetching, set event listener for iOS");
 }
 
+RCT_EXPORT_METHOD(fetchLatestInboxMessage: (RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
+    [[AppoxeeInapp shared] fetchAPXInBoxMessages];
+    resolve(@"Fetching, set event listener for iOS");
+}
+
 RCT_EXPORT_METHOD(triggerInApp: (NSString *) event) {
     [[AppoxeeInapp shared] reportInteractionEventWithName:event andAttributes:nil];
 }
 
-RCT_EXPORT_METHOD(inAppMarkAsRead: (NSNumber *) templateId event: (NSString *) eventId) {
+RCT_EXPORT_METHOD(inAppMarkAsRead: (NSNumber * _Nonnull) templateId event: (NSString * _Nonnull) eventId) {
     APXInBoxMessage *message = [[RNMappEventEmmiter shared] getMessageWith:templateId event:eventId];
     if (message) {
         [message markAsRead];
     }
 }
 
-RCT_EXPORT_METHOD(inAppMarkAsUnRead: (NSNumber *) templateId event: (NSString *) eventId) {
+RCT_EXPORT_METHOD(inAppMarkAsUnRead: (NSNumber * _Nonnull) templateId event: (NSString * _Nonnull) eventId) {
     APXInBoxMessage *message = [[RNMappEventEmmiter shared] getMessageWith:templateId event:eventId];
     if (message) {
         [message markAsUnread];
     }
 }
 
-RCT_EXPORT_METHOD(inAppMarkAsDeleted: (NSNumber *) templateId event: (NSString *) eventId) {
+RCT_EXPORT_METHOD(inAppMarkAsDeleted: (NSNumber * _Nonnull) templateId event: (NSString * _Nonnull) eventId) {
     APXInBoxMessage *message = [[RNMappEventEmmiter shared] getMessageWith:templateId event:eventId];
     if (message) {
         [message markAsDeleted];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-mapp-plugin",
-  "version": "1.1.3",
+  "version": "1.2.1",
   "description": "Mapp SDK for React Native.",
   "main": "index.js",
   "keywords": [
@@ -14,13 +14,13 @@
   "author": "Mapp",
   "license": "MIT",
   "peerDependencies": {
-    "react": "^18.0.0",
+    "react": "19.0.0",
     "react-native": ">=0.60.0-rc.0 <1.0.x"
   },
   "devDependencies": {
     "jest": "^28.1.3",
-    "react": "18.0.0",
-    "react-native": "0.69.4"
+    "react": "19.0.0",
+    "react-native": "^0.78.0"
   },
   "repository": {
     "type": "git",