Merge pull request #52 from AppsFlyerSDK/6.0.6

ShaharAF · web-flow · commit 3104fcc5c5db · 2020-10-21T15:30:23.000+03:00
6.0.6
diff --git a/.gitignore b/.gitignore
@@ -105,3 +105,4 @@ node_modules/
 
 covBadgeGen.js
 coverage/
+.env
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Versions
 
+## 6.0.5
+- Update SDK version to:
+    - Android: 5.4.5
+    - iOS: 6.0.5
+- Update Google install referrer to 2.1
+- Added support for: https://support.appsflyer.com/hc/en-us/articles/207032066#additional-apis-kids-apps
+- Fixed typo in `validateAndLogInAppPurchase`
+
 ## 6.0.3+5 
 - Add null check for context in Android
 
diff --git a/README.md b/README.md
@@ -32,8 +32,8 @@ When submitting an issue please specify your AppsFlyer sign-up (account) email ,
 
 ### This plugin is built for
 
-- iOS AppsFlyerSDK **v6.0.3**
-- Android AppsFlyerSDK **v5.4.1**
+- iOS AppsFlyerSDK **v6.0.5**
+- Android AppsFlyerSDK **v5.4.5**
 
 ---
 ## <a id="v6-breaking-changes"> **❗Migration Guide to v6**
diff --git a/android/build.gradle b/android/build.gradle
@@ -35,6 +35,6 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation 'androidx.appcompat:appcompat:1.0.0'
-    implementation 'com.appsflyer:af-android-sdk:5.4.3'
-    implementation 'com.android.installreferrer:installreferrer:1.0'
+    implementation 'com.appsflyer:af-android-sdk:5.4.5'
+    implementation 'com.android.installreferrer:installreferrer:2.1'
 }
diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle
@@ -57,7 +57,7 @@ flutter {
 dependencies {
     testImplementation 'junit:junit:4.12'
     implementation 'com.appsflyer:af-android-sdk:5.4.1'
-    implementation 'com.android.installreferrer:installreferrer:1.0'
+    implementation 'com.android.installreferrer:installreferrer:2.1'
     androidTestImplementation 'androidx.test:runner:1.1.0'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
 }
diff --git a/example/ios/Podfile b/example/ios/Podfile
diff --git a/example/ios/Runner.xcodeproj/project.pbxproj b/example/ios/Runner.xcodeproj/project.pbxproj
@@ -229,9 +229,12 @@
 			files = (
 			);
 			inputPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh",
+				"${PODS_ROOT}/../Flutter/Flutter.framework",
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Flutter.framework",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
@@ -311,7 +314,6 @@
 /* Begin XCBuildConfiguration section */
 		97C147031CF9000F007C117D /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
@@ -368,7 +370,6 @@
 		};
 		97C147041CF9000F007C117D /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
diff --git a/example/lib/main.dart b/example/lib/main.dart
@@ -1,17 +1,20 @@
+import 'dart:async';
+
+import 'package:flutter_dotenv/flutter_dotenv.dart';
+
 import './main_page.dart';
 import 'package:flutter/material.dart';
 
-void main() {
+Future<void> main() async {
+  await DotEnv().load('.env');
   runApp(MyApp());
 }
-class MyApp extends StatelessWidget {
 
+class MyApp extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return new MaterialApp(
-       home: new MainPage(),
+      home: new MainPage(),
     );
   }
 }
-
-
diff --git a/example/lib/main_page.dart b/example/lib/main_page.dart
@@ -1,6 +1,8 @@
 import 'dart:async';
 import 'package:appsflyer_sdk/appsflyer_sdk.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_dotenv/flutter_dotenv.dart';
+
 import 'home_container.dart';
 
 class MainPage extends StatefulWidget {
@@ -17,7 +19,9 @@ class MainPageState extends State<MainPage> {
   void initState() {
     super.initState();
     final AppsFlyerOptions options = AppsFlyerOptions(
-        afDevKey: "afDevKey", appId: "123456789", showDebug: true);
+        afDevKey: DotEnv().env["DEV_KEY"],
+        appId: DotEnv().env["APP_ID"],
+        showDebug: true);
     _appsflyerSdk = AppsflyerSdk(options);
   }
 
diff --git a/example/pubspec.yaml b/example/pubspec.yaml
@@ -21,6 +21,7 @@ dependencies:
   # The following adds the Cupertino Icons font to your application.
   # Use with the CupertinoIcons class for iOS style icons.
   cupertino_icons: ^0.1.2
+  flutter_dotenv: ^2.1.0
 
 dev_dependencies:
   flutter_test:
@@ -36,7 +37,8 @@ flutter:
   # the material Icons class.
   uses-material-design: true
   # To add assets to your application, add an assets section, like this:
-  # assets:
+  assets:
+    - .env
   #  - images/a_dot_burr.jpeg
   #  - images/a_dot_ham.jpeg
   # An image asset can refer to one or more resolution-specific "variants", see
diff --git a/ios/Classes/AppsflyerSdkPlugin.h b/ios/Classes/AppsflyerSdkPlugin.h
@@ -14,6 +14,8 @@
 #define afEventValues                       @"eventValues"
 #define afConversionData                    @"GCD"
 #define afInviteOneLink                     @"appInviteOneLink"
+#define afDisableCollectASA                 @"disableCollectASA"
+#define afDisableAdvertisingIdentifier      @"disableAdvertisingIdentifier"
 
 // Appsflyer native objects
 #define afOnInstallConversionData       @"onInstallConversionData"
diff --git a/ios/Classes/AppsflyerSdkPlugin.m b/ios/Classes/AppsflyerSdkPlugin.m
@@ -300,12 +300,16 @@ - (void)initSdkWithCall:(FlutterMethodCall*)call result:(FlutterResult)result{
     NSString* devKey = nil;
     NSString* appId = nil;
     NSString* appInviteOneLink = nil;
+    BOOL disableCollectASA = NO;
+    BOOL disableAdvertisingIdentifier = NO;
     NSTimeInterval timeToWaitForATTUserAuthorization = 0;
     BOOL isDebug = NO;
     BOOL isConversionData = NO;
     
     id isDebugValue = nil;
     id isConversionDataValue = nil;
+    id isDisableCollectASA = nil;
+    id isDisableAdvertisingIdentifier = nil;
 
     devKey = call.arguments[afDevKey];
     appId = call.arguments[afAppId];
@@ -330,6 +334,19 @@ - (void)initSdkWithCall:(FlutterMethodCall*)call result:(FlutterResult)result{
         [AppsFlyerLib shared].appInviteOneLinkID = appInviteOneLink;
     }
     
+    isDisableCollectASA = call.arguments[afDisableCollectASA];
+    if ([isDisableCollectASA isKindOfClass:[NSNumber class]]) {
+        // isDebug is a boolean that will come through as an NSNumber
+        disableCollectASA = [(NSNumber*)isDisableCollectASA boolValue];
+    }
+    isDisableAdvertisingIdentifier = call.arguments[afDisableAdvertisingIdentifier];
+    if ([isDisableAdvertisingIdentifier isKindOfClass:[NSNumber class]]) {
+        // isDebug is a boolean that will come through as an NSNumber
+        disableAdvertisingIdentifier = [(NSNumber*)isDisableAdvertisingIdentifier boolValue];
+    }
+    
+    [AppsFlyerLib shared].disableCollectASA = disableCollectASA;
+    [AppsFlyerLib shared].disableAdvertisingIdentifier = disableAdvertisingIdentifier;
     [AppsFlyerLib shared].appleAppID = appId;
     [AppsFlyerLib shared].appsFlyerDevKey = devKey;
     [AppsFlyerLib shared].isDebug = isDebug;
diff --git a/ios/appsflyer_sdk.podspec b/ios/appsflyer_sdk.podspec
@@ -3,7 +3,7 @@
 #
 Pod::Spec.new do |s|
   s.name             = 'appsflyer_sdk'
-  s.version          = '6.0.3'
+  s.version          = '6.0.5'
   s.summary          = 'AppsFlyer Integration for Flutter'
   s.description      = <<-DESC
 AppsFlyer is the market leader in mobile advertising attribution & analytics, helping marketers to pinpoint their targeting, optimize their ad spend and boost their ROI.
@@ -14,15 +14,13 @@ AppsFlyer is the market leader in mobile advertising attribution & analytics, he
   s.source           = { :git => "https://github.com/AppsFlyerSDK/flutter_appsflyer_sdk.git", :tag => s.version.to_s }
 
 
-  s.ios.deployment_target = '8.0'
+  s.ios.deployment_target = '9.0'
   s.requires_arc = true
   s.static_framework = true
   
   s.source_files = 'Classes/**/*'
   s.public_header_files = 'Classes/**/*.h'
   s.dependency 'Flutter'
-  s.ios.dependency 'AppsFlyerFramework', '6.0.3'
+  s.ios.dependency 'AppsFlyerFramework', '6.0.5'
 
-  s.vendored_frameworks = 'AppTrackingTransparency.framework'
-  
 end
diff --git a/lib/src/appsflyer_constants.dart b/lib/src/appsflyer_constants.dart
@@ -22,7 +22,10 @@ class AppsflyerConstants {
   static const String AF_EVENTS_CHANNEL = "af-events";
   static const String AF_METHOD_CHANNEL = "af-api";
 
-  static const AF_VALIDATE_PURCHASE = "validatePurchase";
-
+  static const String AF_VALIDATE_PURCHASE = "validatePurchase";
   static const String APP_INVITE_ONE_LINK = "appInviteOneLink";
+
+  static const String DISABLE_COLLECT_ASA = "disableCollectASA";
+  static const String DISABLE_ADVERTISING_IDENTIFIER =
+      "disableAdvertisingIdentifier";
 }
diff --git a/lib/src/appsflyer_options.dart b/lib/src/appsflyer_options.dart
@@ -6,11 +6,16 @@ class AppsFlyerOptions {
   final String appId;
   final double timeToWaitForATTUserAuthorization;
   final String appInviteOneLink;
+  final bool disableAdvertisingIdentifier;
+  final bool disableCollectASA;
 
-  AppsFlyerOptions(
-      {@required this.afDevKey,
-      this.showDebug = false,
-      this.appId = "",
-      this.timeToWaitForATTUserAuthorization,
-      this.appInviteOneLink});
+  AppsFlyerOptions({
+    @required this.afDevKey,
+    this.showDebug = false,
+    this.appId = "",
+    this.timeToWaitForATTUserAuthorization,
+    this.appInviteOneLink,
+    this.disableAdvertisingIdentifier,
+    this.disableCollectASA,
+  });
 }
diff --git a/lib/src/appsflyer_sdk.dart b/lib/src/appsflyer_sdk.dart
@@ -54,6 +54,16 @@ class AppsflyerSdk {
 
     validatedOptions[AppsflyerConstants.APP_INVITE_ONE_LINK] = appInviteOneLink;
 
+    if (options.disableCollectASA != null) {
+      validatedOptions[AppsflyerConstants.DISABLE_COLLECT_ASA] =
+          options.disableCollectASA;
+    }
+
+    if (options.disableAdvertisingIdentifier != null) {
+      validatedOptions[AppsflyerConstants.DISABLE_ADVERTISING_IDENTIFIER] =
+          options.disableAdvertisingIdentifier;
+    }
+
     if (Platform.isIOS) {
       dynamic appID = options.appId;
       assert(appID != null, "appleAppId is required for iOS apps");
@@ -92,6 +102,16 @@ class AppsflyerSdk {
 
     afOptions[AppsflyerConstants.APP_INVITE_ONE_LINK] = appInviteOneLink;
 
+    if (options[AppsflyerConstants.DISABLE_COLLECT_ASA] != null) {
+      afOptions[AppsflyerConstants.DISABLE_COLLECT_ASA] =
+          options[AppsflyerConstants.DISABLE_COLLECT_ASA];
+    }
+
+    if (options[AppsflyerConstants.DISABLE_ADVERTISING_IDENTIFIER] != null) {
+      afOptions[AppsflyerConstants.DISABLE_ADVERTISING_IDENTIFIER] =
+          options[AppsflyerConstants.DISABLE_ADVERTISING_IDENTIFIER];
+    }
+
     if (Platform.isIOS) {
       if (options[
               AppsflyerConstants.AF_TIME_TO_WAIT_FOR_ATT_USER_AUTHORIZATION] !=
@@ -310,14 +330,14 @@ class AppsflyerSdk {
   }
 
   ///Returns `Stream`. Accessing AppsFlyer purchase validation data
-  Stream<dynamic> validateAndLoginInAppPurchase(
+  Stream<dynamic> validateAndLogInAppPurchase(
       String publicKey,
       String signature,
       String purchaseData,
       String price,
       String currency,
       Map<String, String> additionalParameters) {
-    _methodChannel.invokeMethod("validateAndLoginInAppPurchase", {
+    _methodChannel.invokeMethod("validateAndLogInAppPurchase", {
       'publicKey': publicKey,
       'signature': signature,
       'purchaseData': purchaseData,
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: appsflyer_sdk
 description: A Flutter plugin for AppsFlyer SDK. Supports iOS and Android.
-version: 6.0.3+5
+version: 6.0.5
 homepage: https://github.com/AppsFlyerSDK/flutter_appsflyer_sdk
 
 environment:
diff --git a/test/appsflyer_sdk_test.dart b/test/appsflyer_sdk_test.dart

Original file line number	Diff line number	Diff line change
`@@ -105,3 +105,4 @@ node_modules/`
`105`	`105`
`106`	`106`	`covBadgeGen.js`
`107`	`107`	`coverage/`
	`108`	`+.env`
Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,6 @@ android {`
`35`	`35`	`dependencies {`
`36`	`36`	`implementation fileTree(dir: 'libs', include: ['*.jar'])`
`37`	`37`	`implementation 'androidx.appcompat:appcompat:1.0.0'`
`38`		`- implementation 'com.appsflyer:af-android-sdk:5.4.3'`
`39`		`- implementation 'com.android.installreferrer:installreferrer:1.0'`
	`38`	`+ implementation 'com.appsflyer:af-android-sdk:5.4.5'`
	`39`	`+ implementation 'com.android.installreferrer:installreferrer:2.1'`
`40`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ flutter {`
`57`	`57`	`dependencies {`
`58`	`58`	`testImplementation 'junit:junit:4.12'`
`59`	`59`	`implementation 'com.appsflyer:af-android-sdk:5.4.1'`
`60`		`- implementation 'com.android.installreferrer:installreferrer:1.0'`
	`60`	`+ implementation 'com.android.installreferrer:installreferrer:2.1'`
`61`	`61`	`androidTestImplementation 'androidx.test:runner:1.1.0'`
`62`	`62`	`androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'`
`63`	`63`	`}`