Merge pull request #94 from adjust/v4320

uerceg · web-flow · commit f12afb7a28c3 · 2022-10-07T16:18:46.000+02:00
Version 4.32.0
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,17 @@
+### Version 4.32.0 (7th October 2022)
+#### Added
+- Added partner sharing settings to the third party sharing feature.
+- Added `getLastDeeplink` getter to `Adjust` API to be able to get last tracked deep link by the SDK for iOS platform.
+
+#### Changed
+- Switched to adding permission `com.google.android.gms.permission.AD_ID` in the Android app's mainfest by default.
+
+#### Native SDKs
+- [iOS@v4.32.1][ios_sdk_v4.32.1]
+- [Android@v4.32.0][android_sdk_v4.32.0]
+
+---
+
 ### Version 4.31.0 (3rd August 2022)
 #### Added
 - Added support for `LinkMe` feature.
@@ -286,6 +300,7 @@
 [ios_sdk_v4.29.7]: https://github.com/adjust/ios_sdk/tree/v4.29.7
 [ios_sdk_v4.30.0]: https://github.com/adjust/ios_sdk/tree/v4.30.0
 [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
 
 [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
@@ -299,3 +314,4 @@
 [android_sdk_v4.28.5]: https://github.com/adjust/android_sdk/tree/v4.28.5
 [android_sdk_v4.30.1]: https://github.com/adjust/android_sdk/tree/v4.30.1
 [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
diff --git a/README.md b/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.31.0
+  adjust_sdk: ^4.32.0
 ```
 
 Then navigate to your project in the terminal and run:
@@ -301,7 +301,7 @@ class MainScreenState extends State<MainScreen> with WidgetsBindingObserver {
       case AppLifecycleState.paused:
         Adjust.onPause();
         break;
-      case AppLifecycleState.suspending:
+      case AppLifecycleState.detached:
         break;
     }
   }
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-4.31.0
+4.32.0
diff --git a/android/build.gradle b/android/build.gradle
@@ -36,5 +36,5 @@ android {
 }
 
 dependencies {
-    api 'com.adjust.sdk:adjust-android:4.31.0'
+    api 'com.adjust.sdk:adjust-android:4.32.0'
 }
diff --git a/android/src/main/java/com/adjust/sdk/flutter/AdjustSdk.java b/android/src/main/java/com/adjust/sdk/flutter/AdjustSdk.java
@@ -198,6 +198,12 @@ public void onMethodCall(MethodCall call, final Result result) {
             case "checkForNewAttStatus":
                 checkForNewAttStatus(call, result);
                 break;
+            case "getAppTrackingAuthorizationStatus":
+                getAppTrackingAuthorizationStatus(call, result);
+                break;
+            case "getLastDeeplink":
+                getLastDeeplink(call, result);
+                break;
             case "setTestOptions":
                 setTestOptions(call, result);
                 break;
@@ -1055,6 +1061,18 @@ private void trackThirdPartySharing(final MethodCall call, final Result result)
             }
         }
 
+        // Partner sharing settings.
+        if (thirdPartySharingMap.containsKey("partnerSharingSettings")) {
+            String strPartnerSharingSettings = (String) thirdPartySharingMap.get("partnerSharingSettings");
+            String[] arrayPartnerSharingSettings = strPartnerSharingSettings.split("__ADJ__", -1);
+            for (int i = 0; i < arrayPartnerSharingSettings.length; i += 3) {
+                thirdPartySharing.addPartnerSharingSetting(
+                    arrayPartnerSharingSettings[i],
+                    arrayPartnerSharingSettings[i+1],
+                    Boolean.parseBoolean(arrayPartnerSharingSettings[i+2]));
+            }
+        }
+
         // Track third party sharing.
         Adjust.trackThirdPartySharing(thirdPartySharing);
         result.success(null);
@@ -1076,6 +1094,14 @@ private void checkForNewAttStatus(final MethodCall call, final Result result) {
         result.success("Error. No checkForNewAttStatus for Android platform!");
     }
 
+    private void getAppTrackingAuthorizationStatus(final MethodCall call, final Result result) {
+        result.success("Error. No getAppTrackingAuthorizationStatus for Android platform!");
+    }
+
+    private void getLastDeeplink(final MethodCall call, final Result result) {
+        result.success("Error. No getLastDeeplink for Android platform!");
+    }
+
     private void setTestOptions(final MethodCall call, final Result result) {
         AdjustTestOptions testOptions = new AdjustTestOptions();
         Map testOptionsMap = (Map) call.arguments;
diff --git a/example/ios/Flutter/AppFrameworkInfo.plist b/example/ios/Flutter/AppFrameworkInfo.plist
@@ -21,6 +21,6 @@
   <key>CFBundleVersion</key>
   <string>1.0</string>
   <key>MinimumOSVersion</key>
-  <string>9.0</string>
+  <string>11.0</string>
 </dict>
 </plist>
diff --git a/example/ios/Podfile b/example/ios/Podfile
@@ -1,5 +1,5 @@
 # Uncomment this line to define a global platform for your project
-# platform :ios, '9.0'
+platform :ios, '11.0'
 
 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
 ENV['COCOAPODS_DISABLE_STATS'] = 'true'
diff --git a/example/ios/Runner.xcodeproj/project.pbxproj b/example/ios/Runner.xcodeproj/project.pbxproj
@@ -179,7 +179,7 @@
 		97C146E61CF9000F007C117D /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1240;
+				LastUpgradeCheck = 1300;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
 					97C146ED1CF9000F007C117D = {
@@ -364,7 +364,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
@@ -451,7 +451,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -501,7 +501,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
diff --git a/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1240"
+   LastUpgradeVersion = "1300"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/example/ios/Runner/Info.plist b/example/ios/Runner/Info.plist
@@ -43,5 +43,7 @@
 	<string>We will we will track you (clap clap stomp)</string>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
 	<false/>
+	<key>CADisableMinimumFrameDurationOnPhone</key>
+	<true/>
 </dict>
 </plist>
diff --git a/ios/Classes/AdjustSdk.m b/ios/Classes/AdjustSdk.m
@@ -121,7 +121,9 @@ - (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result
         result([Adjust adid]);
     } else if ([@"checkForNewAttStatus" isEqualToString:call.method]) {
          [Adjust checkForNewAttStatus];
-     } else {
+    } else if ([@"getLastDeeplink" isEqualToString:call.method]) {
+         [self getLastDeeplink:call withResult:result];
+    } else {
         result(FlutterMethodNotImplemented);
     }
 }
@@ -637,6 +639,7 @@ - (void)updateConversionValue:(FlutterMethodCall *)call withResult:(FlutterResul
 - (void)trackThirdPartySharing:(FlutterMethodCall *)call withResult:(FlutterResult)result {
     NSNumber *isEnabled = call.arguments[@"isEnabled"];
     NSString *strGranularOptions = call.arguments[@"granularOptions"];
+    NSString *strPartnerSharingSettings = call.arguments[@"partnerSharingSettings"];
 
     // Create third party sharing object.
     ADJThirdPartySharing *adjustThirdPartySharing = [[ADJThirdPartySharing alloc]
@@ -654,6 +657,18 @@ - (void)trackThirdPartySharing:(FlutterMethodCall *)call withResult:(FlutterResu
         }
     }
 
+    // Partner sharing settings.
+    if (strPartnerSharingSettings != nil) {
+        NSArray *arrayPartnerSharingSettings = [strPartnerSharingSettings componentsSeparatedByString:@"__ADJ__"];
+        if (arrayPartnerSharingSettings != nil) {
+            for (int i = 0; i < [arrayPartnerSharingSettings count]; i += 3) {
+                [adjustThirdPartySharing addPartnerSharingSetting:[arrayPartnerSharingSettings objectAtIndex:i]
+                                                              key:[arrayPartnerSharingSettings objectAtIndex:i+1]
+                                                            value:[[arrayPartnerSharingSettings objectAtIndex:i+2] boolValue]];
+            }
+        }
+    }
+
     // Track third party sharing.
     [Adjust trackThirdPartySharing:adjustThirdPartySharing];
     result(nil);
@@ -667,6 +682,15 @@ - (void)trackMeasurementConsent:(FlutterMethodCall *)call withResult:(FlutterRes
     result(nil);
 }
 
+- (void)getLastDeeplink:(FlutterMethodCall *)call withResult:(FlutterResult)result {
+    NSURL *lastDeeplink = [Adjust lastDeeplink];
+    if (![self isFieldValid:lastDeeplink]) {
+        result(nil);
+    } else {
+        result([lastDeeplink absoluteString]);
+    }
+}
+
 - (void)setTestOptions:(FlutterMethodCall *)call withResult:(FlutterResult)result {
     AdjustTestOptions *testOptions = [[AdjustTestOptions alloc] init];
     NSString *baseUrl = call.arguments[@"baseUrl"];
diff --git a/ios/adjust_sdk.podspec b/ios/adjust_sdk.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name                  = 'adjust_sdk'
-  s.version               = '4.31.0'
+  s.version               = '4.32.0'
   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.31.0'
+  s.dependency 'Adjust', '4.32.1'
 end
diff --git a/lib/adjust.dart b/lib/adjust.dart
@@ -19,7 +19,7 @@ import 'package:flutter/services.dart';
 import 'package:meta/meta.dart';
 
 class Adjust {
-  static const String _sdkPrefix = 'flutter4.31.0';
+  static const String _sdkPrefix = 'flutter4.32.0';
   static const MethodChannel _channel =
       const MethodChannel('com.adjust.sdk/api');
 
@@ -184,6 +184,11 @@ class Adjust {
     _channel.invokeMethod('checkForNewAttStatus');
   }
 
+  static Future<String?> getLastDeeplink() async {
+    final String? deeplink = await _channel.invokeMethod('getLastDeeplink');
+    return deeplink;
+  }
+
   // For testing purposes only. Do not use in production.
   @visibleForTesting
   static void setTestOptions(final dynamic testOptions) {
diff --git a/lib/adjust_third_party_sharing.dart b/lib/adjust_third_party_sharing.dart
@@ -9,9 +9,11 @@
 class AdjustThirdPartySharing {
   bool? _isEnabled;
   late List<String> _granularOptions;
+  late List<String> _partnerSharingSettings;
 
   AdjustThirdPartySharing(this._isEnabled) {
     _granularOptions = <String>[];
+    _partnerSharingSettings = <String>[];
   }
 
   void addGranularOption(String partnerName, String key, String value) {
@@ -20,12 +22,22 @@ class AdjustThirdPartySharing {
     _granularOptions.add(value);
   }
 
+  void addPartnerSharingSetting(String partnerName, String key, bool value) {
+    _partnerSharingSettings.add(partnerName);
+    _partnerSharingSettings.add(key);
+    _partnerSharingSettings.add(value.toString());
+  }
+
   Map<String, Object?> get toMap {
     Map<String, Object?> thirdPartySharingMap = {'isEnabled': _isEnabled};
     if (_granularOptions.length > 0) {
       thirdPartySharingMap['granularOptions'] =
           _granularOptions.join('__ADJ__');
     }
+    if (_partnerSharingSettings.length > 0) {
+      thirdPartySharingMap['partnerSharingSettings'] =
+          _partnerSharingSettings.join('__ADJ__');
+    }
 
     return thirdPartySharingMap;
   }
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,7 +1,7 @@
 name: adjust_sdk
 description: This is the Flutter SDK of Adjust™. You can read more about Adjust™ at adjust.com.
 homepage: https://github.com/adjust/flutter_sdk
-version: 4.31.0
+version: 4.32.0
 
 environment:
   sdk: ">=2.12.0 <3.0.0"
diff --git a/test/app/ios/Flutter/AppFrameworkInfo.plist b/test/app/ios/Flutter/AppFrameworkInfo.plist
@@ -21,6 +21,6 @@
   <key>CFBundleVersion</key>
   <string>1.0</string>
   <key>MinimumOSVersion</key>
-  <string>9.0</string>
+  <string>11.0</string>
 </dict>
 </plist>
diff --git a/test/app/ios/Podfile b/test/app/ios/Podfile
@@ -1,5 +1,5 @@
 # Uncomment this line to define a global platform for your project
-# platform :ios, '9.0'
+platform :ios, '11.0'
 
 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
 ENV['COCOAPODS_DISABLE_STATS'] = 'true'
diff --git a/test/app/ios/Runner.xcodeproj/project.pbxproj b/test/app/ios/Runner.xcodeproj/project.pbxproj
@@ -360,7 +360,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
@@ -466,7 +466,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -516,7 +516,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
diff --git a/test/app/lib/command_executor.dart b/test/app/lib/command_executor.dart
@@ -125,6 +125,9 @@ class CommandExecutor {
       case 'trackAdRevenueV2':
         _trackAdRevenueV2();
         break;
+      case 'getLastDeeplink':
+        _getLastDeeplink();
+        break;
     }
   }
 
@@ -775,6 +778,19 @@ class CommandExecutor {
       }
     }
 
+    if (_command.containsParameter('partnerSharingSettings')) {
+      List<dynamic> partnerSharingSettings =
+          _command.getParamteters('partnerSharingSettings')!;
+      for (var i = 0; i < partnerSharingSettings.length; i += 3) {
+        if (partnerSharingSettings[i] != null && partnerSharingSettings[i + 1] != null && partnerSharingSettings[i + 2] != null) {
+          String partnerName = partnerSharingSettings[i];
+          String key = partnerSharingSettings[i + 1];
+          bool value = partnerSharingSettings[i + 2] == 'true';
+          adjustThirdPartySharing.addPartnerSharingSetting(partnerName, key, value);
+        }
+      }
+    }
+
     Adjust.trackThirdPartySharing(adjustThirdPartySharing);
   }
 
@@ -830,4 +846,14 @@ class CommandExecutor {
 
     Adjust.trackAdRevenueNew(adjustAdRevenue);
   }
+
+  void _getLastDeeplink() {
+    if (Platform.isIOS) {
+      Adjust.getLastDeeplink().then((lastDeeplink) {
+        String? localBasePath = _basePath;
+        TestLib.addInfoToSend('last_deeplink', lastDeeplink);
+        TestLib.sendInfoToServer(localBasePath);
+      });
+    }
+  }
 }
diff --git a/test/app/lib/main.dart b/test/app/lib/main.dart
diff --git a/test/ios/test_lib.podspec b/test/ios/test_lib.podspec
diff --git a/test/pubspec.yaml b/test/pubspec.yaml

Original file line number	Diff line number	Diff line change
`@@ -36,5 +36,5 @@ android {`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`dependencies {`
`39`		`- api 'com.adjust.sdk:adjust-android:4.31.0'`
	`39`	`+ api 'com.adjust.sdk:adjust-android:4.32.0'`
`40`	`40`	`}`