Merge pull request #379 from adjust/fix_tps

TPS and MC in subsequent SDK initializations
adjust · Feb 28, 2024 · 801fce0 · 801fce0
2 parents 2ae5cba + 17351fd
commit 801fce0
Show file tree

Hide file tree

Showing 19 changed files with 169 additions and 55 deletions.
diff --git a/Adjust.podspec b/Adjust.podspec
@@ -1,11 +1,11 @@
 Pod::Spec.new do |s|
   s.name           = "Adjust"
-  s.version        = "4.37.1"
+  s.version        = "4.37.2"
   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" => "sdk@adjust.com" }
-  s.source         = { :git => "https://github.com/adjust/ios_sdk.git", :tag => "v4.37.1" }
+  s.source         = { :git => "https://github.com/adjust/ios_sdk.git", :tag => "v4.37.2" }
   s.ios.deployment_target = '9.0'
   s.tvos.deployment_target = '9.0'
   s.framework      = 'SystemConfiguration'

diff --git a/Adjust/ADJActivityHandler.m b/Adjust/ADJActivityHandler.m
@@ -1030,6 +1030,28 @@ - (void)processSessionI:(ADJActivityHandler *)selfI {
         [ADJUserDefaults removeDisableThirdPartySharing];
 
         return;
+    } else {
+        // these checks should run after SDK initialization after the first one
+        if ([ADJUserDefaults getDisableThirdPartySharing]) {
+            [selfI disableThirdPartySharingI:selfI];
+        }
+        if (selfI.savedPreLaunch.preLaunchAdjustThirdPartySharingArray != nil) {
+            for (ADJThirdPartySharing *thirdPartySharing
+                 in selfI.savedPreLaunch.preLaunchAdjustThirdPartySharingArray)
+            {
+                [selfI trackThirdPartySharingI:selfI
+                             thirdPartySharing:thirdPartySharing];
+            }
+
+            selfI.savedPreLaunch.preLaunchAdjustThirdPartySharingArray = nil;
+        }
+        if (selfI.savedPreLaunch.lastMeasurementConsentTracked != nil) {
+            [selfI
+                trackMeasurementConsentI:selfI
+                enabled:[selfI.savedPreLaunch.lastMeasurementConsentTracked boolValue]];
+
+            selfI.savedPreLaunch.lastMeasurementConsentTracked = nil;
+        }
     }
 
     double lastInterval = now - selfI.activityState.lastActivity;

diff --git a/Adjust/ADJUtil.m b/Adjust/ADJUtil.m
@@ -35,7 +35,7 @@
 static NSRegularExpression *shortUniversalLinkRegex = nil;
 static NSRegularExpression *excludedDeeplinkRegex = nil;
 
-static NSString * const kClientSdk                  = @"ios4.37.1";
+static NSString * const kClientSdk                  = @"ios4.37.2";
 static NSString * const kDeeplinkParam              = @"deep_link=";
 static NSString * const kSchemeDelimiter            = @"://";
 static NSString * const kDefaultScheme              = @"AdjustUniversalScheme";

diff --git a/Adjust/Adjust.h b/Adjust/Adjust.h
@@ -2,7 +2,7 @@
 //  Adjust.h
 //  Adjust SDK
 //
-//  V4.37.1
+//  V4.37.2
 //  Created by Christian Wellenbrock (@wellle) on 23rd July 2013.
 //  Copyright (c) 2012-2021 Adjust GmbH. All rights reserved.
 //

diff --git a/AdjustBridge/AdjustBridgeRegister.m b/AdjustBridge/AdjustBridgeRegister.m
@@ -280,7 +280,7 @@ + (NSString *)adjust_js {
                 if (this.sdkPrefix) {
                     return this.sdkPrefix;
                 } else {
-                    return 'web-bridge4.37.1';
+                    return 'web-bridge4.37.2';
                 }
             },
             setTestOptions: function(testOptions) {

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+### Version 4.37.2 (28th February 2024)
+#### Changed
+- Added tracking of `third_party_sharing` and `measurement_consent` packages if invoked before SDK initialization in subsequent SDK initializations.
+- Cleaned up example apps.
+
+---
+
 ### Version 4.37.1 (15th February 2024)
 #### Added
 - Added support for `TradPlus` ad revenue tracking.

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-4.37.1
+4.37.2
diff --git a/examples/AdjustExample-FbPixel/AdjustExample-FbPixel.xcodeproj/project.pbxproj b/examples/AdjustExample-FbPixel/AdjustExample-FbPixel.xcodeproj/project.pbxproj
@@ -7,10 +7,10 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		07A893432B0B980B0011DAB8 /* ADJPurchaseVerificationHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = 07A8933F2B0B980B0011DAB8 /* ADJPurchaseVerificationHandler.m */; };
-		07A893442B0B980B0011DAB8 /* ADJPurchaseVerificationResult.m in Sources */ = {isa = PBXBuildFile; fileRef = 07A893402B0B980B0011DAB8 /* ADJPurchaseVerificationResult.m */; };
-		07A893452B0B980B0011DAB8 /* ADJPurchase.m in Sources */ = {isa = PBXBuildFile; fileRef = 07A893412B0B980B0011DAB8 /* ADJPurchase.m */; };
 		07AF832327BD3CBF00C5DD9E /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 07AF832227BD3CBF00C5DD9E /* Main.storyboard */; };
+		07C8C7F22B8F447B006979A1 /* ADJPurchaseVerificationResult.m in Sources */ = {isa = PBXBuildFile; fileRef = 07C8C7EC2B8F447B006979A1 /* ADJPurchaseVerificationResult.m */; };
+		07C8C7F32B8F447B006979A1 /* ADJPurchase.m in Sources */ = {isa = PBXBuildFile; fileRef = 07C8C7ED2B8F447B006979A1 /* ADJPurchase.m */; };
+		07C8C7F42B8F447B006979A1 /* ADJPurchaseVerificationHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = 07C8C7EF2B8F447B006979A1 /* ADJPurchaseVerificationHandler.m */; };
 		6FAB78C12636DDC400773869 /* ADJLinkResolution.m in Sources */ = {isa = PBXBuildFile; fileRef = 6FAB78BF2636DDC400773869 /* ADJLinkResolution.m */; };
 		9D49D17A290FEC2E00042345 /* ADJSKAdNetwork.m in Sources */ = {isa = PBXBuildFile; fileRef = 9D49D179290FEC2E00042345 /* ADJSKAdNetwork.m */; };
 		9D9D1533212EB3920081445E /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 9D9D1532212EB3920081445E /* AppDelegate.m */; };
@@ -63,13 +63,13 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
-		07A8933D2B0B980B0011DAB8 /* ADJPurchase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ADJPurchase.h; path = "../../../Downloads/ios_sdk_dev-tracking_domain/Adjust/ADJPurchase.h"; sourceTree = "<group>"; };
-		07A8933E2B0B980B0011DAB8 /* ADJPurchaseVerificationResult.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ADJPurchaseVerificationResult.h; path = "../../../Downloads/ios_sdk_dev-tracking_domain/Adjust/ADJPurchaseVerificationResult.h"; sourceTree = "<group>"; };
-		07A8933F2B0B980B0011DAB8 /* ADJPurchaseVerificationHandler.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ADJPurchaseVerificationHandler.m; path = "../../../Downloads/ios_sdk_dev-tracking_domain/Adjust/ADJPurchaseVerificationHandler.m"; sourceTree = "<group>"; };
-		07A893402B0B980B0011DAB8 /* ADJPurchaseVerificationResult.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ADJPurchaseVerificationResult.m; path = "../../../Downloads/ios_sdk_dev-tracking_domain/Adjust/ADJPurchaseVerificationResult.m"; sourceTree = "<group>"; };
-		07A893412B0B980B0011DAB8 /* ADJPurchase.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ADJPurchase.m; path = "../../../Downloads/ios_sdk_dev-tracking_domain/Adjust/ADJPurchase.m"; sourceTree = "<group>"; };
-		07A893422B0B980B0011DAB8 /* ADJPurchaseVerificationHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ADJPurchaseVerificationHandler.h; path = "../../../Downloads/ios_sdk_dev-tracking_domain/Adjust/ADJPurchaseVerificationHandler.h"; sourceTree = "<group>"; };
 		07AF832227BD3CBF00C5DD9E /* Main.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = Main.storyboard; sourceTree = "<group>"; };
+		07C8C7EC2B8F447B006979A1 /* ADJPurchaseVerificationResult.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ADJPurchaseVerificationResult.m; sourceTree = "<group>"; };
+		07C8C7ED2B8F447B006979A1 /* ADJPurchase.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ADJPurchase.m; sourceTree = "<group>"; };
+		07C8C7EE2B8F447B006979A1 /* ADJPurchase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ADJPurchase.h; sourceTree = "<group>"; };
+		07C8C7EF2B8F447B006979A1 /* ADJPurchaseVerificationHandler.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ADJPurchaseVerificationHandler.m; sourceTree = "<group>"; };
+		07C8C7F02B8F447B006979A1 /* ADJPurchaseVerificationHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ADJPurchaseVerificationHandler.h; sourceTree = "<group>"; };
+		07C8C7F12B8F447B006979A1 /* ADJPurchaseVerificationResult.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ADJPurchaseVerificationResult.h; sourceTree = "<group>"; };
 		6FAB78BF2636DDC400773869 /* ADJLinkResolution.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ADJLinkResolution.m; sourceTree = "<group>"; };
 		6FAB78C02636DDC400773869 /* ADJLinkResolution.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ADJLinkResolution.h; sourceTree = "<group>"; };
 		9D49D178290FEC2E00042345 /* ADJSKAdNetwork.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ADJSKAdNetwork.h; sourceTree = "<group>"; };
@@ -298,12 +298,12 @@
 				6FAB78BF2636DDC400773869 /* ADJLinkResolution.m */,
 				9D49D178290FEC2E00042345 /* ADJSKAdNetwork.h */,
 				9D49D179290FEC2E00042345 /* ADJSKAdNetwork.m */,
-				07A8933D2B0B980B0011DAB8 /* ADJPurchase.h */,
-				07A893412B0B980B0011DAB8 /* ADJPurchase.m */,
-				07A893422B0B980B0011DAB8 /* ADJPurchaseVerificationHandler.h */,
-				07A8933F2B0B980B0011DAB8 /* ADJPurchaseVerificationHandler.m */,
-				07A8933E2B0B980B0011DAB8 /* ADJPurchaseVerificationResult.h */,
-				07A893402B0B980B0011DAB8 /* ADJPurchaseVerificationResult.m */,
+				07C8C7EE2B8F447B006979A1 /* ADJPurchase.h */,
+				07C8C7ED2B8F447B006979A1 /* ADJPurchase.m */,
+				07C8C7F02B8F447B006979A1 /* ADJPurchaseVerificationHandler.h */,
+				07C8C7EF2B8F447B006979A1 /* ADJPurchaseVerificationHandler.m */,
+				07C8C7F12B8F447B006979A1 /* ADJPurchaseVerificationResult.h */,
+				07C8C7EC2B8F447B006979A1 /* ADJPurchaseVerificationResult.m */,
 			);
 			name = Adjust;
 			path = ../../../Adjust;
@@ -427,16 +427,13 @@
 				9DF92F202630F377000FC3FC /* ADJResponseData.m in Sources */,
 				9DF92F1C2630F377000FC3FC /* ADJActivityPackage.m in Sources */,
 				9DF92F0C2630F377000FC3FC /* ADJEventSuccess.m in Sources */,
-				07A893442B0B980B0011DAB8 /* ADJPurchaseVerificationResult.m in Sources */,
 				9DF92FB02630F3A1000FC3FC /* WKWebViewJavascriptBridge.m in Sources */,
-				07A893432B0B980B0011DAB8 /* ADJPurchaseVerificationHandler.m in Sources */,
 				9DF92F232630F377000FC3FC /* ADJUserDefaults.m in Sources */,
 				9DF92F182630F377000FC3FC /* NSData+ADJAdditions.m in Sources */,
 				9DF92F212630F377000FC3FC /* ADJPackageBuilder.m in Sources */,
 				9DF92F132630F377000FC3FC /* Adjust.m in Sources */,
 				9DF92F172630F377000FC3FC /* NSString+ADJAdditions.m in Sources */,
 				9DF92F052630F377000FC3FC /* ADJTimerOnce.m in Sources */,
-				07A893452B0B980B0011DAB8 /* ADJPurchase.m in Sources */,
 				9DF92F072630F377000FC3FC /* ADJRequestHandler.m in Sources */,
 				9DF92F122630F377000FC3FC /* ADJBackoffStrategy.m in Sources */,
 				9DF92F222630F377000FC3FC /* ADJSubscription.m in Sources */,
@@ -457,14 +454,17 @@
 				9DF92F0F2630F377000FC3FC /* ADJTimerCycle.m in Sources */,
 				9DF92FB12630F3A1000FC3FC /* WebViewJavascriptBridge_JS.m in Sources */,
 				9DF92F0E2630F377000FC3FC /* ADJSessionFailure.m in Sources */,
+				07C8C7F22B8F447B006979A1 /* ADJPurchaseVerificationResult.m in Sources */,
 				9DF92F1E2630F377000FC3FC /* ADJUrlStrategy.m in Sources */,
 				6FAB78C12636DDC400773869 /* ADJLinkResolution.m in Sources */,
 				9DF92F1B2630F377000FC3FC /* ADJThirdPartySharing.m in Sources */,
+				07C8C7F42B8F447B006979A1 /* ADJPurchaseVerificationHandler.m in Sources */,
 				9DF92F162630F377000FC3FC /* ADJActivityKind.m in Sources */,
 				9DF92F092630F377000FC3FC /* ADJEvent.m in Sources */,
 				9DF92F0D2630F377000FC3FC /* ADJActivityState.m in Sources */,
 				9DF92F0A2630F377000FC3FC /* ADJSessionSuccess.m in Sources */,
 				9DF92F042630F377000FC3FC /* ADJAdRevenue.m in Sources */,
+				07C8C7F32B8F447B006979A1 /* ADJPurchase.m in Sources */,
 				9DF92F142630F377000FC3FC /* ADJConfig.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;

diff --git a/examples/AdjustExample-FbPixel/AdjustExample-FbPixel/AppDelegate.m b/examples/AdjustExample-FbPixel/AdjustExample-FbPixel/AppDelegate.m
@@ -22,7 +22,13 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
     return YES;
 }
 
-- (BOOL)application:(UIApplication *)app openURL:(NSURL *)url options:(NSDictionary<UIApplicationOpenURLOptionsKey, id> *)options {
+- (BOOL)application:(UIApplication *)app openURL:(NSURL *)url options:(NSDictionary<UIApplicationOpenURLOptionsKey,id> *)options {
+    NSLog(@"Scheme based deep link opened an app: %@", url);
+    // add your code below to handle deep link
+    // (e.g., open deep link content)
+    // url object contains the deep link
+
+    // Call the below method to send deep link to Adjust backend
     [Adjust appWillOpenUrl:url];
     return YES;
 }

diff --git a/examples/AdjustExample-ObjC/AdjustExample-ObjC/AppDelegate.m b/examples/AdjustExample-ObjC/AdjustExample-ObjC/AppDelegate.m
@@ -82,7 +82,11 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
 
 - (BOOL)application:(UIApplication *)app openURL:(NSURL *)url options:(NSDictionary<UIApplicationOpenURLOptionsKey,id> *)options {
     NSLog(@"Scheme based deep link opened an app: %@", url);
-    // Pass deep link to Adjust in order to potentially reattribute user.
+    // add your code below to handle deep link
+    // (e.g., open deep link content)
+    // url object contains the deep link
+
+    // Call the below method to send deep link to Adjust backend
     [Adjust appWillOpenUrl:url];
     return YES;
 }

diff --git a/examples/AdjustExample-Swift/AdjustExample-Swift/AppDelegate.swift b/examples/AdjustExample-Swift/AdjustExample-Swift/AppDelegate.swift
@@ -73,14 +73,18 @@ class AppDelegate: UIResponder, UIApplicationDelegate, AdjustDelegate {
 
         return true
     }
-    
-    func application(_ application: UIApplication, handleOpen url: URL) -> Bool {
+
+    func application(_ app: UIApplication, open url: URL, options: [UIApplication.OpenURLOptionsKey : Any] = [:]) -> Bool {
         NSLog("Scheme based deep link opened an app: %@", url.absoluteString)
-        // Pass deep link to Adjust in order to potentially reattribute user.
+        // add your code below to handle deep link
+        // (e.g., open deep link content)
+        // url object contains the deep link
+
+        // Call the below method to send deep link to Adjust backend
         Adjust.appWillOpen(url)
         return true
     }
-    
+
     func application(_ application: UIApplication, continue userActivity: NSUserActivity, restorationHandler: @escaping ([UIUserActivityRestoring]?) -> Void) -> Bool {
         if (userActivity.activityType == NSUserActivityTypeBrowsingWeb) {
             NSLog("Universal link opened an app: %@", userActivity.webpageURL!.absoluteString)

diff --git a/examples/AdjustExample-Swift/Podfile.lock b/examples/AdjustExample-Swift/Podfile.lock
@@ -1,7 +1,7 @@
 PODS:
-  - Adjust (4.37.1):
-    - Adjust/Core (= 4.37.1)
-  - Adjust/Core (4.37.1)
+  - Adjust (4.37.2):
+    - Adjust/Core (= 4.37.2)
+  - Adjust/Core (4.37.2)
 
 DEPENDENCIES:
   - Adjust (from `../../`)
@@ -11,8 +11,8 @@ EXTERNAL SOURCES:
     :path: "../../"
 
 SPEC CHECKSUMS:
-  Adjust: de140fb7f466ad6884ffc2bca2f9a3afbd285f42
+  Adjust: a830d963025334aee8a62a7bac87825e297a841e
 
 PODFILE CHECKSUM: 4c79da456db9adb90cdd42adc7f721c7bb6490cd
 
-COCOAPODS: 1.12.1
+COCOAPODS: 1.14.3