Merge branch 'main' into push-to-start-live-activities

Author: brismithers

android/build.gradle

@@ -31,7 +31,7 @@ dependencies {
 
     // api is used instead of implementation so the parent :app project can access any of the OneSignal Java
     //   classes if needed. Such as com.onesignal.NotificationExtenderService
-    api 'com.onesignal:OneSignal:5.1.9'
+    api 'com.onesignal:OneSignal:5.1.10'
 
     testImplementation 'junit:junit:4.12'
 }

android/src/main/java/com/onesignal/rnonesignalandroid/RNOneSignal.java

@@ -229,7 +229,7 @@ public void onCatalystInstanceDestroy() {
     public void initialize(String appId) {
         Context context = mReactApplicationContext.getCurrentActivity();
         OneSignalWrapper.setSdkType("reactnative");
-        OneSignalWrapper.setSdkVersion("050102");
+        OneSignalWrapper.setSdkVersion("050103");
 
         if (oneSignalInitDone) {
             Log.e("OneSignal", "Already initialized the OneSignal React-Native SDK");

ios/RCTOneSignal/RCTOneSignal.m

@@ -47,7 +47,7 @@ - (void)initOneSignal:(NSDictionary *)launchOptions {
         return;
 
     OneSignalWrapper.sdkType = @"reactnative";
-    OneSignalWrapper.sdkVersion = @"050102";
+    OneSignalWrapper.sdkVersion = @"050103";
     // initialize the SDK with a nil app ID so cold start click listeners can be triggered
     [OneSignal initialize:nil withLaunchOptions:launchOptions];
     didInitialize = true;

ios/RCTOneSignal/RCTOneSignalEventEmitter.m

@@ -393,7 +393,7 @@ + (void)sendEventWithName:(NSString *)name withBody:(NSDictionary *)body {
     [OneSignal.User removeSms:smsNumber]; 
 }
 
-RCT_EXPORT_METHOD(addTag:(NSString *)key value:(NSString*)value) {
+RCT_EXPORT_METHOD(addTag:(NSString *)key value:(id)value) {
     [OneSignal.User addTagWithKey:key value:value];
 }
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-onesignal",
-  "version": "5.1.2",
+  "version": "5.1.3",
   "description": "React Native OneSignal SDK",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

src/index.ts

@@ -525,11 +525,19 @@ export namespace OneSignal {
     export function addTag(key: string, value: string) {
       if (!isNativeModuleLoaded(RNOneSignal)) return;
 
-      if (!key || (!value && value !== '')) {
-        console.error('OneSignal: sendTag: must include a key and a value');
+      if (!key || value === undefined || value === null) {
+        console.error('OneSignal: addTag: must include a key and a value');
         return;
       }
 
+      // forces values to be string types
+      if (typeof value !== 'string') {
+        console.warn(
+          'OneSignal: addTag: tag value must be of type string; attempting to convert',
+        );
+        value = String(value);
+      }
+
       RNOneSignal.addTag(key, value);
     }
 
@@ -548,6 +556,18 @@ export namespace OneSignal {
         return;
       }
 
+      const convertedTags = tags as { [key: string]: any };
+      Object.keys(tags).forEach(function (key) {
+        if (typeof convertedTags[key] !== 'string') {
+          console.warn(
+            'OneSignal: addTags: tag value for key ' +
+              key +
+              ' must be of type string; attempting to convert',
+          );
+          convertedTags[key] = String(convertedTags[key]);
+        }
+      });
+
       RNOneSignal.addTags(tags);
     }