Merge pull request #31 from adjust/v4233

Version 4.23.3

Author: uerceg

CHANGELOG.md

@@ -1,3 +1,13 @@
+### Version 4.23.3 (18th December 2020)
+#### Added
+- Added URL strategy constants to `AdjustConfig` for more straight forward feature usage.
+
+#### Native SDKs
+- [[email protected]][ios_sdk_v4.23.2]
+- [[email protected]][android_sdk_v4.24.1]
+
+---
+
 ### Version 4.23.2 (11th November 2020)
 #### Added
 - Added [Flutter 1.2 or later](https://github.com/flutter/flutter/wiki/Upgrading-pre-1.12-Android-projects) support for Android projects.

README.md

@@ -93,7 +93,7 @@ You can add Adjust SDK to your Flutter app by adding following to your `pubspec.
 
 ```yaml
 dependencies:
-  adjust_sdk: ^4.23.2
+  adjust_sdk: ^4.23.3
 ```
 
 Then navigate to your project in the terminal and run:

VERSION

@@ -1 +1 @@
-4.23.2
+4.23.3

android/src/main/java/com/adjust/sdk/flutter/AdjustSdk.java

@@ -315,6 +315,16 @@ private void start(final MethodCall call, final Result result) {
             adjustConfig.setExternalDeviceId(externalDeviceId);
         }
 
+        // URL strategy.
+        if (configMap.containsKey("urlStrategy")) {
+            String urlStrategy = (String) configMap.get("urlStrategy");
+            if (urlStrategy.equalsIgnoreCase("china")) {
+                adjustConfig.setUrlStrategy(AdjustConfig.URL_STRATEGY_CHINA);
+            } else if (urlStrategy.equalsIgnoreCase("india")) {
+                adjustConfig.setUrlStrategy(AdjustConfig.URL_STRATEGY_INDIA);
+            }
+        }
+
         // User agent.
         if (configMap.containsKey("userAgent")) {
             String userAgent = (String) configMap.get("userAgent");
@@ -495,12 +505,7 @@ public boolean launchReceivedDeeplink(Uri uri) {
             }
         }
 
-        // Url strategy.
-        if (configMap.containsKey("urlStrategy")) {
-            String urlStrategy = (String) configMap.get("urlStrategy");
-            adjustConfig.setUrlStrategy(urlStrategy);
-        }
-
+        // TODO: expose to dart
         // Preinstall tracking.
         if (configMap.containsKey("preinstallTrackingEnabled")) {
             String strPreinstallTrackingEnabled = (String) configMap.get("preinstallTrackingEnabled");

example/ios/Podfile.lock

@@ -1,9 +1,9 @@
 PODS:
-  - Adjust (4.23.0):
-    - Adjust/Core (= 4.23.0)
-  - Adjust/Core (4.23.0)
-  - adjust_sdk (4.23.0):
-    - Adjust (= 4.23.0)
+  - Adjust (4.23.2):
+    - Adjust/Core (= 4.23.2)
+  - Adjust/Core (4.23.2)
+  - adjust_sdk (4.23.3):
+    - Adjust (= 4.23.2)
     - Flutter
   - Flutter (1.0.0)
 
@@ -22,9 +22,9 @@ EXTERNAL SOURCES:
     :path: Flutter
 
 SPEC CHECKSUMS:
-  Adjust: 552e4f9bbc77501b2000f483491b20642081749a
-  adjust_sdk: 66801d7bb9e2b5a7fa23eeeb248faca5b821aab3
-  Flutter: 0e3d915762c693b495b44d77113d4970485de6ec
+  Adjust: 2faf94752c2069c0bc68bc41c03d00175de4555f
+  adjust_sdk: 465ba0e8398b803e7e993bb829dd14037752a05a
+  Flutter: 434fef37c0980e73bb6479ef766c45957d4b510c
 
 PODFILE CHECKSUM: aafe91acc616949ddb318b77800a7f51bffa2a4c
 

example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

@@ -27,8 +27,6 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-      </Testables>
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
@@ -38,11 +36,11 @@
             ReferencedContainer = "container:Runner.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
+      <Testables>
+      </Testables>
    </TestAction>
    <LaunchAction
-      buildConfiguration = "Debug"
+      buildConfiguration = "Release"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
@@ -61,8 +59,6 @@
             ReferencedContainer = "container:Runner.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Profile"

ios/Classes/AdjustSdk.m

@@ -122,6 +122,7 @@ - (void)start:(FlutterMethodCall *)call withResult:(FlutterResult)result {
     NSString *defaultTracker = call.arguments[@"defaultTracker"];
     NSString *externalDeviceId = call.arguments[@"externalDeviceId"];
     NSString *userAgent = call.arguments[@"userAgent"];
+    NSString *urlStrategy = call.arguments[@"urlStrategy"];
     NSString *secretId = call.arguments[@"secretId"];
     NSString *info1 = call.arguments[@"info1"];
     NSString *info2 = call.arguments[@"info2"];
@@ -142,7 +143,6 @@ - (void)start:(FlutterMethodCall *)call withResult:(FlutterResult)result {
     NSString *dartDeferredDeeplinkCallback = call.arguments[@"deferredDeeplinkCallback"];
     BOOL allowSuppressLogLevel = NO;
     BOOL launchDeferredDeeplink = [call.arguments[@"launchDeferredDeeplink"] boolValue];
-    NSString *urlStrategy = call.arguments[@"urlStrategy"];
 
     // Suppress log level.
     if ([self isFieldValid:logLevel]) {
@@ -186,6 +186,15 @@ - (void)start:(FlutterMethodCall *)call withResult:(FlutterResult)result {
         [adjustConfig setUserAgent:userAgent];
     }
 
+    // URL strategy.
+    if ([self isFieldValid:urlStrategy]) {
+        if ([urlStrategy isEqualToString:@"china"]) {
+            [adjustConfig setUrlStrategy:ADJUrlStrategyChina];
+        } else if ([urlStrategy isEqualToString:@"india"]) {
+            [adjustConfig setUrlStrategy:ADJUrlStrategyIndia];
+        }
+    }
+
     // Background tracking.
     if ([self isFieldValid:sendInBackground]) {
         [adjustConfig setSendInBackground:[sendInBackground boolValue]];
@@ -249,11 +258,6 @@ - (void)start:(FlutterMethodCall *)call withResult:(FlutterResult)result {
                                                        andMethodChannel:self.channel]];
     }
 
-    // Url strategy.
-    if ([self isFieldValid:urlStrategy]) {
-        [adjustConfig setUrlStrategy:urlStrategy];
-    }
-
     // Start SDK.
     [Adjust appDidLaunch:adjustConfig];
     [Adjust trackSubsessionStart];

ios/adjust_sdk.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name                  = 'adjust_sdk'
-  s.version               = '4.23.2'
+  s.version               = '4.23.3'
   s.summary               = 'Adjust Flutter SDK for iOS platform'
   s.description           = <<-DESC
                             Adjust Flutter SDK for iOS platform.

lib/adjust.dart

@@ -17,7 +17,7 @@ import 'package:adjust_sdk/adjust_app_store_subscription.dart';
 import 'package:adjust_sdk/adjust_play_store_subscription.dart';
 
 class Adjust {
-  static const String _sdkPrefix = 'flutter4.23.2';
+  static const String _sdkPrefix = 'flutter4.23.3';
   static const MethodChannel _channel = const MethodChannel('com.adjust.sdk/api');
 
   static void start(AdjustConfig config) {

lib/adjust_config.dart

@@ -31,6 +31,8 @@ class AdjustConfig {
   static const String _eventSuccessCallbackName = 'adj-event-success';
   static const String _eventFailureCallbackName = 'adj-event-failure';
   static const String _deferredDeeplinkCallbackName = 'adj-deferred-deeplink';
+  static const String UrlStrategyIndia = 'india';
+  static const String UrlStrategyChina = 'china';
 
   num _info1;
   num _info2;