react-native-mapp-plugin 1.2.0 → 1.3.0

package/.vscode/settings.json

@@ -1,3 +1,4 @@
 {
-    "java.configuration.updateBuildConfiguration": "automatic"
+    "java.configuration.updateBuildConfiguration": "automatic",
+    "java.compile.nullAnalysis.mode": "automatic"
 }

package/Helper.md

@@ -0,0 +1,23 @@
+### Clean all caches 
+```bash
+./clean.sh
+```
+
+### Generate codegen
+```bash
+npx react-native codegen
+```
+
+### rebuild node_modules
+```bash
+npm install #or yarn install
+```
+
+### Run application
+```bash
+npx react-native run-android 
+```
+or
+```bash
+npx react-native run-ios
+```

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

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": [
@@ -14,12 +14,12 @@
   "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": "^24.9.0",
-    "react": "^18.0.0",
+    "react": "^19.0.0",
     "react-native": "^0.61.5"
   },
   "repository": {

package/android/.project

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>android</name>
+	<name>MappEngagePlugin-android</name>
 	<comment>Project android created by Buildship.</comment>
 	<projects>
 	</projects>

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

@@ -1,11 +1,11 @@
-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)
 connection.project.dir=
 eclipse.preferences.version=1
 gradle.user.home=
-java.home=/Users/semsudin.tafilovic/Library/Java/JavaVirtualMachines/jbr-17.0.9/Contents/Home
+java.home=/Users/semsudin.tafilovic/.sdkman/candidates/java/17.0.15-tem
 jvm.arguments=
 offline.mode=false
 override.workspace.settings=true

package/android/build.gradle

@@ -1,71 +1,42 @@
-buildscript {
-    repositories {
-        flatDir {
-            dirs 'libs'
-        }
-        google()
-        mavenCentral()
-        maven {
-            // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
-            url "$rootDir/../node_modules/react-native/android"
-        }
-    }
-    dependencies {
-        classpath('com.android.tools.build:gradle:8.2.2')
-        //classpath('com.google.gms:google-services:4.3.15')
-        //classpath("com.facebook.react:react-native-gradle-plugin")
-        // NOTE: Do not place your application dependencies here; they belong
-        // in the individual module build.gradle files
-    }
-}
-
-allprojects {
-    repositories {
-        google()
-        mavenLocal()
-        mavenCentral()
-        maven { url "https://maven.google.com/" }
-    }
-}
-apply plugin: 'com.android.library'
-
-def safeExtGet(prop, fallback) {
-    rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
+plugins {
+    id("com.android.library")
+    id("org.jetbrains.kotlin.android")
+    id("com.facebook.react") // This is required for New Architecture & Codegen
 }
 
 android {
-    namespace 'com.reactlibrary'
-    compileSdkVersion safeExtGet('compileSdkVersion', 34)
-    buildToolsVersion safeExtGet('buildToolsVersion', '34.0.0')
+    namespace "com.reactlibrary"
+    compileSdk = 35
 
     defaultConfig {
-        minSdkVersion safeExtGet('minSdkVersion', 21)
-        targetSdkVersion safeExtGet('targetSdkVersion', 34)
-        versionCode 1
-        versionName '1.0'
+        minSdk = 21
+        targetSdk = 35
+        versionCode = 1
+        versionName = "1.0"
     }
 
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-        }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
 }
 
 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.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:33.6.0')
+    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 '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('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.legacy:legacy-support-v13:1.0.0'
-    implementation("com.mapp.sdk:mapp-android:6.0.25")
+    implementation("com.mapp.sdk:mapp-android:6.0.29-alpha02")
 }
 
+react {
+    jsRootDir = rootDir
+    libraryName = "RNMappPlugin"
+    codegenJavaPackageName = "com.reactlibrary"
+}

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

package/android/gradle.properties

@@ -1,16 +1,44 @@
-## For more details on how to configure your build environment visit
+# Project-wide Gradle settings.
+
+# IDE (e.g. Android Studio) users:
+# Gradle settings configured through the IDE *will override*
+# any settings specified in this file.
+
+# For more details on how to configure your build environment visit
 # http://www.gradle.org/docs/current/userguide/build_environment.html
-#
+
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
-# Default value: -Xmx1024m -XX:MaxPermSize=256m
-# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
-#
+# Default value: -Xmx512m -XX:MaxMetaspaceSize=256m
+org.gradle.jvmargs=-Xmx4g -XX:MaxMetaspaceSize=512m
+
+android.enableJetifier=true
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
-#Sun Sep 12 15:56:18 CEST 2021
+
+# AndroidX package structure to make it clearer which packages are bundled with the
+# Android operating system, and which are packaged with your app's APK
+# https://developer.android.com/topic/libraries/support-library/androidx-rn
 android.useAndroidX=true
-android.enableJetifier=true
-org.gradle.jvmargs=-Xmx4096M -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+
+# Use this property to specify which architecture you want to build.
+# You can also override it from the CLI using
+# ./gradlew <task> -PreactNativeArchitectures=x86_64
+reactNativeArchitectures=armeabi-v7a,arm64-v8a,x86,x86_64
+
+# Use this property to enable support to the new architecture.
+# This will allow you to use TurboModules and the Fabric render in
+# your application. You should enable this flag either if you want
+# to write custom TurboModules/Fabric components OR use libraries that
+# are providing them.
+newArchEnabled=true
+
+# Use this property to enable or disable the Hermes JS engine.
+# 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/settings.gradle

@@ -1 +1,24 @@
-include ':app'
+pluginManagement {
+    repositories {
+        google()
+        mavenCentral()
+        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
+    }
+}
+
+dependencyResolutionManagement {
+    repositories {
+        google()
+        mavenLocal()
+        mavenCentral()
+    }
+}
+includeBuild("../node_modules/@react-native/gradle-plugin")
+
+rootProject.name="MappEngagePlugin"
+include(":MappEngagePlugin")

package/android/src/main/AndroidManifest.xml

@@ -1,6 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.reactlibrary">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.INTERNET" />
@@ -61,7 +60,7 @@
                 android:name=".ActivityListener"
                 android:exported="false"
                 android:theme="@style/HelperActivityStyle">
-            <intent-filter>
+            <intent-filter tools:ignore="AppLinkUrlError">
                 <action android:name="com.mapp.RICH_PUSH" />
                 <category android:name="${applicationId}" />
 

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

@@ -6,14 +6,14 @@ import androidx.annotation.NonNull;
 
 import com.appoxee.Appoxee;
 import com.appoxee.internal.logger.LoggerFactory;
-import com.appoxee.push.fcm.MappMessagingService;
+import com.google.firebase.messaging.FirebaseMessagingService;
 import com.google.firebase.messaging.RemoteMessage;
 
+import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
 
-public class MessageService extends MappMessagingService {
-
+public class MessageService extends FirebaseMessagingService {
     @Override
     public void onCreate() {
         super.onCreate();
@@ -23,24 +23,30 @@ public class MessageService extends MappMessagingService {
     @Override
     public void onMessageReceived(@NonNull RemoteMessage remoteMessage) {
         Log.d("onMessageReceived", remoteMessage.toString());
-        waitInitialization();
-        super.onMessageReceived(remoteMessage);
+        Map<String, String> data = remoteMessage.getData();
+        if (data.containsKey("p")) {
+            waitInitialization();
+            Appoxee.instance().setRemoteMessage(remoteMessage);
+        } else {
+            super.onMessageReceived(remoteMessage);
+        }
     }
 
     @Override
-    public void onNewToken(String s) {
+    public void onNewToken(@NonNull String s) {
         waitInitialization();
+        Appoxee.instance().setToken(s);
         super.onNewToken(s);
     }
 
-    private void waitInitialization(){
-        int limit=15;
-        try{
+    private void waitInitialization() {
+        int limit = 15;
+        try {
             while (limit >= 0 && !Appoxee.instance().isReady()) {
                 TimeUnit.MILLISECONDS.sleep(300);
                 limit--;
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             LoggerFactory.getDevLogger().e(e.getMessage());
         }
     }

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

@@ -7,6 +7,7 @@ import android.content.pm.ActivityInfo;
 import android.content.pm.PackageManager;
 import android.os.Build;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.core.app.NotificationManagerCompat;
 import androidx.core.content.ContextCompat;
@@ -39,6 +40,10 @@ import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.WritableArray;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.bridge.WritableNativeMap;
+import com.facebook.react.module.annotations.ReactModule;
+import com.google.android.gms.tasks.OnCompleteListener;
+import com.google.android.gms.tasks.Task;
+import com.google.firebase.messaging.FirebaseMessaging;
 import com.google.firebase.messaging.RemoteMessage;
 
 import org.json.JSONException;
@@ -55,8 +60,10 @@ import java.util.concurrent.ConcurrentHashMap;
  * Copyright (c) 2019 MAPP.
  */
 @SuppressWarnings("ALL")
+@ReactModule(name = RNMappPluginModule.NAME)
 public class RNMappPluginModule extends ReactContextBaseJavaModule {
 
+    public static final String NAME = "RNMappPluginModule";
     private final ReactApplicationContext reactContext;
     private Map<Callback, String> mFeedSubscriberMap = new ConcurrentHashMap<>();
     private Map<Callback, Boolean> mCallbackWasCalledMap = new ConcurrentHashMap<>();
@@ -70,7 +77,7 @@ public class RNMappPluginModule extends ReactContextBaseJavaModule {
 
     @Override
     public String getName() {
-        return "RNMappPluginModule";
+        return NAME;
     }
 
     @Override
@@ -163,8 +170,9 @@ public class RNMappPluginModule extends ReactContextBaseJavaModule {
         if (remoteMessage != null) {
             Appoxee.instance().setRemoteMessage(remoteMessage);
             promise.resolve(true);
+        } else {
+            promise.resolve(false);
         }
-        promise.resolve(false);
     }
 
     @ReactMethod
@@ -186,10 +194,11 @@ public class RNMappPluginModule extends ReactContextBaseJavaModule {
 
     @ReactMethod
     public void getToken(Promise promise) {
-        Appoxee.instance().getFcmToken(new ResultCallback<String>() {
+        FirebaseMessaging.getInstance().getToken().addOnCompleteListener(new OnCompleteListener<String>() {
             @Override
-            public void onResult(@Nullable String s) {
-                promise.resolve(s);
+            public void onComplete(@NonNull Task<String> task) {
+                String token = task.getResult();
+                promise.resolve(token);
             }
         });
     }
@@ -445,7 +454,7 @@ public class RNMappPluginModule extends ReactContextBaseJavaModule {
     public void inAppMarkAsRead(Integer templateId, String eventId) {
         Appoxee.instance().triggerStatistcs((getCurrentActivity()), getInAppStatisticsRequestObject(templateId,
                 eventId,
-                InAppStatistics.INBOX_INBOX_MESSAGE_READ_KEY, null, null, null));
+                InAppStatistics.INBOX_INBOX_MESSAGE_READ_KEY, -1, null, null));
     }
 
     @ReactMethod
@@ -453,7 +462,7 @@ public class RNMappPluginModule extends ReactContextBaseJavaModule {
         Appoxee.instance().triggerStatistcs((reactContext.getApplicationContext()),
                 getInAppStatisticsRequestObject(templateId,
                         eventId,
-                        InAppStatistics.INBOX_INBOX_MESSAGE_UNREAD_KEY, null, null, null));
+                        InAppStatistics.INBOX_INBOX_MESSAGE_UNREAD_KEY, -1, null, null));
     }
 
     @ReactMethod
@@ -461,12 +470,12 @@ public class RNMappPluginModule extends ReactContextBaseJavaModule {
         Appoxee.instance().triggerStatistcs((reactContext.getApplicationContext()),
                 getInAppStatisticsRequestObject(templateId,
                         eventId,
-                        InAppStatistics.INBOX_INBOX_MESSAGE_DELETED_KEY, null, null, null));
+                        InAppStatistics.INBOX_INBOX_MESSAGE_DELETED_KEY, -1, null, null));
     }
 
     @ReactMethod
     public void triggerStatistic(Integer templateId, String originalEventId,
-                                 String trackingKey, Long displayMillis,
+                                 String trackingKey, int displayMillis,
                                  String reason, String link) {
         Appoxee.instance()
                 .triggerStatistcs((reactContext.getApplicationContext()), getInAppStatisticsRequestObject(templateId,
@@ -514,7 +523,7 @@ public class RNMappPluginModule extends ReactContextBaseJavaModule {
     }
 
     private static InAppStatistics getInAppStatisticsRequestObject(int templateId, String originalEventId,
-                                                                   String trackingKey, Long displayMillis,
+                                                                   String trackingKey, int displayMillis,
                                                                    String reason, String link) {
 
         InAppStatistics inAppStatistics = new InAppStatistics();
@@ -526,7 +535,10 @@ public class RNMappPluginModule extends ReactContextBaseJavaModule {
         Tracking tk = new Tracking();
         tk.setTrackingKey(trackingKey);
         TrackingAttributes ta = new TrackingAttributes();
-        ta.setTimeSinceDisplayMillis(displayMillis);
+        int displayTime = displayMillis >= 0 ? displayMillis : -1;
+        if (displayTime > 0) {
+            ta.setTimeSinceDisplayMillis((long) displayMillis);
+        }
         ta.setReason(reason);
         ta.setLink(link);
         tk.setTrackingAttributes(ta);

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

@@ -1,35 +1,52 @@
-
 package com.reactlibrary;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
+import androidx.annotation.NonNull;
 
 import com.facebook.react.ReactPackage;
 import com.facebook.react.bridge.NativeModule;
 import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.JavaScriptModule;
+import com.facebook.react.module.model.ReactModuleInfo;
+import com.facebook.react.module.model.ReactModuleInfoProvider;
 import com.facebook.react.uimanager.ViewManager;
 
-/**
- * Created by Aleksandar Marinkovic on 2019-05-15.
- * Copyright (c) 2019 MAPP.
- */
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 public class RNMappPluginPackage implements ReactPackage {
+
+  @NonNull
   @Override
-  public List<NativeModule> createNativeModules(ReactApplicationContext reactContext) {
-    List<NativeModule> modules = new ArrayList<>();
-    modules.add(new RNMappPluginModule(reactContext));
-    return modules;
+  public List<NativeModule> createNativeModules(@NonNull ReactApplicationContext reactContext) {
+    return Collections.singletonList(new RNMappPluginModule(reactContext));
   }
 
-  // Deprecated from RN 0.47
-  public List<Class<? extends JavaScriptModule>> createJSModules() {
+  @NonNull
+  @Override
+  public List<ViewManager> createViewManagers(@NonNull ReactApplicationContext reactContext) {
     return Collections.emptyList();
   }
 
-  @Override
-  public List<ViewManager> createViewManagers(ReactApplicationContext reactContext) {
-    return Collections.emptyList();
+  public ReactModuleInfoProvider getReactModuleInfoProvider() {
+    return () -> {
+      Map<String, ReactModuleInfo> moduleInfos = new HashMap<>();
+
+      moduleInfos.put(
+              RNMappPluginModule.NAME,
+              new ReactModuleInfo(
+                      RNMappPluginModule.NAME,
+                      RNMappPluginModule.NAME,
+                      false, // canOverrideExistingModule
+                      false, // needsEagerInit
+                      true,  // hasConstants
+                      false, // isCxxModule
+                      true   // isTurboModule -> THIS IS IMPORTANT
+              )
+      );
+
+      return moduleInfos;
+    };
   }
-}
+}
+

package/clean.sh

@@ -0,0 +1,34 @@
+#!/bin/bash
+
+echo "Cleaning React Native project caches..."
+
+rm -rf \
+  node_modules \
+  yarn.lock \
+  package-lock.json \
+  android/.gradle \
+  android/build \
+  android/app/build \
+  android/.idea \
+  android/local.properties \
+  ios/Pods \
+  ios/build \
+  ios/DerivedData \
+  ios/.xcworkspace \
+  example/node_modules \
+  example/yarn.lock \
+  example/package-lock.json \
+  example/android/.gradle \
+  example/android/build \
+  example/android/app/build \
+  example/android/.idea \
+  example/android/local.properties \
+  example/ios/Pods \
+  example/ios/build \
+  example/ios/DerivedData \
+  example/ios/.xcworkspace
+
+echo "Optionally removing global Xcode DerivedData..."
+echo "To remove: rm -rf ~/Library/Developer/Xcode/DerivedData"
+
+echo "✅ Cleanup complete."

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;
 
 }