Merge branch 'staging' into web_sdk_support

Author: arifBurakDemiray

CHANGELOG.md

@@ -1,33 +1,55 @@
-## XX.XX.XX
-Added experimental support for the web platform in the Countly Flutter SDK. Some functionalities are not yet fully supported. Below is the list of limitations for the web platform:
-
-* Hybrid sessions are the default; full manual sessions are not supported.
-* Features Not Supported: Push Notifications, APM, and Attribution.
-* Countly.setUserLocation and Countly.disableLocation are unavailable.
-* In Views, the following view-related functions are not supported:
-  * startView
-  * stopViewWithName
-  * stopViewWithID
-  * stopAllViews
-  * pauseViewWithID
-  * resumeViewWithID
-  * addSegmentationToViewWithName
-  * addSegmentationToViewWithID
-  * updateGlobalViewSegmentation
-  * setGlobalViewSegmentation
-* In Remote Config, the clearAll function is unavailable, and caching functionality is not provided.
-* In A/B Testing the following are not supported:
-  * exitABTestsForKeys
-  * Variant-level control
-  * Experiment-level control
-* Star Rating and related configuration options are unavailable.
-* User properties during initialization are not supported.
-* Custom network headers are not supported.
-* Dropping old requests is not supported.
-* Content zone global callback is not supported.
-* Experimental configuration options are not supported.
-
-* Added underlying Web SDK version to 24.11.2
+## 25.1.0
+* Added experimental support for the web platform in the Countly Flutter SDK. Some functionalities are not yet fully supported. Below is the list of limitations for the web platform:
+  * Hybrid sessions are the default; full manual sessions are not supported.
+  * Features Not Supported: Push Notifications, APM, and Attribution.
+  * Countly.setUserLocation and Countly.disableLocation are unavailable.
+  * In Views, the following view-related functions are not supported:
+    * startView
+    * stopViewWithName
+    * stopViewWithID
+    * stopAllViews
+    * pauseViewWithID
+    * resumeViewWithID
+    * addSegmentationToViewWithName
+    * addSegmentationToViewWithID
+    * updateGlobalViewSegmentation
+    * setGlobalViewSegmentation
+  * In Remote Config, the clearAll function is unavailable, and caching functionality is not provided.
+  * In A/B Testing the following are not supported:
+    * exitABTestsForKeys
+    * Variant-level control
+    * Experiment-level control
+  * Star Rating and related configuration options are unavailable.
+  * User properties during initialization are not supported.
+  * Custom network headers are not supported.
+  * Dropping old requests is not supported.
+  * Content zone global callback is not supported.
+  * Experimental configuration options are not supported.
+
+* Added 'event' interface for events methods which are
+  * recordEvent(String key, [Map<String, Object>? segmentation, int? count, int? sum, int? duration])
+  * startEvent(String key)
+  * endEvent(String key, [Map<String, Object>? segmentation, int? count, int? sum])
+  * cancelEvent(String key)
+* Added 'cancelEvent' to cancel a timed event, it is accesible through 'events' interface
+
+* Deprecated the following methods from the Countly
+  * 'recordEvent(options)', instead use 'events.recordEvent(key, [segmentation, count, sum, duration])
+  * 'startEvent(key)', instead use 'events.startEvent(key)'
+  * 'endEvent(options)', instead use 'events.endEvent(key, [segmentation, count, sum])'
+
+* Improved content size management for better adaptability across devices.
+* Resolved an issue where the action bar overlapped with the content display.
+* Added dynamic resizing functionality for the content zone for enhanced responsiveness.
+* Introduced a configuration option (setZoneTimerInterval) to customize the content zone timer interval.
+
+* Enhanced CertificateTrustManager to support domain-specific configurations with hostname-aware checkServerTrusted calls (Android).
+
+* Fixed an issue where the build UUID and executable name were missing from crash reports (iOS).
+
+* Updated underlying Android SDK version to 25.1.0
+* Updated underlying iOS SDK version to 25.1.0
+* Added underlying Web SDK version to 24.11.4
 
 ## 24.11.2
 * Improved view tracking capabilities in iOS.

android/build.gradle

@@ -38,6 +38,6 @@ android {
 }
 
 dependencies {
-    implementation 'ly.count.android:sdk:24.7.7'
+    implementation 'ly.count.android:sdk:25.1.0'
     implementation 'com.google.firebase:firebase-messaging:24.0.3'
 }

android/src/main/java/ly/count/dart/countly_flutter/CountlyFlutterPlugin.java

@@ -513,6 +513,10 @@ public void run() {
                 String startEvent = args.getString(0);
                 Countly.sharedInstance().events().startEvent(startEvent);
                 result.success("startEvent for: " + startEvent);
+            } else if ("cancelEvent".equals(call.method)) {
+                String cancelEvent = args.getString(0);
+                Countly.sharedInstance().events().cancelEvent(cancelEvent);
+                result.success("cancelEvent for: " + cancelEvent);
             } else if ("endEvent".equals(call.method)) {
                 String key = args.getString(0);
                 int count = Integer.parseInt(args.getString(1));
@@ -1759,10 +1763,15 @@ public void callback(String error) {
         if (_config.has("visibilityTracking")) {
             this.config.experimental.enableVisibilityTracking();
         }
+
         if (_config.has("previousNameRecording")) {
             this.config.experimental.enablePreviousNameRecording();
         }
 
+        if (_config.has("zoneTimerInterval")) {
+            this.config.content.setZoneTimerInterval(_config.getInt("zoneTimerInterval"));
+        }
+
         this.config.content.setGlobalContentCallback(new ContentCallback() {
             @Override 
             public void onContentCallback(ContentStatus contentStatus, Map<String, Object> contentData) {

example/integration_test/event_tests/event_interface_test.dart

@@ -0,0 +1,116 @@
+import 'package:countly_flutter/countly_flutter.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:integration_test/integration_test.dart';
+import '../utils.dart';
+import 'event_utils.dart';
+import 'dart:convert';
+import 'dart:io';
+
+void main() {
+  const int MAX_INT = -1 >>> 1;
+
+  IntegrationTestWidgetsFlutterBinding.ensureInitialized();
+  testWidgets('Init SDK record some events and check what is in the queues with new interface', (WidgetTester tester) async {
+    // Initialize the SDK
+    CountlyConfig config = CountlyConfig(SERVER_URL, APP_KEY).setLoggingEnabled(true);
+    await Countly.initWithConfig(config);
+
+    Map<String, Object> segmentation = {
+      'nar': 'uto',
+      'sasuke': MAX_INT,
+      'sakura': false,
+      'itachi': double.maxFinite,
+      'kakaski': double.minPositive,
+      'hashirama': -MAX_INT,
+      'tobi': {'obito': 'uchiha', 'zetsu': 'white'},
+      'stringList': ['value1', 'value2', 'value3'],
+      'intList': [1, 2, 3],
+      'doubleList': [1.1, 2.2, 3.3],
+      'boolList': [true, false, true],
+      'mixedList': ['value1', 2, 3.3, true],
+      'mapList': [
+        {'key1': 'value1', 'key2': 2},
+        {'key1': 'value2', 'key2': 3},
+        {'key1': 'value3', 'key2': 4}
+      ],
+    };
+    await Countly.instance.events.recordEvent('event');
+    await Countly.instance.events.recordEvent('event_s', segmentation);
+    await Countly.instance.events.recordEvent('event_s_c_s', segmentation, 23, 90.1);
+    await Countly.instance.events.recordEvent('event_s_c_s_d', segmentation, 98, 13.2, 123);
+
+    await Countly.instance.events.startEvent('timed_event');
+    await Future.delayed(const Duration(milliseconds: 250));
+    await Countly.instance.events.endEvent('timed_event', segmentation);
+
+    await Countly.instance.events.startEvent('timed_event_s_c_s');
+    await Future.delayed(const Duration(milliseconds: 250));
+    await Countly.instance.events.endEvent('timed_event_s_c_s', segmentation, 45, 65.6);
+
+    // Get request and event queues from native side
+    List<String> requestList = await getRequestQueue(); // List of strings
+    List<String> eventList = await getEventQueue(); // List of json objects
+
+    // Some logs for debugging
+    print('RQ: $requestList');
+    print('EQ: $eventList');
+    print('RQ length: ${requestList.length}');
+    print('EQ length: ${eventList.length}');
+
+    expect(requestList.length, 1);
+    expect(eventList.length, Platform.isAndroid ? 7 : 6);
+
+    // begin session
+    Map<String, List<String>> queryParams = Uri.parse("?" + requestList[0]).queryParametersAll;
+    testCommonRequestParams(queryParams);
+
+    int n = 0;
+    Map<String, dynamic> currentEvent;
+    if (Platform.isAndroid) {
+      currentEvent = json.decode(eventList[n]);
+      // 1. orientation event
+      expect("[CLY]_orientation", currentEvent['key']);
+      expect(1, currentEvent['count']);
+      n++;
+    }
+
+    Map<String, Object> expectedSegmentation = {
+      "sasuke": MAX_INT,
+      "sakura": false,
+      "mapList": [],
+      "intList": [1, 2, 3],
+      "doubleList": [1.1, 2.2, 3.3],
+      "boolList": [true, false, true],
+      "mixedList": ["value1", 2, 3.3, true],
+      "itachi": double.maxFinite,
+      "stringList": ["value1", "value2", "value3"],
+      "kakaski": double.minPositive,
+      "nar": "uto",
+      "hashirama": -MAX_INT,
+    };
+
+    // 2. event
+    currentEvent = json.decode(eventList[n++]);
+    validateEvent(event: currentEvent, key: 'event');
+
+    // 3. event_s
+    currentEvent = json.decode(eventList[n++]);
+    validateEvent(event: currentEvent, key: 'event_s', segmentation: expectedSegmentation);
+
+    // 4. event_s_c_s
+    currentEvent = json.decode(eventList[n++]);
+    validateEvent(event: currentEvent, key: 'event_s_c_s', segmentation: expectedSegmentation, count: 23, sum: 90.1);
+
+    // 5. event_s_c_s_d
+    currentEvent = json.decode(eventList[n++]);
+    validateEvent(event: currentEvent, key: 'event_s_c_s_d', segmentation: expectedSegmentation, count: 98, sum: 13.2, dur: 123);
+
+    // 6. timed_event
+    currentEvent = json.decode(eventList[n++]);
+    validateEvent(event: currentEvent, key: 'timed_event', segmentation: expectedSegmentation, isTimed: true);
+
+    // 7. timed_event_s_c_s
+    currentEvent = json.decode(eventList[n++]);
+    validateEvent(event: currentEvent, key: 'timed_event_s_c_s', segmentation: expectedSegmentation, count: 45, sum: 65.6, isTimed: true);
+  });
+}

example/integration_test/event_tests/event_test.dart

@@ -52,7 +52,7 @@ void main() {
 
     // 4. event_c_s
     currentEvent = json.decode(eventList[n++]);
-    validateEvent(event: currentEvent, key: event_c_s['key'] as String, count: event_c_s['count'] as int, sum: event_c_s['sum'] as int);
+    validateEvent(event: currentEvent, key: event_c_s['key'] as String, count: event_c_s['count'] as int, sum: event_c_s['sum'] as double);
 
     // 5. event_c_d
     currentEvent = json.decode(eventList[n++]);
@@ -64,35 +64,35 @@ void main() {
 
     // 7. event_c_s_d
     currentEvent = json.decode(eventList[n++]);
-    validateEvent(event: currentEvent, key: event_c_s_d['key'] as String, count: event_c_s_d['count'] as int, sum: event_c_s_d['sum'] as int, dur: event_c_s_d['duration'] as int);
+    validateEvent(event: currentEvent, key: event_c_s_d['key'] as String, count: event_c_s_d['count'] as int, sum: event_c_s_d['sum'] as double, dur: event_c_s_d['duration'] as int);
 
     // 8. event_c_s_se
     currentEvent = json.decode(eventList[n++]);
-    validateEvent(event: currentEvent, key: event_c_s_se['key'] as String, count: event_c_s_se['count'] as int, sum: event_c_s_se['sum'] as int, segmentation: expectedSegmentation);
+    validateEvent(event: currentEvent, key: event_c_s_se['key'] as String, count: event_c_s_se['count'] as int, sum: event_c_s_se['sum'] as double, segmentation: expectedSegmentation);
 
     // 9. event_c_d_se
     currentEvent = json.decode(eventList[n++]);
     validateEvent(event: currentEvent, key: event_c_d_se['key'] as String, count: event_c_d_se['count'] as int, dur: event_c_d_se['duration'] as int, segmentation: expectedSegmentation);
 
     // 10. event_c_s_d_se
     currentEvent = json.decode(eventList[n++]);
-    validateEvent(event: currentEvent, key: event_c_s_d_se['key'] as String, count: event_c_s_d_se['count'] as int, sum: event_c_s_d_se['sum'] as int, dur: event_c_s_d_se['duration'] as int, segmentation: expectedSegmentation);
+    validateEvent(event: currentEvent, key: event_c_s_d_se['key'] as String, count: event_c_s_d_se['count'] as int, sum: event_c_s_d_se['sum'] as double, dur: event_c_s_d_se['duration'] as int, segmentation: expectedSegmentation);
 
     // 11. event_s
     currentEvent = json.decode(eventList[n++]);
-    validateEvent(event: currentEvent, key: event_s['key'] as String, sum: event_s['sum'] as int);
+    validateEvent(event: currentEvent, key: event_s['key'] as String, sum: event_s['sum'] as double);
 
     // 12. event_s_d
     currentEvent = json.decode(eventList[n++]);
-    validateEvent(event: currentEvent, key: event_s_d['key'] as String, sum: event_s_d['sum'] as int, dur: event_s_d['duration'] as int);
+    validateEvent(event: currentEvent, key: event_s_d['key'] as String, sum: event_s_d['sum'] as double, dur: event_s_d['duration'] as int);
 
     // 13. event_s_se
     currentEvent = json.decode(eventList[n++]);
-    validateEvent(event: currentEvent, key: event_s_se['key'] as String, sum: event_s_se['sum'] as int, segmentation: expectedSegmentation);
+    validateEvent(event: currentEvent, key: event_s_se['key'] as String, sum: event_s_se['sum'] as double, segmentation: expectedSegmentation);
 
     // 14. event_s_d_se
     currentEvent = json.decode(eventList[n++]);
-    validateEvent(event: currentEvent, key: event_s_d_se['key'] as String, sum: event_s_d_se['sum'] as int, dur: event_s_d_se['duration'] as int, segmentation: expectedSegmentation);
+    validateEvent(event: currentEvent, key: event_s_d_se['key'] as String, sum: event_s_d_se['sum'] as double, dur: event_s_d_se['duration'] as int, segmentation: expectedSegmentation);
 
     // 15. event_d
     currentEvent = json.decode(eventList[n++]);
@@ -116,7 +116,7 @@ void main() {
 
     // 20. timed_event_c_s
     currentEvent = json.decode(eventList[n++]);
-    validateEvent(event: currentEvent, key: timed_event_c_s['key'] as String, count: 1, sum: timed_event_c_s['sum'] as int, isTimed: true);
+    validateEvent(event: currentEvent, key: timed_event_c_s['key'] as String, count: 1, sum: timed_event_c_s['sum'] as double, isTimed: true);
 
     // 21. timed_event_c_d
     currentEvent = json.decode(eventList[n++]);
@@ -128,35 +128,35 @@ void main() {
 
     // 23. timed_event_c_s_d
     currentEvent = json.decode(eventList[n++]);
-    validateEvent(event: currentEvent, key: timed_event_c_s_d['key'] as String, count: 1, sum: timed_event_c_s_d['sum'] as int, dur: timed_event_c_s_d['duration'] as int, isTimed: true);
+    validateEvent(event: currentEvent, key: timed_event_c_s_d['key'] as String, count: 1, sum: timed_event_c_s_d['sum'] as double, dur: timed_event_c_s_d['duration'] as int, isTimed: true);
 
     // 24. timed_event_c_s_se
     currentEvent = json.decode(eventList[n++]);
-    validateEvent(event: currentEvent, key: timed_event_c_s_se['key'] as String, count: 1, sum: timed_event_c_s_se['sum'] as int, segmentation: expectedSegmentation, isTimed: true);
+    validateEvent(event: currentEvent, key: timed_event_c_s_se['key'] as String, count: 1, sum: timed_event_c_s_se['sum'] as double, segmentation: expectedSegmentation, isTimed: true);
 
     // 25. timed_event_c_d_se
     currentEvent = json.decode(eventList[n++]);
     validateEvent(event: currentEvent, key: timed_event_c_d_se['key'] as String, count: 1, dur: timed_event_c_d_se['duration'] as int, segmentation: expectedSegmentation, isTimed: true);
 
     // 26. timed_event_c_s_d_se
     currentEvent = json.decode(eventList[n++]);
-    validateEvent(event: currentEvent, key: timed_event_c_s_d_se['key'] as String, count: 1, sum: timed_event_c_s_d_se['sum'] as int, dur: timed_event_c_s_d_se['duration'] as int, segmentation: expectedSegmentation, isTimed: true);
+    validateEvent(event: currentEvent, key: timed_event_c_s_d_se['key'] as String, count: 1, sum: timed_event_c_s_d_se['sum'] as double, dur: timed_event_c_s_d_se['duration'] as int, segmentation: expectedSegmentation, isTimed: true);
 
     // 27. timed_event_s
     currentEvent = json.decode(eventList[n++]);
-    validateEvent(event: currentEvent, key: timed_event_s['key'] as String, sum: timed_event_s['sum'] as int, isTimed: true);
+    validateEvent(event: currentEvent, key: timed_event_s['key'] as String, sum: timed_event_s['sum'] as double, isTimed: true);
 
     // 28. timed_event_s_d
     currentEvent = json.decode(eventList[n++]);
-    validateEvent(event: currentEvent, key: timed_event_s_d['key'] as String, sum: timed_event_s_d['sum'] as int, dur: timed_event_s_d['duration'] as int, isTimed: true);
+    validateEvent(event: currentEvent, key: timed_event_s_d['key'] as String, sum: timed_event_s_d['sum'] as double, dur: timed_event_s_d['duration'] as int, isTimed: true);
 
     // 29. timed_event_s_se
     currentEvent = json.decode(eventList[n++]);
-    validateEvent(event: currentEvent, key: timed_event_s_se['key'] as String, sum: timed_event_s_se['sum'] as int, segmentation: expectedSegmentation, isTimed: true);
+    validateEvent(event: currentEvent, key: timed_event_s_se['key'] as String, sum: timed_event_s_se['sum'] as double, segmentation: expectedSegmentation, isTimed: true);
 
     // 30. timed_event_s_d_se
     currentEvent = json.decode(eventList[n++]);
-    validateEvent(event: currentEvent, key: timed_event_s_d_se['key'] as String, sum: timed_event_s_d_se['sum'] as int, dur: timed_event_s_d_se['duration'] as int, segmentation: expectedSegmentation, isTimed: true);
+    validateEvent(event: currentEvent, key: timed_event_s_d_se['key'] as String, sum: timed_event_s_d_se['sum'] as double, dur: timed_event_s_d_se['duration'] as int, segmentation: expectedSegmentation, isTimed: true);
 
     // 31. timed_event_d
     currentEvent = json.decode(eventList[n++]);