Fixed iOS pushtoken issue during init. (#205)

* Fixed iOS pushtoken issue during init.

* typo fix

* updated changelogs and updated version

* updated changelogs and updated version

* Update CHANGELOG.md

* Update CountlyConfig.js

* docs addition

* Update CountlyConfig.js

* changing a comment

* no message

* .

* .

* .,

* '

* .,

---------

Co-authored-by: Peter Obiechina <[email protected]>
Co-authored-by: Artūrs Kadiķis <[email protected]>

Author: 3 people

CHANGELOG.md

@@ -1,3 +1,6 @@
+## 23.2.3
+* Fixed bug where the push notification type was not correctly set during init
+
 ## 23.2.2
 * Fixed bug that caused an issue in the deprecated init call
 

Countly.js

@@ -53,8 +53,10 @@ Countly.TemporaryDeviceIDString = 'TemporaryDeviceID';
  * @deprecated in 23.02.0 : use 'initWithConfig' intead of 'init'.
  *
  * @function Countly.init should be used to initialize countly
+ * @param {String} serverURL server url
+ * @param {String} appKey application key
+ * @param {String} deviceId device ID
  */
-// countly initialization
 Countly.init = async function (serverUrl, appKey, deviceId) {
     Countly.logError('init is deprecated, use initWithConfig instead');
     const countlyConfig = new CountlyConfig(serverUrl, appKey).setDeviceID(deviceId);
@@ -65,8 +67,8 @@ Countly.init = async function (serverUrl, appKey, deviceId) {
  * Initialize Countly
  *
  * @function Countly.initWithConfig should be used to initialize countly with config
+ * @param {Object} countlyConfig countly config object
  */
-// countly initialization with config
 Countly.initWithConfig = async function (countlyConfig) {
     if (_isInitialized) {
         Countly.logError('init', 'SDK is already initialized');
@@ -93,6 +95,11 @@ Countly.initWithConfig = async function (countlyConfig) {
     _isInitialized = true;
 };
 
+/**
+ * Converts countly config object to JSON
+ *
+ * @param {Object} countlyConfig config
+ */
 _configToJson = function (config) {
     const json = {};
     try {
@@ -165,6 +172,11 @@ _configToJson = function (config) {
     return json;
 };
 
+/**
+ * Checks if the sdk is initialized;
+ *
+ * @return {bool} whether countly sdk has been initialized
+ */
 Countly.isInitialized = async function () {
     // returns a promise
     _isInitialized = await CountlyReactNative.isInitialized();
@@ -180,7 +192,9 @@ Countly.hasBeenCalledOnStart = function () {
     return CountlyReactNative.hasBeenCalledOnStart();
 };
 
-// countly sending various types of events
+/**
+ * Used to send events
+ */
 Countly.sendEvent = function (options) {
     if (!_isInitialized) {
         const message = "'init' must be called before 'sendEvent'";
@@ -491,6 +505,7 @@ Countly.disableLocation = function () {
  *
  * Get currently used device Id.
  * Should be called after Countly init
+ * @return {String} device id
  * */
 Countly.getCurrentDeviceId = async function () {
     if (!_isInitialized) {
@@ -516,28 +531,35 @@ _getDeviceIdType = function (deviceIdType) {
             break;
     }
     if (result == null) {
-        Countly.logError('_getDeviceIdType', "unexpected deviceIdType [" + deviceIdType.toString() + "] from native side");
+        Countly.logError('_getDeviceIdType', 'unexpected deviceIdType [' + deviceIdType.toString() + '] from native side');
         return null;
     }
     return result;
 };
+
 /**
  * Get currently used device Id type.
  * Should be called after Countly init
+ * @return {String} device id type
  * */
 Countly.getDeviceIDType = async function () {
     if (!_isInitialized) {
         Countly.logError('getDeviceIDType', "'init' must be called before 'getDeviceIDType'");
         return null;
     }
     const result = await CountlyReactNative.getDeviceIDType();
-    if (result == null || result == "") {
+    if (result == null || result == '') {
         Countly.logError('getDeviceIDType', "'getDeviceIDType' unexpected null value from native side");
         return null;
     }
     return _getDeviceIdType(result);
 };
 
+/**
+ * Change the current device id
+ * @param {String} device id new device id
+ * @param {boolean} onServer merge device id
+ * */
 Countly.changeDeviceId = async function (newDeviceID, onServer) {
     if (!_isInitialized) {
         const msg = "'init' must be called before 'changeDeviceId'";

CountlyConfig.js

@@ -85,7 +85,7 @@ class CountlyConfig {
     /**
     * Method to give consent for specific features before init
     *
-    * @param {array of String} consents consents e.g ['location', 'sessions', 
+    * @param {String[]} consents consents e.g ['location', 'sessions', 
     * 'attribution', 'push', 'events', 'views', 'crashes', 'users', 'push', 
     * 'star-rating', 'apm', 'feedback', 'remote-config']
     */
@@ -147,8 +147,8 @@ class CountlyConfig {
     /**
     * Method to configure intent redirection check
     *
-    * @param {String} allowedIntentClassNames allowedIntentClassNames
-    * @param {String} allowedIntentPackageNames allowedIntentPackageNames
+    * @param {String[]} allowedIntentClassNames allowed intent class names
+    * @param {String[]} allowedIntentPackageNames allowed intent package name
     */
     configureIntentRedirectionCheck(allowedIntentClassNames, allowedIntentPackageNames) {
         this.allowedIntentClassNames = allowedIntentClassNames;
@@ -170,14 +170,18 @@ class CountlyConfig {
         return this;
     }
 
-    /// Report direct user attribution
+    /**
+    * Report direct user attribution
+    */
     recordDirectAttribution(campaignType, campaignData) {
       this.campaignType = campaignType;
       this.campaignData = campaignData;
       return this;
     }
-  
-    /// Report indirect user attribution
+
+    /**
+    * Report indirect user attribution
+    */
     recordIndirectAttribution(attributionValues) {
       this.attributionValues = attributionValues;
       return this;

CountlyReactNative.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name = 'CountlyReactNative'
-  s.version = '23.2.2'
+  s.version = '23.2.3'
   s.license = {
     :type => 'COMMUNITY',
     :text => <<-LICENSE

android/src/main/java/ly/count/android/sdk/react/CountlyReactNative.java

@@ -83,7 +83,7 @@ public String toString() {
 public class CountlyReactNative extends ReactContextBaseJavaModule implements LifecycleEventListener {
 
     public static final String TAG = "CountlyRNPlugin";
-    private String COUNTLY_RN_SDK_VERSION_STRING = "23.2.2";
+    private String COUNTLY_RN_SDK_VERSION_STRING = "23.2.3";
     private String COUNTLY_RN_SDK_NAME = "js-rnb-android";
 
     private static final CountlyConfig config = new CountlyConfig();

example/install.sh

@@ -11,7 +11,7 @@ rm App.js
 curl https://raw.githubusercontent.com/Countly/countly-sdk-react-native-bridge/master/example/App.js --output App.js
 curl https://raw.githubusercontent.com/Countly/countly-sdk-react-native-bridge/master/example/Example.js --output Example.js
 
-yarn add [email protected].2
+yarn add [email protected].3
 
 cd ./ios
 pod install

ios/src/CountlyReactNative.m

@@ -24,7 +24,7 @@ @interface CountlyFeedbackWidget ()
 + (CountlyFeedbackWidget *)createWithDictionary:(NSDictionary *)dictionary;
 @end
 
-NSString *const kCountlyReactNativeSDKVersion = @"23.2.2";
+NSString *const kCountlyReactNativeSDKVersion = @"23.2.3";
 NSString *const kCountlyReactNativeSDKName = @"js-rnb-ios";
 
 CLYPushTestMode const CLYPushTestModeProduction = @"CLYPushTestModeProduction";
@@ -155,10 +155,11 @@ - (void) populateConfig:(id) json {
     }
 
 #ifndef COUNTLY_EXCLUDE_PUSHNOTIFICATIONS
-    if (json[@"pushNotification"]) {
+    NSDictionary *pushJson = json[@"pushNotification"];
+    if (pushJson) {
         config.sendPushTokenAlways = YES;
         config.pushTestMode = CLYPushTestModeProduction;
-        NSString *tokenType = json[@"tokenType"];
+        NSString *tokenType = pushJson[@"tokenType"];
         if ([tokenType isEqualToString:@"1"]) {
             config.pushTestMode = CLYPushTestModeDevelopment;
         } else if ([tokenType isEqualToString:@"2"]) {