Merge pull request #642 from adjust/v4331

Version 4.33.1

Author: uerceg

Adjust.podspec

@@ -1,11 +1,11 @@
 Pod::Spec.new do |s|
   s.name           = "Adjust"
-  s.version        = "4.33.0"
+  s.version        = "4.33.1"
   s.summary        = "This is the iOS SDK of adjust. You can read more about it at http://adjust.com."
   s.homepage       = "https://github.com/adjust/ios_sdk"
   s.license        = { :type => 'MIT', :file => 'MIT-LICENSE' }
   s.author         = { "Adjust GmbH" => "[email protected]" }
-  s.source         = { :git => "https://github.com/adjust/ios_sdk.git", :tag => "v4.33.0" }
+  s.source         = { :git => "https://github.com/adjust/ios_sdk.git", :tag => "v4.33.1" }
   s.ios.deployment_target = '9.0'
   s.tvos.deployment_target = '9.0'
   s.framework      = 'SystemConfiguration'

Adjust/ADJUrlStrategy.m

@@ -16,11 +16,15 @@
 
 static NSString * const baseUrlIndia = @"https://app.adjust.net.in";
 static NSString * const gdprUrlIndia = @"https://gdpr.adjust.net.in";
-static NSString * const subscritionUrlIndia = @"https://subscription.adjust.net.in";
+static NSString * const subscriptionUrlIndia = @"https://subscription.adjust.net.in";
 
 static NSString * const baseUrlChina = @"https://app.adjust.world";
 static NSString * const gdprUrlChina = @"https://gdpr.adjust.world";
-static NSString * const subscritionUrlChina = @"https://subscription.adjust.world";
+static NSString * const subscriptionUrlChina = @"https://subscription.adjust.world";
+
+static NSString * const baseUrlCn = @"https://app.adjust.cn";
+static NSString * const gdprUrlCn = @"https://gdpr.adjust.com";
+static NSString * const subscriptionUrlCn = @"https://subscription.adjust.com";
 
 static NSString * const baseUrlEU = @"https://app.eu.adjust.com";
 static NSString * const gdprUrlEU = @"https://gdpr.eu.adjust.com";
@@ -82,6 +86,8 @@ - (instancetype)initWithUrlStrategyInfo:(NSString *)urlStrategyInfo
         return @[baseUrlIndia, baseUrl];
     } else if ([urlStrategyInfo isEqualToString:ADJUrlStrategyChina]) {
         return @[baseUrlChina, baseUrl];
+    } else if ([urlStrategyInfo isEqualToString:ADJUrlStrategyCn]) {
+        return @[baseUrlCn, baseUrl];
     } else if ([urlStrategyInfo isEqualToString:ADJDataResidencyEU]) {
         return @[baseUrlEU];
     } else if ([urlStrategyInfo isEqualToString:ADJDataResidencyTR]) {
@@ -98,6 +104,8 @@ - (instancetype)initWithUrlStrategyInfo:(NSString *)urlStrategyInfo
         return @[gdprUrlIndia, gdprUrl];
     } else if ([urlStrategyInfo isEqualToString:ADJUrlStrategyChina]) {
         return @[gdprUrlChina, gdprUrl];
+    } else if ([urlStrategyInfo isEqualToString:ADJUrlStrategyCn]) {
+        return @[gdprUrlCn, gdprUrl];
     } else if ([urlStrategyInfo isEqualToString:ADJDataResidencyEU]) {
         return @[gdprUrlEU];
     } else if ([urlStrategyInfo isEqualToString:ADJDataResidencyTR]) {
@@ -111,17 +119,19 @@ - (instancetype)initWithUrlStrategyInfo:(NSString *)urlStrategyInfo
 
 + (NSArray<NSString *> *)subscriptionUrlChoicesWithUrlStrategyInfo:(NSString *)urlStrategyInfo {
     if ([urlStrategyInfo isEqualToString:ADJUrlStrategyIndia]) {
-        return @[subscritionUrlIndia, subscriptionUrl];
+        return @[subscriptionUrlIndia, subscriptionUrl];
     } else if ([urlStrategyInfo isEqualToString:ADJUrlStrategyChina]) {
-        return @[subscritionUrlChina, subscriptionUrl];
+        return @[subscriptionUrlChina, subscriptionUrl];
+    } else if ([urlStrategyInfo isEqualToString:ADJUrlStrategyCn]) {
+        return @[subscriptionUrlCn, subscriptionUrl];
     } else if ([urlStrategyInfo isEqualToString:ADJDataResidencyEU]) {
         return @[subscriptionUrlEU];
     } else if ([urlStrategyInfo isEqualToString:ADJDataResidencyTR]) {
         return @[subscriptionUrlTR];
     } else if ([urlStrategyInfo isEqualToString:ADJDataResidencyUS]) {
         return @[subscriptionUrlUS];
     } else {
-        return @[subscriptionUrl, subscritionUrlIndia, subscritionUrlChina];
+        return @[subscriptionUrl, subscriptionUrlIndia, subscriptionUrlChina];
     }
 }
 

Adjust/ADJUtil.m

@@ -39,13 +39,13 @@
 static NSRegularExpression *shortUniversalLinkRegex = nil;
 static NSRegularExpression *excludedDeeplinkRegex = nil;
 
-static NSString * const kClientSdk                  = @"ios4.33.0";
+static NSString * const kClientSdk                  = @"ios4.33.1";
 static NSString * const kDeeplinkParam              = @"deep_link=";
 static NSString * const kSchemeDelimiter            = @"://";
 static NSString * const kDefaultScheme              = @"AdjustUniversalScheme";
 static NSString * const kUniversalLinkPattern       = @"https://[^.]*\\.ulink\\.adjust\\.com/ulink/?(.*)";
 static NSString * const kOptionalRedirectPattern    = @"adjust_redirect=[^&#]*";
-static NSString * const kShortUniversalLinkPattern  = @"http[s]?://[a-z0-9]{4}\\.adj\\.st/?(.*)";
+static NSString * const kShortUniversalLinkPattern  = @"http[s]?://[a-z0-9]{4}\\.(?:[a-z]{2}\\.)?adj\\.st/?(.*)";
 static NSString * const kExcludedDeeplinksPattern   = @"^(fb|vk)[0-9]{5,}[^:]*://authorize.*access_token=.*";
 static NSString * const kDateFormat                 = @"yyyy-MM-dd'T'HH:mm:ss.SSS'Z'Z";
 

Adjust/Adjust.h

@@ -2,7 +2,7 @@
 //  Adjust.h
 //  Adjust SDK
 //
-//  V4.33.0
+//  V4.33.1
 //  Created by Christian Wellenbrock (@wellle) on 23rd July 2013.
 //  Copyright (c) 2012-2021 Adjust GmbH. All rights reserved.
 //
@@ -58,6 +58,7 @@ extern NSString * __nonnull const ADJAdRevenueSourcePublisher;
  */
 extern NSString * __nonnull const ADJUrlStrategyIndia;
 extern NSString * __nonnull const ADJUrlStrategyChina;
+extern NSString * __nonnull const ADJUrlStrategyCn;
 extern NSString * __nonnull const ADJDataResidencyEU;
 extern NSString * __nonnull const ADJDataResidencyTR;
 extern NSString * __nonnull const ADJDataResidencyUS;

Adjust/Adjust.m

@@ -33,6 +33,7 @@
 
 NSString * const ADJUrlStrategyIndia = @"UrlStrategyIndia";
 NSString * const ADJUrlStrategyChina = @"UrlStrategyChina";
+NSString * const ADJUrlStrategyCn = @"UrlStrategyCn";
 
 NSString * const ADJDataResidencyEU = @"DataResidencyEU";
 NSString * const ADJDataResidencyTR = @"DataResidencyTR";

AdjustBridge/AdjustBridgeRegister.m

@@ -275,7 +275,7 @@ + (NSString *)adjust_js {
                 if (this.sdkPrefix) {
                     return this.sdkPrefix;
                 } else {
-                    return 'web-bridge4.33.0';
+                    return 'web-bridge4.33.1';
                 }
             },
             setTestOptions: function(testOptions) {
@@ -398,6 +398,7 @@ + (NSString *)adjust_js {
 
         AdjustConfig.UrlStrategyIndia = 'UrlStrategyIndia';
         AdjustConfig.UrlStrategyChina = 'UrlStrategyChina';
+        AdjustConfig.UrlStrategyCn = 'UrlStrategyCn';
         AdjustConfig.DataResidencyEU = 'DataResidencyEU';
         AdjustConfig.DataResidencyTR = 'DataResidencyTR';
         AdjustConfig.DataResidencyUS = 'DataResidencyUS';

AdjustTests/AdjustUnitTests/ADJPackageFields.m

@@ -16,7 +16,7 @@ - (id) init {
 
     // default values
     self.appToken = @"qwerty123456";
-    self.clientSdk = @"ios4.33.0";
+    self.clientSdk = @"ios4.33.1";
     self.suffix = @"";
     self.environment = @"sandbox";
 

CHANGELOG.md

@@ -1,3 +1,10 @@
+### Version 4.33.1 (28th November 2022)
+#### Added
+- Added support for setting a new China URL Strategy. You can choose this setting by calling `setUrlStrategy:` method of `ADJConfig` instance with `ADJUrlStrategyCn` parameter.
+- Added support to `convertUniversalLink:scheme:` method to be able to parse data residency universal links.
+
+---
+
 ### Version 4.33.0 (November 19th 2021)
 #### Added
 - Added support for SKAdNetwork 4.0.

VERSION

@@ -1 +1 @@
-4.33.0
+4.33.1

examples/AdjustExample-ObjC/AdjustExample-ObjC/AppDelegate.m

@@ -39,9 +39,6 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
     // Enable LinkMe feature.
     // [adjustConfig setLinkMeEnabled:YES];
 
-    // Set an attribution delegate.
-    [adjustConfig setDelegate:self];
-
     // Set an attribution delegate.
     [adjustConfig setDelegate:self];