Merge pull request #105 from adjust/v4331

Version 4.33.1

Author: uerceg

CHANGELOG.md

@@ -1,11 +1,21 @@
+### Version 4.33.1 (16th February 2023)
+#### Fixed
+- Skipped invocation of SKAN 4.0 style callback in case SKAN 4.0 API was not invoked (https://github.com/adjust/flutter_sdk/issues/104).
+
+#### Native SDKs
+- [[email protected]][ios_sdk_v4.33.4]
+- [[email protected]][android_sdk_v4.33.3]
+
+---
+
 ### Version 4.33.0 (9th December 2022)
 #### Added
-- Added support for SKAD 4.0.
+- Added support for SKAN 4.0.
 - Added support for setting a new China URL Strategy. You can choose this setting by setting `urlStrategy` member of `AdjustConfig` instance to `AdjustConfig.UrlStrategyCn` value.
 
 #### Native SDKs
 - [[email protected]][ios_sdk_v4.33.2]
-- [[email protected]][android_sdk_v4.32.2]
+- [[email protected]][android_sdk_v4.33.2]
 
 ---
 
@@ -313,6 +323,7 @@
 [ios_sdk_v4.31.0]: https://github.com/adjust/ios_sdk/tree/v4.31.0
 [ios_sdk_v4.32.1]: https://github.com/adjust/ios_sdk/tree/v4.32.1
 [ios_sdk_v4.33.2]: https://github.com/adjust/ios_sdk/tree/v4.33.2
+[ios_sdk_v4.33.4]: https://github.com/adjust/ios_sdk/tree/v4.33.4
 
 [android_sdk_v4.17.0]: https://github.com/adjust/android_sdk/tree/v4.17.0
 [android_sdk_v4.18.0]: https://github.com/adjust/android_sdk/tree/v4.18.0
@@ -328,3 +339,4 @@
 [android_sdk_v4.31.0]: https://github.com/adjust/android_sdk/tree/v4.31.0
 [android_sdk_v4.32.0]: https://github.com/adjust/android_sdk/tree/v4.32.0
 [android_sdk_v4.33.2]: https://github.com/adjust/android_sdk/tree/v4.33.2
+[android_sdk_v4.33.3]: https://github.com/adjust/android_sdk/tree/v4.33.3

README.md

@@ -104,7 +104,7 @@ You can add Adjust SDK to your Flutter app by adding following to your `pubspec.
 
 ```yaml
 dependencies:
-  adjust_sdk: ^4.33.0
+  adjust_sdk: ^4.33.1
 ```
 
 Then navigate to your project in the terminal and run:
@@ -216,7 +216,6 @@ As of v4.22.0, the Adjust SDK supports install tracking on Huawei devices with H
 
 Make sure that following iOS frameworks are linked with your iOS app:
 
-* `iAd.framework` - in case you are running iAd campaigns
 * `AdServices.framework` - in case you are running iAd campaigns
 * `AdSupport.framework` - for reading iOS Advertising Id (IDFA)
 * `StoreKit.framework` - for communication with SKAdNetwork framework

VERSION

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

android/build.gradle

@@ -36,5 +36,5 @@ android {
 }
 
 dependencies {
-    api 'com.adjust.sdk:adjust-android:4.33.2'
+    api 'com.adjust.sdk:adjust-android:4.33.3'
 }

example/ios/Runner.xcodeproj/project.pbxproj

@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 51;
+	objectVersion = 54;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -14,11 +14,9 @@
 		97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
 		97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; };
 		9D934E032612994B00BDDA0B /* AdServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9D934E022612994B00BDDA0B /* AdServices.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
-		9DF8055B24F9214500A001CE /* iAd.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9DF8055A24F9214500A001CE /* iAd.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
 		9DF8055D24F9214A00A001CE /* AdSupport.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9DF8055C24F9214900A001CE /* AdSupport.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
 		9DF8055F24F9215100A001CE /* AppTrackingTransparency.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9DF8055E24F9215100A001CE /* AppTrackingTransparency.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
 		9DF8056124F9215600A001CE /* StoreKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9DF8056024F9215600A001CE /* StoreKit.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
-		9DF8056324F9215B00A001CE /* CoreTelephony.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9DF8056224F9215B00A001CE /* CoreTelephony.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
 		B6025B3595AA1F9CF9F139AC /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 356E070BF8DE437AF960ADE2 /* Pods_Runner.framework */; };
 /* End PBXBuildFile section */
 
@@ -68,8 +66,6 @@
 			files = (
 				9D934E032612994B00BDDA0B /* AdServices.framework in Frameworks */,
 				9DF8055F24F9215100A001CE /* AppTrackingTransparency.framework in Frameworks */,
-				9DF8055B24F9214500A001CE /* iAd.framework in Frameworks */,
-				9DF8056324F9215B00A001CE /* CoreTelephony.framework in Frameworks */,
 				9DF8055D24F9214A00A001CE /* AdSupport.framework in Frameworks */,
 				9DF8056124F9215600A001CE /* StoreKit.framework in Frameworks */,
 				B6025B3595AA1F9CF9F139AC /* Pods_Runner.framework in Frameworks */,
@@ -223,6 +219,7 @@
 /* Begin PBXShellScriptBuildPhase section */
 		3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
 			isa = PBXShellScriptBuildPhase;
+			alwaysOutOfDate = 1;
 			buildActionMask = 2147483647;
 			files = (
 			);
@@ -276,6 +273,7 @@
 		};
 		9740EEB61CF901F6004384FC /* Run Script */ = {
 			isa = PBXShellScriptBuildPhase;
+			alwaysOutOfDate = 1;
 			buildActionMask = 2147483647;
 			files = (
 			);

example/ios/Runner/Info.plist

@@ -45,5 +45,7 @@
 	<false/>
 	<key>CADisableMinimumFrameDurationOnPhone</key>
 	<true/>
+	<key>UIApplicationSupportsIndirectInputEvents</key>
+	<true/>
 </dict>
 </plist>

ios/Classes/AdjustSdk.m

@@ -153,7 +153,6 @@ - (void)start:(FlutterMethodCall *)call withResult:(FlutterResult)result {
     NSString *needsCost = call.arguments[@"needsCost"];
     NSString *coppaCompliantEnabled = call.arguments[@"coppaCompliantEnabled"];
     NSString *linkMeEnabled = call.arguments[@"linkMeEnabled"];
-    NSString *allowiAdInfoReading = call.arguments[@"allowiAdInfoReading"];
     NSString *allowAdServicesInfoReading = call.arguments[@"allowAdServicesInfoReading"];
     NSString *allowIdfaReading = call.arguments[@"allowIdfaReading"];
     NSString *skAdNetworkHandling = call.arguments[@"skAdNetworkHandling"];
@@ -247,11 +246,6 @@ - (void)start:(FlutterMethodCall *)call withResult:(FlutterResult)result {
         [adjustConfig setNeedsCost:[needsCost boolValue]];
     }
 
-    // Allow iAd info reading.
-    if ([self isFieldValid:allowiAdInfoReading]) {
-        [adjustConfig setAllowiAdInfoReading:[allowiAdInfoReading boolValue]];
-    }
-
     // Allow AdServices info reading.
     if ([self isFieldValid:allowAdServicesInfoReading]) {
         [adjustConfig setAllowAdServicesInfoReading:[allowAdServicesInfoReading boolValue]];
@@ -739,7 +733,6 @@ - (void)setTestOptions:(FlutterMethodCall *)call withResult:(FlutterResult)resul
     NSString *teardown = call.arguments[@"teardown"];
     NSString *deleteState = call.arguments[@"deleteState"];
     NSString *noBackoffWait = call.arguments[@"noBackoffWait"];
-    NSString *iAdFrameworkEnabled = call.arguments[@"iAdFrameworkEnabled"];
     NSString *adServicesFrameworkEnabled = call.arguments[@"adServicesFrameworkEnabled"];
 
     if ([self isFieldValid:baseUrl]) {
@@ -778,9 +771,6 @@ - (void)setTestOptions:(FlutterMethodCall *)call withResult:(FlutterResult)resul
     if ([self isFieldValid:noBackoffWait]) {
         testOptions.noBackoffWait = [noBackoffWait boolValue];
     }
-    if ([self isFieldValid:iAdFrameworkEnabled]) {
-        testOptions.iAdFrameworkEnabled = [iAdFrameworkEnabled boolValue];
-    }
     if ([self isFieldValid:adServicesFrameworkEnabled]) {
         testOptions.adServicesFrameworkEnabled = [adServicesFrameworkEnabled boolValue];
     }

ios/Classes/AdjustSdkDelegate.m

@@ -249,12 +249,16 @@ - (void)adjustConversionValueUpdatedWannabe:(NSNumber *)conversionValue {
 - (void)adjustConversionValueUpdatedWannabe:(nullable NSNumber *)fineValue
                                 coarseValue:(nullable NSString *)coarseValue
                                  lockWindow:(nullable NSNumber *)lockWindow {
-    id keys[] = { @"fineValue", @"coarseValue", @"lockWindow" };
-    id values[] = { [fineValue stringValue], coarseValue, [lockWindow stringValue] };
-    NSUInteger count = sizeof(values) / sizeof(id);
-    NSDictionary *conversionValueMap = [NSDictionary dictionaryWithObjects:values
-                                                                   forKeys:keys
-                                                                     count:count];
+    NSMutableDictionary *conversionValueMap = [NSMutableDictionary dictionary];
+    if (![fineValue isKindOfClass:[NSNull class]] && fineValue != nil) {
+        [conversionValueMap setValue:[fineValue stringValue] forKey:@"fineValue"];
+    }
+    if (![coarseValue isKindOfClass:[NSNull class]] && coarseValue != nil) {
+        [conversionValueMap setValue:coarseValue forKey:@"coarseValue"];
+    }
+    if (![lockWindow isKindOfClass:[NSNull class]] && lockWindow != nil) {
+        [conversionValueMap setValue:[lockWindow stringValue] forKey:@"lockWindow"];
+    }
     [self.channel invokeMethod:dartSkad4ConversionValueUpdatedCallback arguments:conversionValueMap];
 }
 

ios/adjust_sdk.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name                  = 'adjust_sdk'
-  s.version               = '4.33.0'
+  s.version               = '4.33.1'
   s.summary               = 'Adjust Flutter SDK for iOS platform'
   s.description           = <<-DESC
                             Adjust Flutter SDK for iOS platform.
@@ -14,5 +14,5 @@ Pod::Spec.new do |s|
   s.ios.deployment_target = '8.0'
 
   s.dependency 'Flutter'
-  s.dependency 'Adjust', '4.33.2'
+  s.dependency 'Adjust', '4.33.4'
 end

lib/adjust.dart

@@ -19,7 +19,7 @@ import 'package:flutter/services.dart';
 import 'package:meta/meta.dart';
 
 class Adjust {
-  static const String _sdkPrefix = 'flutter4.33.0';
+  static const String _sdkPrefix = 'flutter4.33.1';
   static const MethodChannel _channel =
       const MethodChannel('com.adjust.sdk/api');