Merge pull request #345 from Countly/2540_release_np

2540 release np

Author: turtledreams

CHANGELOG.md

@@ -1,3 +1,14 @@
+## 25.4.0-np
+* ! Minor breaking change ! Removed Secure.ANDROID_ID on Android and UIDevice.currentDevice.identifierForVendor on iOS usages in device ID generation. The SDKs now exclusively uses random UUIDs for device ID generation.
+* ! Minor breaking change ! SDK now has Server Configuration feature and it is enabled by default. Changes made on SDK Manager > SDK Configuration on your server will affect SDK behavior directly.
+
+* Added `refreshContentZone` method to Content interface for refreshing Content Zone requests.
+* Added `setSDKBehaviorSettings(String)` init config method for providing server configuration during first initialization.
+
+* Updated underlying Android SDK version to 25.4.0
+* Updated underlying iOS SDK version to 25.4.0
+* Updated underlying Web SDK version to 25.4.0
+
 ## 25.1.1-np
 * Removed Android v1 embedding support
 

android/build.gradle

@@ -38,5 +38,5 @@ android {
 }
 
 dependencies {
-    implementation 'ly.count.android:sdk:25.1.1'
+    implementation 'ly.count.android:sdk:25.4.0'
 }

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.1.1";
+    private final String COUNTLY_FLUTTER_SDK_VERSION_STRING = "25.4.0";
     private final String COUNTLY_FLUTTER_SDK_NAME = "dart-flutterb-android";
     private final String COUNTLY_FLUTTER_SDK_NAME_NO_PUSH = "dart-flutterbnp-android";
 
@@ -1391,6 +1391,9 @@ else if ("getRequestQueue".equals(call.method)) {
             } else if ("exitContentZone".equals(call.method)) {
                 Countly.sharedInstance().contents().exitContentZone();
                 result.success(null);
+            } else if ("refreshContentZone".equals(call.method)) {
+                Countly.sharedInstance().contents().refreshContentZone();
+                result.success(null);
             }
             //------------------End------------------------------------
 
@@ -1617,6 +1620,11 @@ private void populateConfig(JSONObject _config) throws JSONException {
         if (_config.has("starRatingTextDismiss")) {
             this.config.setStarRatingTextDismiss(_config.getString("starRatingTextDismiss"));
         }
+        
+        if (_config.has("sdkBehaviorSettings")) {
+            this.config.setSDKBehaviorSettings(_config.getString("sdkBehaviorSettings"));
+        }
+
         // APM ------------------------------------------------
         if (_config.has("trackAppStartTime")) {
             this.config.apm.enableAppStartTimeTracking();

example/android/.gitignore

@@ -4,6 +4,7 @@ gradle-wrapper.jar
 /gradlew
 /gradlew.bat
 /local.properties
+/app/.cxx/
 GeneratedPluginRegistrant.java
 
 # Remember to never publicly share your keystore.

example/integration_test/device_id_test.dart

@@ -14,7 +14,7 @@ void main() {
   if(!kIsWeb){
     return;
   }
-
+  
   group("Device ID change tests", () {
     tearDown(() async {
       await Countly.instance.halt();

example/integration_test/utils.dart

@@ -32,7 +32,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.1.1');
+  expect(requestObject['sdk_version']?[0], '25.4.0');
   expect(
       requestObject['av']?[0],
       kIsWeb

example/ios/Podfile.lock

@@ -1,5 +1,5 @@
 PODS:
-  - countly_flutter_np (24.11.1):
+  - countly_flutter_np (25.4.0):
     - Flutter
   - Flutter (1.0.0)
   - flutter_foreground_task (0.0.1):

ios/Classes/CountlyFlutterPlugin.m

@@ -28,7 +28,7 @@ @interface CountlyPersistency ()
 
 CLYPushTestMode const CLYPushTestModeProduction = @"CLYPushTestModeProduction";
 
-NSString *const kCountlyFlutterSDKVersion = @"25.1.1";
+NSString *const kCountlyFlutterSDKVersion = @"25.4.0";
 NSString *const kCountlyFlutterSDKName = @"dart-flutterb-ios";
 NSString *const kCountlyFlutterSDKNameNoPush = @"dart-flutterbnp-ios";
 
@@ -1373,16 +1373,17 @@ - (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result
             [Countly.sharedInstance.content enterContentZone];
             result(nil);
         });
-
-        // setRequiresConsent
     } else if ([@"exitContentZone" isEqualToString:call.method]) {
         dispatch_async(dispatch_get_main_queue(), ^{
             [Countly.sharedInstance.content exitContentZone];
             result(nil);
         });
-
-        // setRequiresConsent
-    } else {
+    }  else if ([@"refreshContentZone" isEqualToString:call.method]) {
+        dispatch_async(dispatch_get_main_queue(), ^{
+            [Countly.sharedInstance.content refreshContentZone];
+            result(nil);
+        });
+    }  else {
         result(FlutterMethodNotImplemented);
     }
 }
@@ -1644,6 +1645,11 @@ - (void)populateConfig:(NSDictionary *)_config {
             [config.apm setAppStartTimestampOverride:[startTSOverride longLongValue]];
         }
 
+        NSString *sdkBehaviorSettings = _config[@"sdkBehaviorSettings"];
+        if(sdkBehaviorSettings) {
+            config.sdkBehaviorSettings = sdkBehaviorSettings;
+        }
+
         // Internal Limits ---------------------
         NSNumber *maxKeyLength = _config[@"maxKeyLength"];
         if (maxKeyLength) {

ios/Classes/CountlyiOS/CHANGELOG.md

@@ -1,3 +1,16 @@
+## 25.4.0
+* ! Minor breaking change ! Removed UIDevice.currentDevice.identifierForVendor usage in device id generation. The SDK now exclusively uses random UUIDs for device id generation.
+* ! Minor breaking change ! Server Configuration is now enabled by default. Changes made on SDK Manager > SDK Configuration on your server will affect SDK behavior directly.
+
+* Added a Content feature method "refreshContentZone" that does a manual refresh.
+* Extended server configuration capabilities of the SDK.
+* Added a config parameter to provide server config in the initialization "sdkBehaviorSettings: NSString".
+
+* Deprecated the experimental configuration function enableServerConfiguration and it will do nothing.
+
+## 25.1.2
+* Mitigated an issue where the safe area resolution was not correctly calculated for the content zone on certain iOS devices.
+
 ## 25.1.1
 * Mitigated an issue while setting zone timer interval for content.
 

ios/Classes/CountlyiOS/Countly-PL.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name = 'Countly-PL'
-  s.version = '25.1.1'
+  s.version = '25.4.0'
   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'