infobip-mobile-messaging-react-native-plugin 13.11.0 → 13.11.2

package/android/build.gradle

@@ -87,7 +87,7 @@ repositories {
 }
 
 dependencies {
-    def mmVersion = '14.6.0'
+    def mmVersion = '14.6.2'
     //react and mm dependencies clash
     if (!overrideKotlinVersion.empty) {
         constraints {

package/android/src/main/java/org/infobip/reactlibrary/mobilemessaging/CacheManager.java

@@ -4,6 +4,8 @@ import android.content.Context;
 import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
 
+import android.util.Log;
+
 import org.infobip.mobile.messaging.api.support.http.serialization.JsonSerializer;
 import org.infobip.mobile.messaging.dal.json.JSONArrayAdapter;
 import org.infobip.mobile.messaging.dal.json.JSONObjectAdapter;
@@ -39,17 +41,29 @@ class CacheManager {
     }
 
     static void saveEvent(Context context, String event, JSONObject object, String actionId, String actionInputText) {
+        if (context == null) {
+            Log.e(Utils.TAG, "context is null, can't cache event " + event);
+            return;
+        }
         String serialized = serializer.serialize(new Event(event, object, actionId, actionInputText));
         saveStringsToSet(context, EVENTS_KEY, serialized);
     }
 
     static void saveEvent(Context context, String event, int unreadMessagesCounter) {
+        if (context == null) {
+            Log.e(Utils.TAG, "context is null, can't cache event " + event);
+            return;
+        }
         //int `unreadMessagesCounter` isn't a JSONObject, so it'll go as a second argument
         String serialized = serializer.serialize(new Event(event, null, unreadMessagesCounter));
         saveStringsToSet(context, EVENTS_KEY, serialized);
     }
 
     static Event[] loadEvents(Context context, String eventType) {
+        if (context == null) {
+            Log.e(Utils.TAG, "context is null, can't load cached events " + eventType);
+            return new Event[0];
+        }
         Set<String> serialized = getStringSet(context, EVENTS_KEY);
         if (serialized == null || serialized.isEmpty()) {
             return new Event[0];

package/android/src/main/java/org/infobip/reactlibrary/mobilemessaging/ReactNativeEvent.java

@@ -66,6 +66,10 @@ class ReactNativeEvent {
         if (eventName == null || map == null) {
             return;
         }
+        if (reactContext == null) {
+            Log.e(Utils.TAG, "reactContext is null, can't send event " + eventName);
+            return;
+        }
 
         reactContext.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class).emit(eventName, map);
     }
@@ -74,6 +78,10 @@ class ReactNativeEvent {
         if (eventName == null || array == null) {
             return;
         }
+        if (reactContext == null) {
+            Log.e(Utils.TAG, "reactContext is null, can't send event " + eventName);
+            return;
+        }
 
         reactContext.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class).emit(eventName, array);
     }
@@ -82,6 +90,10 @@ class ReactNativeEvent {
         if (eventName == null) {
             return;
         }
+        if (reactContext == null) {
+            Log.e(Utils.TAG, "reactContext is null, can't send event " + eventName);
+            return;
+        }
         reactContext.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class).emit(eventName, null);
     }
 

package/android/src/main/java/org/infobip/reactlibrary/mobilemessaging/ReactNativeMobileMessagingModule.java

@@ -155,22 +155,6 @@ public class ReactNativeMobileMessagingModule extends ReactContextBaseJavaModule
         // Keep: Required for RN built in Event Emitter Calls.
     }
 
-    private static void emitOrCache(String eventType, ReactContext reactContext, JSONObject message, String actionId, String actionInputText) {
-        if (jsHasListeners) {
-            ReactNativeEvent.send(eventType, reactContext, message, actionId, actionInputText);
-        } else {
-            CacheManager.saveEvent(reactContext, eventType, message, actionId, actionInputText);
-        }
-    }
-
-    private static void emitOrCache(String eventType, ReactContext reactContext, int unreadMessagesCounter) {
-        if (jsHasListeners) {
-            ReactNativeEvent.send(eventType, reactContext, unreadMessagesCounter);
-        } else {
-            CacheManager.saveEvent(reactContext, eventType, unreadMessagesCounter);
-        }
-    }
-
     //region BroadcastReceivers
     //region Events
     private static final String EVENT_TOKEN_RECEIVED = "tokenReceived";
@@ -191,7 +175,6 @@ public class ReactNativeMobileMessagingModule extends ReactContextBaseJavaModule
     private static final String EVENT_INAPPCHAT_AVAILABILITY_UPDATED = "inAppChat.availabilityUpdated";
     //endregion
 
-
     //region MessageStorageBroadcastReceiver
     private static final Map<String, String> messageStorageEventMap = new HashMap<String, String>() {{
         put(MessageStoreAdapter.EVENT_MESSAGESTORAGE_START, MessageStoreAdapter.EVENT_MESSAGESTORAGE_START);
@@ -237,7 +220,6 @@ public class ReactNativeMobileMessagingModule extends ReactContextBaseJavaModule
     //endregion
 
     //region MessageBroadcastReceiver
-
     /**
      * For event caching, if plugin not yet initialized
      */
@@ -279,7 +261,7 @@ public class ReactNativeMobileMessagingModule extends ReactContextBaseJavaModule
             if (!pluginInitialized) {
                 CacheManager.saveEvent(context, event, message, actionId, actionInputText);
             } else {
-                emitOrCache(event, getReactContext(context), message, actionId, actionInputText);
+                emitOrCache(event, context, message, actionId, actionInputText);
             }
         }
 
@@ -288,16 +270,43 @@ public class ReactNativeMobileMessagingModule extends ReactContextBaseJavaModule
             if (!pluginInitialized) {
                 CacheManager.saveEvent(context, event, unreadChatMessagesCounter);
             } else {
-                emitOrCache(event, getReactContext(context), unreadChatMessagesCounter);
+                emitOrCache(event, context, unreadChatMessagesCounter);
             }
         }
 
         @Nullable
         private ReactContext getReactContext(Context context) {
             ReactApplication reactApplication = (ReactApplication) context.getApplicationContext();
-            if (reactApplication == null) return null;
+            if (reactApplication == null)
+                return null;
             return reactApplication.getReactNativeHost().getReactInstanceManager().getCurrentReactContext();
         }
+
+        private void emitOrCache(String eventType, Context context, JSONObject message, String actionId, String actionInputText) {
+            ReactContext reactContext = getReactContext(context);
+            if (jsHasListeners && reactContext != null) {
+                ReactNativeEvent.send(eventType, reactContext, message, actionId, actionInputText);
+            } else if (reactContext != null) {
+                CacheManager.saveEvent(reactContext, eventType, message, actionId, actionInputText);
+            } else if (context != null) {
+                CacheManager.saveEvent(context, eventType, message, actionId, actionInputText);
+            } else {
+                Log.e(Utils.TAG, "Both reactContext and androidContext are null, can't emit or cache event " + eventType);
+            }
+        }
+
+        private void emitOrCache(String eventType, Context context, int unreadMessagesCounter) {
+            ReactContext reactContext = getReactContext(context);
+            if (jsHasListeners && reactContext != null) {
+                ReactNativeEvent.send(eventType, reactContext, unreadMessagesCounter);
+            } else if (reactContext != null) {
+                CacheManager.saveEvent(reactContext, eventType, unreadMessagesCounter);
+            } else if (context != null) {
+                CacheManager.saveEvent(context, eventType, unreadMessagesCounter);
+            } else {
+                Log.e(Utils.TAG, "Both reactContext and androidContext are null, can't emit or cache event " + eventType);
+            }
+        }
     }
     //endregion
 

package/infobip-mobile-messaging-react-native-plugin.podspec

@@ -1,7 +1,7 @@
 require "json"
 
 package = JSON.parse(File.read(File.join(__dir__, "package.json")))
-mmVersion = "13.12.0"
+mmVersion = "13.12.4"
 
 Pod::Spec.new do |s|
   s.name         = "infobip-mobile-messaging-react-native-plugin"

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "infobip-mobile-messaging-react-native-plugin",
   "title": "Infobip Mobile Messaging React Native Plugin",
-  "version": "13.11.0",
+  "version": "13.11.2",
   "description": "Infobip Mobile Messaging React Native Plugin",
   "main": "./src/index.js",
   "scripts": {