Merge branch 'staging' of github.com:Countly/countly-sdk-react-native-bridge into staging-np

Author: turtledreams

CHANGELOG.md

@@ -1,3 +1,8 @@
+## 25.1.1-np
+
+* Updated the underlying Android SDK version to 25.1.1
+* Updated the underlying iOS SDK version to 25.1.1
+
 ## 25.1.0-np
 * ! Minor breaking change ! `Countly.userDataBulk.save()` method is now optional. SDK will save the cached data with internal triggers regularly.
 

Countly.d.ts

@@ -1184,6 +1184,20 @@ declare module "countly-sdk-react-native-bridge-np/CountlyConfig" {
     enableVisibilityTracking(): this;
   }
 
+  interface content {
+    /**
+     * 
+     * @param zoneTimerInterval - the interval in seconds to check for new content
+     */
+    setZoneTimerInterval(zoneTimerInterval: number): this;
+
+    /**
+     * 
+     * @param callback - callback to be called when new content is available
+     */
+    setGlobalContentCallback(callback: Function): this;
+  }
+
   /**
    *
    * This class holds APM specific configurations to be used with 
@@ -1281,6 +1295,11 @@ declare module "countly-sdk-react-native-bridge-np/CountlyConfig" {
        */
       experimental: experimental;
 
+      /**
+       * getter for content features
+       */
+      content: content;
+
       /**
      * Method to set the server url
      *

Countly.js

@@ -94,6 +94,17 @@ Countly.initWithConfig = async function (countlyConfig) {
         return;
     }
     L.d("initWithConfig, Initializing Countly");
+    if (countlyConfig.content.contentCallback) {
+        eventEmitter.addListener("globalContentCallback", (data) => {
+            L.d(`init configuration, Global content callback called with data: ${data}`);
+            try {
+                data = JSON.parse(data);
+                countlyConfig.content.contentCallback(data.status, data.data);
+            } catch (error) {
+                L.e(`init configuration, Error parsing global content callback data: ${error}`);                
+            }
+        });
+    }
     const args = [];
     const argsMap = Utils.configToJson(countlyConfig);
     const argsString = JSON.stringify(argsMap);

CountlyConfig.js

@@ -2,6 +2,7 @@ import { initialize } from "./Logger.js";
 import CountlyConfigApm from "./lib/configuration_interfaces/countly_config_apm.js";
 import CountlyConfigSDKInternalLimits from "./lib/configuration_interfaces/countly_config_limits.js";
 import CountlyConfigExp from "./lib/configuration_interfaces/countly_config_experimental.js";
+import CountlyConfigContent from "./lib/configuration_interfaces/countly_config_content.js";
 const BUILDING_WITH_PUSH_DISABLED = true;
 /**
  * Countly SDK React Native Bridge
@@ -25,6 +26,7 @@ class CountlyConfig {
         this._countlyConfigApmInstance = new CountlyConfigApm();
         this._countlyConfigSDKLimitsInstance = new CountlyConfigSDKInternalLimits();
         this._countlyConfigExpInstance = new CountlyConfigExp();
+        this._countlyConfigContentInstance = new CountlyConfigContent();
     }
 
     /**
@@ -52,6 +54,13 @@ class CountlyConfig {
         return this._countlyConfigExpInstance;
     }
 
+    /**
+     * Getter to get the content specific configurations
+     */
+    get content() {
+        return this._countlyConfigContentInstance;
+    }
+
     get _crashReporting() {
         return this.#crashReporting;
     }

Utils.js

@@ -117,6 +117,14 @@ function configToJson(config) {
             json.enableVisibilityTracking = true;
             L.i(`init configuration, Enabled visibility tracking`)
         }
+        if (config.content.timerInterval) {
+            json.setZoneTimerInterval = config.content.timerInterval;
+            L.i(`init configuration, Set zone timer interval to ${config.content.timerInterval}`)
+        }
+        if (config.content.contentCallback) {
+            json.setGlobalContentCallback = true;
+            L.i(`init configuration, Set global content callback`)
+        }
         if (config._disableIntentRedirectionCheck) {
             json.disableAdditionalIntentRedirectionChecks = true;
             L.i(`init configuration, Disabled additional intent redirection checks`)

android/build.gradle

@@ -41,5 +41,5 @@ repositories {
 
 dependencies {
     implementation "com.facebook.react:react-native:${safeExtGet('reactNativeVersion', '+')}"
-    implementation 'ly.count.android:sdk:24.7.8'
+    implementation 'ly.count.android:sdk:25.1.1'
 }

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

@@ -27,6 +27,8 @@
 import ly.count.android.sdk.RCDownloadCallback;
 import ly.count.android.sdk.RemoteConfigCallback;
 import ly.count.android.sdk.FeedbackRatingCallback;
+import ly.count.android.sdk.ContentCallback;
+import ly.count.android.sdk.ContentStatus;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -238,6 +240,27 @@ private void populateConfig(JSONObject _config) {
             if (_config.has("enableVisibilityTracking")) {
                 config.experimental.enableVisibilityTracking();
             }
+            if (_config.has("setZoneTimerInterval")) {
+                config.content.setZoneTimerInterval(_config.getInt("setZoneTimerInterval"));
+            }
+            if (_config.has("setGlobalContentCallback")) {
+                config.content.setGlobalContentCallback(new ContentCallback() {
+                    @Override
+                    public void onContentCallback(ContentStatus contentStatus,Map<String, Object> contentData) {
+                        JSONObject contentMap = new JSONObject();
+                        try {
+                            contentMap.put("status", contentStatus.toString());
+                            contentMap.put("data", new JSONObject(contentData));
+                        } catch (JSONException e) {
+                            log("onContentCallback, JSON exception: ", e, LogLevel.ERROR);
+                        }
+                        
+                        ((ReactApplicationContext) _reactContext)
+                            .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
+                            .emit("globalContentCallback", contentMap.toString());
+                    }
+                });
+            }
             // Limits -----------------------------------------------
             if(_config.has("maxKeyLength")) {
                 config.sdkInternalLimits.setMaxKeyLength(_config.getInt("maxKeyLength"));

example/CountlyRNExample/Configuration.tsx

@@ -42,4 +42,9 @@ const countlyConfig = new CountlyConfig(COUNTLY_SERVER_KEY, COUNTLY_APP_KEY).set
 // .enablePreviousNameRecording()
 // .enableVisibilityTracking();
 
+// countlyConfig.content.setZoneTimerInterval(120);
+// countlyConfig.content.setGlobalContentCallback((status: string, data: object) => {
+//     console.log("Global content callback", status, data);
+// });
+
 export default countlyConfig;

ios/src/CHANGELOG.md

@@ -1,3 +1,13 @@
+## 25.1.1
+* Mitigated an issue while setting zone timer interval for content.
+
+## 25.1.0
+* Added dynamic resizing functionality for the content zone
+* Added a config option to content (setZoneTimerInterval) to set content zone timer. (Experimental!)
+
+* Improved management of content zone size for better responsiveness
+* Fixed an issue where the build UUID and executable name were missing from crash reports
+
 ## 24.7.9
 * Improved view tracking capabilities
 

ios/src/Countly-PL.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name = 'Countly-PL'
-  s.version = '24.7.9'
+  s.version = '25.1.1'
   s.license = { :type => 'MIT', :file => 'LICENSE' }
   s.summary  = 'Countly is an innovative, real-time, open source mobile analytics platform.'
   s.homepage = 'https://github.com/Countly/countly-sdk-ios'