Merge pull request #376 from Countly/staging_mirror_2544

arifBurakDemiray · web-flow · commit aa57c25d5a3d · 2025-12-01T15:06:19.000+03:00
Staging mirror 2544
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## 25.4.3-np
+* Mitigated an issue in iOS class paths. 
+
+* Updated underlying Android SDK version to 25.4.8
+* Underlying iOS SDK version is 25.4.8
+* Underlying Web SDK version is 25.4.2
+
 ## 25.4.2-np
 * Added a new function "addCustomNetworkRequestHeaders: customHeaderValues" for providing or overriding custom headers after init.
 * Default request method is now set to "POST"
diff --git a/android/build.gradle b/android/build.gradle
@@ -38,5 +38,5 @@ android {
 }
 
 dependencies {
-    implementation 'ly.count.android:sdk:25.4.7'
+    implementation 'ly.count.android:sdk:25.4.8'
 }
diff --git a/android/src/main/java/ly/count/dart/countly_flutter/CountlyFlutterPlugin.java b/android/src/main/java/ly/count/dart/countly_flutter/CountlyFlutterPlugin.java
@@ -62,7 +62,7 @@
  */
 public class CountlyFlutterPlugin implements MethodCallHandler, FlutterPlugin, ActivityAware, DefaultLifecycleObserver {
     private static final String TAG = "CountlyFlutterPlugin";
-    private final String COUNTLY_FLUTTER_SDK_VERSION_STRING = "25.4.2";
+    private final String COUNTLY_FLUTTER_SDK_VERSION_STRING = "25.4.3";
     private final String COUNTLY_FLUTTER_SDK_NAME = "dart-flutterb-android";
     private final String COUNTLY_FLUTTER_SDK_NAME_NO_PUSH = "dart-flutterbnp-android";
 
@@ -1652,6 +1652,10 @@ private void populateConfig(JSONObject _config) throws JSONException {
             this.config.disableSDKBehaviorSettingsUpdates();
         }
 
+        if (_config.has("disableStoringDefaultPushConsent")) {
+            this.config.disableStoringDefaultPushConsent();
+        }
+
         // APM ------------------------------------------------
         if (_config.has("trackAppStartTime")) {
             this.config.apm.enableAppStartTimeTracking();
diff --git a/example/integration_test/device_id_test.dart b/example/integration_test/device_id_test.dart
@@ -11,10 +11,10 @@ import 'utils.dart';
 void main() {
   IntegrationTestWidgetsFlutterBinding.ensureInitialized();
 
-  if(!kIsWeb){
+  if (!kIsWeb) {
     return;
   }
-  
+
   group("Device ID change tests", () {
     tearDown(() async {
       await Countly.instance.halt();
diff --git a/example/integration_test/networking_tests/record_metrics_test.dart b/example/integration_test/networking_tests/record_metrics_test.dart
@@ -36,7 +36,7 @@ void main() {
       'empty_value': '',
     };
 
-    if(Platform.isAndroid) {
+    if (Platform.isAndroid) {
       // Android SDK ignores empty key metrics
       customMetrics.remove('');
     }
diff --git a/example/integration_test/sc-AP-appPerformanceMonit/AP_207B_enableFBAndStartTimeTracking_manual_test.dart b/example/integration_test/sc-AP-appPerformanceMonit/AP_207B_enableFBAndStartTimeTracking_manual_test.dart
@@ -30,7 +30,6 @@ void main() {
 
     await Future.delayed(const Duration(seconds: 2));
 
-
     // check if there is 3 apm related requests in the queue
     List<String> apmRequests = await getAndPrintWantedElementsWithParamFromAllQueues('apm');
     expect(apmRequests.length, Platform.isIOS ? 3 : 1);
diff --git a/example/integration_test/scenario_device_id_init/6.device_id_interface_test.dart b/example/integration_test/scenario_device_id_init/6.device_id_interface_test.dart
@@ -19,7 +19,7 @@ void main() {
     await testLastRequestParams({'device_id': id});
 
     await Countly.instance.deviceId.setID('test');
-    
+
     await testDeviceID('test');
     await testDeviceIDType(DeviceIdType.DEVELOPER_SUPPLIED);
     await testLastRequestParams({'old_device_id': id, 'device_id': 'test'});
diff --git a/example/integration_test/server_tests/BM_202B_no_backoff_FQ_test.dart b/example/integration_test/server_tests/BM_202B_no_backoff_FQ_test.dart
@@ -5,21 +5,22 @@ import 'package:flutter_test/flutter_test.dart';
 import 'package:integration_test/integration_test.dart';
 
 import '../utils.dart';
+
 void main() {
   IntegrationTestWidgetsFlutterBinding.ensureInitialized();
   testWidgets('BM_202B_normalDelay', (WidgetTester tester) async {
     List<Map<String, List<String>>> requestArray = <Map<String, List<String>>>[];
-  
+
     // Initialize the SDK
     CountlyConfig config = CountlyConfig("http://0.0.0.0:8080", APP_KEY).enableManualSessionHandling().setLoggingEnabled(true).setMaxRequestQueueSize(10);
-    await Countly.initWithConfig(config); 
+    await Countly.initWithConfig(config);
 
-    Countly.instance.sessions.beginSession(); 
-    Countly.instance.sessions.updateSession(); 
-    Countly.instance.sessions.endSession(); 
     Countly.instance.sessions.beginSession();
     Countly.instance.sessions.updateSession();
-    Countly.instance.sessions.endSession(); 
+    Countly.instance.sessions.endSession();
+    Countly.instance.sessions.beginSession();
+    Countly.instance.sessions.updateSession();
+    Countly.instance.sessions.endSession();
     await Future.delayed(const Duration(seconds: 20));
 
     List<String> requestList = await getRequestQueue(); // List of strings
diff --git a/example/integration_test/session_tests/manual_sessions/207_CNR_M_id_change_test.dart b/example/integration_test/session_tests/manual_sessions/207_CNR_M_id_change_test.dart
@@ -51,7 +51,7 @@ void main() {
     // 3- end session
     // 4- begin session
     // 5- Orientation (android only)
-    expect(requestList.length, Platform.isAndroid ? 6 : 5); //android generates 
+    expect(requestList.length, Platform.isAndroid ? 6 : 5); //android generates
     var i = 0;
     for (var element in requestList) {
       Map<String, List<String>> queryParams = Uri.parse("?" + element).queryParametersAll;
@@ -68,7 +68,7 @@ void main() {
         expect(queryParams['end_session']?[0], '1');
         expect(queryParams['session_duration']?[0], '2');
         expect(queryParams['device_id']?[0], 'newID');
-      } else if (i == 6 && Platform.isAndroid){
+      } else if (i == 6 && Platform.isAndroid) {
         expect(queryParams['events']?[0].contains('[CLY]_orientation'), true);
       }
 
diff --git a/example/integration_test/utils.dart b/example/integration_test/utils.dart
@@ -28,11 +28,15 @@ Future<List<String>> getEventQueue() async {
 
 /// Add request to native sides
 void storeRequest(Map<String, dynamic> request) async {
-  await _channelTest.invokeMethod('storeRequest', <String, dynamic>{'data': json.encode([Uri(queryParameters: request).query])});
+  await _channelTest.invokeMethod('storeRequest', <String, dynamic>{
+    'data': json.encode([Uri(queryParameters: request).query])
+  });
 }
 
 void addDirectRequest(Map<String, String> request) async {
-  await _channelTest.invokeMethod('addDirectRequest', <String, dynamic>{'data': json.encode([request])});
+  await _channelTest.invokeMethod('addDirectRequest', <String, dynamic>{
+    'data': json.encode([request])
+  });
 }
 
 /// Verify the common request queue parameters
@@ -41,7 +45,7 @@ void testCommonRequestParams(Map<String, List<String>> requestObject) {
   expect(
       requestObject['sdk_name']?[0],
       "dart-flutterbnp-${kIsWeb ? 'web' : Platform.isIOS ? 'ios' : 'android'}");
-  expect(requestObject['sdk_version']?[0], '25.4.2');
+  expect(requestObject['sdk_version']?[0], '25.4.3');
   expect(
       requestObject['av']?[0],
       kIsWeb
@@ -134,10 +138,10 @@ void createServer(List<Map<String, List<String>>> requestArray, {int delay = 0,
 
     var queryParams;
 
-    if(request.method == 'POST'){
+    if (request.method == 'POST') {
       String content = await utf8.decoder.bind(request).join();
-      queryParams = Uri.parse('?'+content).queryParametersAll;
-    } else if(request.method == 'GET'){
+      queryParams = Uri.parse('?' + content).queryParametersAll;
+    } else if (request.method == 'GET') {
       queryParams = request.uri.queryParametersAll;
     } else {
       print('[Test Server][${DateTime.now().toIso8601String()}] Unsupported request method: ${request.method}');
diff --git a/example/integration_test/views_tests/auto_view_flow1_test.dart b/example/integration_test/views_tests/auto_view_flow1_test.dart
@@ -88,7 +88,6 @@ void main() {
     validateView("V4", false, false, viewStr: eventList[index++]);
     validateView("V3", false, true, viewStr: eventList[index++]);
     validateEvent("[CLY]_orientation", <String, dynamic>{'mode': 'portrait'}, eventStr: eventList[index++]);
-    
 
     int iCached = index;
     try {
diff --git a/example/integration_test/views_tests/auto_view_flow2_test.dart b/example/integration_test/views_tests/auto_view_flow2_test.dart
@@ -50,7 +50,7 @@ void main() {
     index = 0;
     validateView("V2", false, false, viewStr: eventList[index++]); // it is because auto view
     validateView("V3", false, true, viewStr: eventList[index++]); // begin session not called
-    if(Platform.isAndroid){
+    if (Platform.isAndroid) {
       validateEvent("[CLY]_orientation", <String, dynamic>{'mode': 'portrait'}, eventStr: eventList[index++]);
     }
     validateView("V4", true, true, viewStr: eventList[index++]); // after begin session called
@@ -61,10 +61,10 @@ void validateView(String name, bool start, bool visit, {String? viewStr, Map<Str
   Map<String, dynamic> segmentation = <String, dynamic>{'name': name, 'segment': Platform.isAndroid ? 'Android' : 'iOS'};
 
   if (visit) {
-    segmentation['visit'] = Platform.isAndroid ? '1': 1;
+    segmentation['visit'] = Platform.isAndroid ? '1' : 1;
   }
   if (start) {
-    segmentation['start'] = Platform.isAndroid ? '1': 1;
+    segmentation['start'] = Platform.isAndroid ? '1' : 1;
   }
   validateEvent("[CLY]_view", segmentation, eventGiven: viewGiven, eventStr: viewStr);
 }
diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock
@@ -1,5 +1,5 @@
 PODS:
-  - countly_flutter_np (25.4.2):
+  - countly_flutter_np (25.4.3):
     - Flutter
   - Flutter (1.0.0)
   - flutter_foreground_task (0.0.1):
@@ -30,7 +30,7 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/shared_preferences_foundation/darwin"
 
 SPEC CHECKSUMS:
-  countly_flutter_np: 5a0049742d2b8348ce0e5056e31653e7f5bed66b
+  countly_flutter_np: 86a81a0286f63a5a1f41f91530d8c78a83ed4ac0
   Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
   flutter_foreground_task: 21ef182ab0a29a3005cc72cd70e5f45cb7f7f817
   integration_test: 252f60fa39af5e17c3aa9899d35d908a0721b573
diff --git a/example/lib/config_object.dart b/example/lib/config_object.dart
@@ -30,7 +30,6 @@ class CountlyConfiguration {
   };
 
   static CountlyConfig getConfig() {
-
     if (SERVER_URL == 'https://your.server.ly' || APP_KEY == 'YOUR_APP_KEY') {
       print('Please do not use default set of app key and server url');
     }
diff --git a/ios/Classes/CountlyFlutterPlugin.m b/ios/Classes/CountlyFlutterPlugin.m
@@ -28,7 +28,7 @@ @interface CountlyPersistency ()
 
 CLYPushTestMode const CLYPushTestModeProduction = @"CLYPushTestModeProduction";
 
-NSString *const kCountlyFlutterSDKVersion = @"25.4.2";
+NSString *const kCountlyFlutterSDKVersion = @"25.4.3";
 NSString *const kCountlyFlutterSDKName = @"dart-flutterb-ios";
 NSString *const kCountlyFlutterSDKNameNoPush = @"dart-flutterbnp-ios";
 
diff --git a/ios/countly_flutter_np.podspec b/ios/countly_flutter_np.podspec
@@ -3,7 +3,7 @@
 #
 Pod::Spec.new do |s|
   s.name = 'countly_flutter_np'
-  s.version = '25.4.2'
+  s.version = '25.4.3'
   s.summary = 'Countly is an innovative, real-time, open source mobile analytics platform.'
   s.homepage = 'https://github.com/Countly/countly-sdk-flutter-bridge'
   s.social_media_url = 'https://twitter.com/gocountly'
diff --git a/lib/src/content_builder.dart b/lib/src/content_builder.dart
@@ -1,21 +1,21 @@
 //indicates the content status
-enum ContentStatus { completed, closed}
+enum ContentStatus { completed, closed }
 
 typedef ContentCallback = void Function(ContentStatus contentStatus, Map<String, dynamic> contentData);
 
 abstract class ContentBuilder {
   /// Enables content fetching and updates for the user.
   /// This method opts the user into receiving content updates
   /// and ensures that relevant data is fetched accordingly.
-  Future<void>  enterContentZone();
+  Future<void> enterContentZone();
 
   /// Disables content fetching and updates for the user.
   /// This method opts the user out of receiving content updates
   /// and stops any ongoing content retrieval processes.
-  Future<void>  exitContentZone();
+  Future<void> exitContentZone();
 
   /// Triggers a manual refresh of the content zone.
   /// This method forces an update by fetching the latest content,
   /// ensuring the user receives the most up-to-date information.
-  Future<void>  refreshContentZone();
-}
+  Future<void> refreshContentZone();
+}
diff --git a/lib/src/content_builder_internal.dart b/lib/src/content_builder_internal.dart
@@ -47,4 +47,4 @@ class ContentBuilderInternal implements ContentBuilder {
       _contentCallback!(contentStatus, contentData);
     }
   }
-}
+}
diff --git a/lib/src/countly_config.dart b/lib/src/countly_config.dart
@@ -47,6 +47,7 @@ class CountlyConfig {
   String? _sdkBehaviorSettings;
   bool _backoffMechanismDisabled = false;
   bool _sdkBehaviorSettingsUpdatesDisabled = false;
+  bool _storingDefaultPushConsentDisabled = false;
 
   /// instance of CountlyConfigApm
   final CountlyConfigApm _countlyConfigApmInstance = CountlyConfigApm();
@@ -143,6 +144,8 @@ class CountlyConfig {
 
   bool get sdkBehaviorSettingsUpdatesDisabled => _sdkBehaviorSettingsUpdatesDisabled;
 
+  bool get storingDefaultPushConsentDisabled => _storingDefaultPushConsentDisabled;
+
   /// getter for CountlyConfigApm instance that is used to access CountlyConfigApm methods
   CountlyConfigApm get apm => _countlyConfigApmInstance;
 
@@ -401,4 +404,10 @@ class CountlyConfig {
     _sdkBehaviorSettingsUpdatesDisabled = true;
     return this;
   }
+
+  /// Disable storing the default push consent on initialization
+  CountlyConfig disableStoringDefaultPushConsent() {
+    _storingDefaultPushConsentDisabled = true;
+    return this;
+  }
 }
diff --git a/lib/src/countly_flutter.dart b/lib/src/countly_flutter.dart
@@ -1712,7 +1712,6 @@ class Countly {
     await _channel.invokeMethod('addCustomNetworkRequestHeaders', <String, dynamic>{'data': json.encode(args)});
   }
 
-
   /// Record device metrics manually as a standalone call
   /// [Map<String, String> metricsOverride] - map of key value pairs to override the default metrics
   Future<void> recordMetrics(Map<String, String> metricsOverride) async {
@@ -2270,6 +2269,14 @@ class Countly {
         countlyConfig['sdkBehaviorSettingsUpdatesDisabled'] = config.sdkBehaviorSettingsUpdatesDisabled;
       }
 
+      if (config.storingDefaultPushConsentDisabled) {
+        log(
+          '"_configToJson", value provided for disableStoringDefaultPushConsent: [${config.storingDefaultPushConsentDisabled}]',
+          logLevel: LogLevel.INFO,
+        );
+        countlyConfig['disableStoringDefaultPushConsent'] = config.storingDefaultPushConsentDisabled;
+      }
+
       /// Experimental ---------------------------
       if (config.experimental.visibilityTracking) {
         log('"_configToJson", value provided for visibilityTracking: [${config.experimental.visibilityTracking}]', logLevel: LogLevel.INFO);
diff --git a/lib/src/feedback.dart b/lib/src/feedback.dart
@@ -9,9 +9,9 @@ class FeedbackCallback {
 }
 
 abstract class Feedback {
-  Future<void>  presentNPS([String? nameIDorTag, FeedbackCallback? feedbackCallback]);
+  Future<void> presentNPS([String? nameIDorTag, FeedbackCallback? feedbackCallback]);
 
-  Future<void>  presentRating([String? nameIDorTag, FeedbackCallback? feedbackCallback]);
+  Future<void> presentRating([String? nameIDorTag, FeedbackCallback? feedbackCallback]);
 
-  Future<void>  presentSurvey([String? nameIDorTag, FeedbackCallback? feedbackCallback]);
-}
+  Future<void> presentSurvey([String? nameIDorTag, FeedbackCallback? feedbackCallback]);
+}
diff --git a/lib/src/feedback_internal.dart b/lib/src/feedback_internal.dart
@@ -53,7 +53,7 @@ class FeedbackInternal implements Feedback {
     await invokeFeedbackMethod('presentSurvey', nameIDorTag);
   }
 
-  Future<void> invokeFeedbackMethod(String methodName, String? nameIDorTag){
+  Future<void> invokeFeedbackMethod(String methodName, String? nameIDorTag) {
     final args = [];
     nameIDorTag ??= '';
     args.add(nameIDorTag);
diff --git a/lib/src/web/plugin_config.dart b/lib/src/web/plugin_config.dart
@@ -1,5 +1,5 @@
 class CountlyFlutterPluginConfig {
-  static const String SDK_VERSION_STRING = '25.4.2';
+  static const String SDK_VERSION_STRING = '25.4.3';
   static const String SDK_NAME = 'dart-flutterb-web';
   static const String WEB_SDK_URL = 'https://cdn.jsdelivr.net/npm/countly-sdk-web@25.4.2/lib/countly.min.js';
 }
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: countly_flutter_np
 description: Countly is an innovative, real-time, open source mobile analytics and push notifications platform.
-version: 25.4.2
+version: 25.4.3
 homepage: https://support.count.ly/hc/en-us/articles/360037944212
 repository: https://github.com/Countly/countly-sdk-flutter-bridge
 issue_tracker: https://github.com/Countly/countly-sdk-flutter-bridge/issues
diff --git a/scripts/no-push-files/countly_flutter_np.podspec b/scripts/no-push-files/countly_flutter_np.podspec
@@ -3,7 +3,7 @@
 #
 Pod::Spec.new do |s|
   s.name = 'countly_flutter_np'
-  s.version = '25.4.2'
+  s.version = '25.4.3'
   s.summary = 'Countly is an innovative, real-time, open source mobile analytics platform.'
   s.homepage = 'https://github.com/Countly/countly-sdk-flutter-bridge'
   s.social_media_url = 'https://twitter.com/gocountly'
diff --git a/scripts/no-push-files/pubspec.yaml b/scripts/no-push-files/pubspec.yaml
@@ -1,7 +1,7 @@
 name: countly_flutter_np
 description: Countly is an innovative, real-time, open source mobile analytics. This plugin is a flavour of the SDK without push notifications.
 
-version: 25.4.2
+version: 25.4.3
 homepage: https://support.count.ly/hc/en-us/articles/360037944212-Flutter
 repository: https://github.com/Countly/countly-sdk-flutter-bridge
 issue_tracker: https://github.com/Countly/countly-sdk-flutter-bridge/issues

Original file line number	Diff line number	Diff line change
`@@ -38,5 +38,5 @@ android {`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`dependencies {`
`41`		`- implementation 'ly.count.android:sdk:25.4.7'`
	`41`	`+ implementation 'ly.count.android:sdk:25.4.8'`
`42`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ void main() {`
`36`	`36`	`'empty_value': '',`
`37`	`37`	`};`
`38`	`38`
`39`		`- if(Platform.isAndroid) {`
	`39`	`+ if (Platform.isAndroid) {`
`40`	`40`	`// Android SDK ignores empty key metrics`
`41`	`41`	`customMetrics.remove('');`
`42`	`42`	`}`