Merge pull request #22 from Synerise/v1.1.1

Release of version 1.1.1

Author: awoczek

CHANGELOG.md

@@ -2,6 +2,12 @@
 
 All notable changes to this project will be documented in this file.
 
+## [1.1.1] - 2025-04-18
+ 
+### Fixed
+- Changed the name of `RNNotifications` class to `RNSyneriseNotifications` to avoid name conflicts with some popular plugins for React Native.
+
+
 ## [1.1.0] - 2025-04-15
 
 ### Fixed

README.md

@@ -1,4 +1,4 @@
-# Synerise React Native SDK (react-native-synerise-sdk) (1.1.0)
+# Synerise React Native SDK (react-native-synerise-sdk) (1.1.1)
 
 [![Platform](https://img.shields.io/badge/platform-iOS-orange.svg)](https://github.com/synerise/ios-sdk)
 [![Platform](https://img.shields.io/badge/platform-Android-orange.svg)](https://github.com/synerise/android-sdk)

android/build.gradle

@@ -4,8 +4,8 @@ ext.versions = [
         'minSdk'     : 24,
         'compileSdk' : 33,
         'targetSdk'  : 33,
-        'versionCode': 47,
-        'versionName': "1.1.0"
+        'versionCode': 48,
+        'versionName': "1.1.1"
 ]
 
 buildscript {

android/src/main/java/com/synerise/sdk/react/RNSyneriseInitializer.java

@@ -3,7 +3,6 @@
 import android.app.Application;
 import android.content.Context;
 import android.content.pm.ApplicationInfo;
-import android.util.Log;
 
 import com.synerise.sdk.core.Synerise;
 import com.synerise.sdk.core.types.enums.HostApplicationType;
@@ -17,7 +16,7 @@ public class RNSyneriseInitializer {
     public Boolean isCrashHandlingEnabled;
     public static volatile boolean isInitialized = false;
 
-    public static final String SDK_PLUGIN_VERSION = "1.1.0";
+    public static final String SDK_PLUGIN_VERSION = "1.1.1";
 
     public void initialize(Application app) {
         if (isInitialized == false) {
@@ -27,7 +26,7 @@ public void initialize(Application app) {
                     .baseUrl(baseUrl)
                     .syneriseDebugMode(isDebugModeEnabled)
                     .crashHandlingEnabled(isCrashHandlingEnabled)
-                    .pushRegistrationRequired(RNNotifications.getNativePushListener())
+                    .pushRegistrationRequired(RNSyneriseNotifications.getNativePushListener())
                     .setRequestValidationSalt(requestValidationSalt)
                     .hostApplicationType(HostApplicationType.REACT_NATIVE)
                     .hostApplicationSDKPluginVersion(SDK_PLUGIN_VERSION)
@@ -48,7 +47,7 @@ private static String getApplicationName(Context context) {
     }
 
     protected void notifyModules() {
-        RNNotifications.initializeNotifications();
+        RNSyneriseNotifications.initializeNotifications();
         RNInjector.initializeInjector();
         RNClient.initializeClient();
     }

android/src/main/java/com/synerise/sdk/react/RNNotifications.java renamed to android/src/main/java/com/synerise/sdk/react/RNSyneriseNotifications.java

@@ -35,7 +35,7 @@
 import static com.synerise.sdk.injector.SynerisePushKeys.ISSUER;
 import static com.synerise.sdk.injector.SynerisePushKeys.MESSAGE_TYPE;
 
-public class RNNotifications extends RNBaseModule {
+public class RNSyneriseNotifications extends RNBaseModule {
 
     private static ReactApplicationContext reactApplicationContext;
     private static List<Map<String, String>> dataToSend = new ArrayList<>();
@@ -53,7 +53,7 @@ public class RNNotifications extends RNBaseModule {
     private static final String REGISTRATION_REQUIRED_LISTENER_VALUE = "TokenRegistrationRequired";
     private IApiCall registerForNotificationCall;
 
-    public RNNotifications(ReactApplicationContext reactApplicationContext) {
+    public RNSyneriseNotifications(ReactApplicationContext reactApplicationContext) {
         super(reactApplicationContext);
         this.reactApplicationContext = reactApplicationContext;
 
@@ -78,7 +78,7 @@ public Map<String, Object> getConstants() {
     @Nonnull
     @Override
     public String getName() {
-        return "RNNotifications";
+        return "RNSyneriseNotifications";
     }
 
     //handleNotification(payload: Object)

android/src/main/java/com/synerise/sdk/react/RNSyneriseSdkPackage.java

@@ -16,7 +16,7 @@ public class RNSyneriseSdkPackage implements ReactPackage {
     public List<NativeModule> createNativeModules(ReactApplicationContext reactContext) {
       List<NativeModule> modules = new ArrayList<NativeModule>();
       modules.add(new RNSynerise(reactContext));
-      modules.add(new RNNotifications(reactContext));
+      modules.add(new RNSyneriseNotifications(reactContext));
       modules.add(new RNInjector(reactContext));
       modules.add(new RNClient(reactContext));
       modules.add(new RNTracker(reactContext));

android/src/main/java/com/synerise/sdk/react/listeners/OnRegisterPushListener.java

@@ -1,14 +1,14 @@
 package com.synerise.sdk.react.listeners;
 
-import com.synerise.sdk.react.RNNotifications;
+import com.synerise.sdk.react.RNSyneriseNotifications;
 
 public interface OnRegisterPushListener {
 
     OnRegisterPushListener NULL = new OnRegisterPushListener() {
 
         @Override
         public void onRegisterPushRequired() {
-            RNNotifications.sendRegisterForPushRequiredInfo();
+            RNSyneriseNotifications.sendRegisterForPushRequiredInfo();
         }
     };
 

ios/ReactNativeSynerise/Main/RNSyneriseInitializer.m

@@ -8,7 +8,7 @@
 
 #import "RNSyneriseInitializer.h"
 
-NSString * const SNRSyneriseSDKPluginVersion = @"1.1.0";
+NSString * const SNRSyneriseSDKPluginVersion = @"1.1.1";
 
 @implementation RNSyneriseInitializer
 

ios/ReactNativeSynerise/Main/RNSyneriseManager.h

@@ -9,7 +9,7 @@
 #import "ReactNativeSynerise.h"
 
 @class RNInjector;
-@class RNNotifications;
+@class RNSyneriseNotifications;
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -24,7 +24,7 @@ NS_ASSUME_NONNULL_BEGIN
 @interface RNSyneriseManager : NSObject
 
 @property (weak, nonatomic, nullable, readwrite) RNInjector *injector;
-@property (weak, nonatomic, nullable, readwrite) RNNotifications *notifications;
+@property (weak, nonatomic, nullable, readwrite) RNSyneriseNotifications *notifications;
 
 + (instancetype)sharedInstance;
 

ios/ReactNativeSynerise/Main/RNSyneriseManager.m

@@ -9,7 +9,7 @@
 #import "RNSyneriseManager.h"
 #import "RNSettings.h"
 #import "RNSynerise.h"
-#import "RNNotifications.h"
+#import "RNSyneriseNotifications.h"
 #import "RNClient.h"
 #import "RNTracker.h"
 #import "RNInjector.h"
@@ -34,7 +34,7 @@ + (void)load {
     NSArray *nativeModulesToCreate = @[
         RNSettings.class,
         RNSynerise.class,
-        RNNotifications.class,
+        RNSyneriseNotifications.class,
         RNClient.class,
         RNTracker.class,
         RNInjector.class,
@@ -95,8 +95,8 @@ - (nullable RNInjector *)injector {
     return [self getModuleForClass:RNInjector.class];
 }
 
-- (nullable RNNotifications *)notifications {
-    return [self getModuleForClass:RNNotifications.class];
+- (nullable RNSyneriseNotifications *)notifications {
+    return [self getModuleForClass:RNSyneriseNotifications.class];
 }
 
 #pragma mark - Public

ios/ReactNativeSynerise/Modules/RNSynerise.m

@@ -9,7 +9,7 @@
 #import "RNSynerise.h"
 #import "RNSyneriseInitializer.h"
 #import "RNInjector.h"
-#import "RNNotifications.h"
+#import "RNSyneriseNotifications.h"
 
 static NSString * const RNSyneriseInitializationSucessEventListenerKey = @"INITIALIZATION_SUCCESS_LISTENER_KEY";
 static NSString * const RNSyneriseInitializationFailureEventListenerKey = @"INITIALIZATION_FAILURE_LISTENER_KEY";

ios/ReactNativeSynerise/Modules/RNNotifications.h renamed to ios/ReactNativeSynerise/Modules/RNSyneriseNotifications.h

@@ -1,5 +1,5 @@
 //
-//  RNNotifications.h
+//  RNSyneriseNotifications.h
 //  react-native-synerise-sdk
 //
 //  Created by Synerise
@@ -10,7 +10,7 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface RNNotifications : RNBaseModule <RCTBridgeModule>
+@interface RNSyneriseNotifications : RNBaseModule <RCTBridgeModule>
 
 + (void)didChangeRegistrationToken:(NSString *)registrationToken;
 + (void)didReceiveNotification:(NSDictionary *)userInfo;

ios/ReactNativeSynerise/Modules/RNNotifications.m renamed to ios/ReactNativeSynerise/Modules/RNSyneriseNotifications.m

@@ -1,12 +1,12 @@
 //
-//  RNNotifications.m
+//  RNSyneriseNotifications.m
 //  react-native-synerise-sdk
 //
 //  Created by Synerise
 //  Copyright © 2021 Synerise. All rights reserved.
 //
 
-#import "RNNotifications.h"
+#import "RNSyneriseNotifications.h"
 #import "RNSyneriseManager.h"
 
 static char * const RNNotificationsQueueLabel = "com.synerise.sdk.react.notifications.queue";
@@ -21,31 +21,31 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface RNNotificationItem: NSObject
+@interface RNSyneriseNotificationItem: NSObject
 
 @property (copy, nonatomic, nonnull, readwrite) NSDictionary *userInfo;
 @property (copy, nonatomic, nullable, readwrite) NSString *actionIdentifier;
 
 @end
 
-@implementation RNNotificationItem
+@implementation RNSyneriseNotificationItem
 
 @end
 
-@interface RNNotifications () <RNSyneriseManagerDelegate>
+@interface RNSyneriseNotifications () <RNSyneriseManagerDelegate>
 
 @property (strong, nonatomic, nonnull, readonly) dispatch_queue_t queue;
 
 @property (copy, nonatomic, nullable, readwrite) NSString *registrationToken;
-@property (copy, nonatomic, nonnull, readonly) NSMutableArray<RNNotificationItem *> *pendingNotificationItems;
+@property (copy, nonatomic, nonnull, readonly) NSMutableArray<RNSyneriseNotificationItem *> *pendingNotificationItems;
 
 @end
 
-@implementation RNNotifications {
+@implementation RNSyneriseNotifications {
     BOOL _isProcessing;
 }
 
-static RNNotifications *moduleInstance;
+static RNSyneriseNotifications *moduleInstance;
 
 RCT_EXPORT_MODULE();
 
@@ -105,7 +105,7 @@ - (void)didChangeRegistrationToken:(NSString *)registrationToken {
 }
 
 - (void)didReceiveNotification:(NSDictionary *)userInfo actionIdentifier:(nullable NSString *)actionIdentifier {
-    RNNotificationItem *notificationItem = [self notificationItemWithUserInfo:userInfo andActionIdentifier:actionIdentifier];
+    RNSyneriseNotificationItem *notificationItem = [self notificationItemWithUserInfo:userInfo andActionIdentifier:actionIdentifier];
     if (notificationItem == nil) {
         return;
     }
@@ -117,8 +117,8 @@ - (void)didReceiveNotification:(NSDictionary *)userInfo actionIdentifier:(nullab
     }
 }
 
-- (nullable RNNotificationItem *)notificationItemWithUserInfo:(NSDictionary *)userInfo andActionIdentifier:(nullable NSString *)actionIdentifier {
-    RNNotificationItem *notificationItem = [RNNotificationItem new];
+- (nullable RNSyneriseNotificationItem *)notificationItemWithUserInfo:(NSDictionary *)userInfo andActionIdentifier:(nullable NSString *)actionIdentifier {
+    RNSyneriseNotificationItem *notificationItem = [RNSyneriseNotificationItem new];
 
     if (userInfo != nil) {
         notificationItem.userInfo = userInfo;
@@ -159,7 +159,7 @@ - (void)startProcessingIfPossible {
     }
 }
 
-- (void)addPendingNotificationItem:(RNNotificationItem *)notificationItem {
+- (void)addPendingNotificationItem:(RNSyneriseNotificationItem *)notificationItem {
     dispatch_async(self.queue, ^{
         [self.pendingNotificationItems addObject:notificationItem];
     });
@@ -171,7 +171,7 @@ - (void)flushPendingNotificationItems {
         NSInteger countNotificationItems = [pendingNotificationItemsCopied count];
 
         for (NSInteger i = 0; i < countNotificationItems; i++) {
-            RNNotificationItem *notificationItem = pendingNotificationItemsCopied[i];
+            RNSyneriseNotificationItem *notificationItem = pendingNotificationItemsCopied[i];
 
             [self sendNotificationItemToJS:notificationItem];
         }
@@ -189,7 +189,7 @@ - (void)sendRegistrationRequiredToJS {
     [[NSNotificationCenter defaultCenter] postNotificationName:kRNSyneriseRegistrationRequiredEvent object:nil userInfo:nil];
 }
 
-- (void)sendNotificationItemToJS:(RNNotificationItem *)notificationItem {
+- (void)sendNotificationItemToJS:(RNSyneriseNotificationItem *)notificationItem {
     id eventBody = [self dictionaryWithNotificationItem:notificationItem];
     [[NSNotificationCenter defaultCenter] postNotificationName:kRNSyneriseNotificationEvent object:nil userInfo:eventBody];
 }
@@ -202,7 +202,7 @@ - (NSDictionary *)dictionaryWithRegistrationToken:(NSString *)registrationToken
     };
 }
 
-- (NSDictionary *)dictionaryWithNotificationItem:(RNNotificationItem *)notificationItem {
+- (NSDictionary *)dictionaryWithNotificationItem:(RNSyneriseNotificationItem *)notificationItem {
     return @{
         RNNotificationsEventObjectPayloadKey: notificationItem.userInfo,
         RNNotificationsEventObjectActionIdentifierKey: notificationItem.actionIdentifier ?: [NSNull null]