Merge pull request #95 from apptentive/develop

Release 5.4.6
apptentive · Nov 7, 2019 · 5e32cc3 · 5e32cc3
2 parents 1d7052c + 0de63b0
commit 5e32cc3
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,12 @@ This document lets you know what has changed in the React Native module. For cha
 - [Android Changelog](https://github.com/apptentive/apptentive-android/blob/master/CHANGELOG.md)
 - [iOS Changelog](https://github.com/apptentive/apptentive-ios/blob/master/CHANGELOG.md)
 
+# 2019-11-05 - v5.4.6
+
+- Fixed `podspec` file for 0.60-style auto-linking.
+- Apptentive Android SDK: 5.4.7
+- Apptentive iOS SDK: 5.2.7
+
 # 2019-11-05 - v5.4.5
 
 - Added `podspec` file and updated iOS header path for 0.60-style auto-linking.

diff --git a/android/src/main/res/values/strings.xml b/android/src/main/res/values/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="apptentive_distribution">React Native</string>
-    <string name="apptentive_distribution_version">5.4.5</string>
+    <string name="apptentive_distribution_version">5.4.6</string>
 </resources>
diff --git a/apptentive-react-native.podspec b/apptentive-react-native.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "apptentive-react-native"
-  s.version = "5.4.4"
+  s.version	 = '5.4.6'
   s.summary      = "Apptentive SDK module for React Native"
 
   s.description  = <<-DESC

diff --git a/ios/RNApptentiveModule.m b/ios/RNApptentiveModule.m
@@ -52,7 +52,7 @@ - (dispatch_queue_t)methodQueue
 	if (configuration) {
 		configuration.appID = configurationDictionary[@"appleID"];
 		configuration.distributionName = @"React Native";
-		configuration.distributionVersion = @"5.4.5";
+		configuration.distributionVersion = @"5.4.6";
 		[Apptentive registerWithConfiguration:configuration];
 
 		[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(messageCenterUnreadCountChangedNotification:) name:ApptentiveMessageCenterUnreadCountChangedNotification object:nil];

diff --git a/js/index.js b/js/index.js
@@ -11,6 +11,7 @@ export class ApptentiveConfiguration {
     this.shouldSanitizeLogMessages = true;
     this.shouldEncryptStorage = false;
   }
+
   toString() {
     return `(apptentiveKey=${this.apptentiveKey}, apptentiveSignature=${this.apptentiveSignature}, logLevel=${this.logLevel}, shouldSanitizeLogMessages=${this.shouldSanitizeLogMessages}, shouldEncryptStorage=${this.shouldEncryptStorage})`;
   }
@@ -130,9 +131,11 @@ export class Apptentive {
       const type = typeof value;
       if (type === 'string') {
         return RNApptentiveModule.addCustomPersonDataString(key, value);
-      } else if (type === 'number') {
+      }
+      if (type === 'number') {
         return RNApptentiveModule.addCustomPersonDataNumber(key, ApptentivePlatformSpecific.exportNumber(value));
-      } else if (type === 'boolean') {
+      }
+      if (type === 'boolean') {
         return RNApptentiveModule.addCustomPersonDataBool(key, value);
       }
     }
@@ -159,9 +162,11 @@ export class Apptentive {
       const type = typeof value;
       if (type === 'string') {
         return RNApptentiveModule.addCustomDeviceDataString(key, value);
-      } else if (type === 'number') {
-        return RNApptentiveModule.addCustomDeviceDataNumber(key, value);
-      } else if (type === 'boolean') {
+      }
+      if (type === 'number') {
+        return RNApptentiveModule.addCustomDeviceDataNumber(key, ApptentivePlatformSpecific.exportNumber(value));
+      }
+      if (type === 'boolean') {
         return RNApptentiveModule.addCustomDeviceDataBool(key, value);
       }
     }

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "apptentive-react-native",
-  "version": "5.4.5",
+  "version": "5.4.6",
   "description": "React Native Module for Apptentive SDK",
   "main": "js/index.js",
   "types": "js/index.d.ts",
@@ -11,6 +11,7 @@
     "android",
     "ios",
     "js",
+    "apptentive-react-native.podspec",
     "LICENSE"
   ],
   "keywords": [