Merge pull request #199 from AppsFlyerSDK/RD-76942/updateTo6.5.2Beta

Rd 76942/update to6.5.2 beta

Author: GM-appsflyer

README.md

@@ -159,15 +159,12 @@ appsflyerSdk.initSdk(
 
 2. Add the ATT pop-up for IDFA collection so your `AppDelegate.m` will look like this:
 ```
--(BOOL)application:(UIApplication*)application didFinishLaunchingWithOptions:(NSDictionary*)launchOptions
-{
-    [GeneratedPluginRegistrant registerWithRegistry:self];
+- (void)applicationDidBecomeActive:(nonnull UIApplication *)application {
     if (@available(iOS 14, *)) {
         [ATTrackingManager requestTrackingAuthorizationWithCompletionHandler:^(ATTrackingManagerAuthorizationStatus status) {
-            //If you want to do something with the pop-up
+            // native code here
         }];
     }
-    return [super application:application didFinishLaunchingWithOptions:launchOptions];
 }
 ```
 

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:6.4.3'
+    implementation 'com.appsflyer:af-android-sdk:6.5.2'
     implementation 'com.android.installreferrer:installreferrer:2.1'
 }

android/src/main/java/com/appsflyer/appsflyersdk/AppsflyerSdkPlugin.java

@@ -313,7 +313,7 @@ private void setSharingFilterForPartners(MethodCall call, Result result) {
     }
 
     private void setDisableAdvertisingIdentifiers(MethodCall call, Result result) {
-        isSetDisableAdvertisingIdentifiersEnable = (boolean) call.argument("isSetDisableAdvertisingIdentifiersEnable");
+        isSetDisableAdvertisingIdentifiersEnable = (boolean) call.arguments;
         if (isSetDisableAdvertisingIdentifiersEnable) {
             AppsFlyerLib.getInstance().setDisableAdvertisingIdentifiers(true);
         } else {

doc/API.md

@@ -39,6 +39,8 @@
 - [setCurrentDeviceLanguage](#setCurrentDeviceLanguage)
 - [setSharingFilterForPartners](#setSharingFilterForPartners)
 - [setOneLinkCustomDomain](#setOneLinkCustomDomain)
+- [setDisableAdvertisingIdentifiers](#setDisableAdvertisingIdentifiers)
+
 ---
 
 ##### <a id="appsflyer-options"> **`AppsflyerSdk(Map options)`** 
@@ -516,4 +518,13 @@ _Example:_
 ```dart
 appsFlyerSdk.setOneLinkCustomDomain(["promotion.greatapp.com","click.greatapp.com","deals.greatapp.com"]);
 ```
+---
+**<a id="setDisableAdvertisingIdentifiers"> `void setDisableAdvertisingIdentifiers(bool isSetDisableAdvertisingIdentifiersEnable)`**
+
+Manually enable or disable Advertiser ID in Android & IDFA in iOS
+
+_Example:_
+```dart
+widget.appsFlyerSdk.setDisableAdvertisingIdentifiers(true);
+```
 ---

doc/Guides.md

@@ -435,19 +435,15 @@ Or
 
 - Add the ATT pop-up for IDFA collection so your `AppDelegate.m` will look like this:
 
-	
-		```
-		-(BOOL)application:(UIApplication*)application didFinishLaunchingWithOptions:(NSDictionary*)launchOptions
-		{
-		    [GeneratedPluginRegistrant registerWithRegistry:self];
-		    if (@available(iOS 14, *)) {
-			[ATTrackingManager requestTrackingAuthorizationWithCompletionHandler:^(ATTrackingManagerAuthorizationStatus status) {
-			    //If you want to do something with the pop-up
-			}];
-		    }
-		    return [super application:application didFinishLaunchingWithOptions:launchOptions];
-		}
-		```
+```
+- (void)applicationDidBecomeActive:(nonnull UIApplication *)application {
+    if (@available(iOS 14, *)) {
+        [ATTrackingManager requestTrackingAuthorizationWithCompletionHandler:^(ATTrackingManagerAuthorizationStatus status) {
+            // native code here
+        }];
+    }
+}
+```
 
 	
 

example/android/.project

@@ -14,4 +14,15 @@
 	<natures>
 		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>1643725221956</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
 </projectDescription>

example/android/app/.project

@@ -20,4 +20,15 @@
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>1643725221965</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
 </projectDescription>

example/ios/Runner/AppDelegate.m

@@ -7,12 +7,15 @@ @implementation AppDelegate
 
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
     [GeneratedPluginRegistrant registerWithRegistry:self];
-     if (@available(iOS 14, *)) {
+    return [super application:application didFinishLaunchingWithOptions:launchOptions];
+}
+
+- (void)applicationDidBecomeActive:(nonnull UIApplication *)application {
+    if (@available(iOS 14, *)) {
         [ATTrackingManager requestTrackingAuthorizationWithCompletionHandler:^(ATTrackingManagerAuthorizationStatus status) {
-            //If you want to do something with the pop-up
+            // native code here
         }];
     }
-    return [super application:application didFinishLaunchingWithOptions:launchOptions];
 }
 
 // Reports app open from a Universal Link for iOS 9 or above

example/lib/main_page.dart

@@ -24,7 +24,7 @@ class MainPageState extends State<MainPage> {
     afDevKey: DotEnv().env["DEV_KEY"],
     appId: DotEnv().env["APP_ID"],
     showDebug: true,
-    disableAdvertisingIdentifier: true
+    timeToWaitForATTUserAuthorization: 15
     ); 
     _appsflyerSdk = AppsflyerSdk(options);
     _appsflyerSdk.onAppOpenAttribution((res) {
@@ -60,6 +60,7 @@ class MainPageState extends State<MainPage> {
         _deepLinkData = dp.toJson();
       });
     });
+    
   }
 
   @override
@@ -100,7 +101,6 @@ class MainPageState extends State<MainPage> {
   }
 
   Future<bool> logEvent(String eventName, Map eventValues) {
-    _appsflyerSdk.disableSKAdNetwork(false);
     return _appsflyerSdk.logEvent(eventName, eventValues);
   }
 

ios/Classes/AppsflyerSdkPlugin.m

@@ -131,12 +131,23 @@ - (void)handleMethodCall:(FlutterMethodCall*)call result:(FlutterResult)result {
         [self setCurrentDeviceLanguage:call result:result];
     }else if([@"setSharingFilterForPartners" isEqualToString:call.method]){
         [self setSharingFilterForPartners:call result:result];
+    }else if([@"setDisableAdvertisingIdentifiers" isEqualToString:call.method]){
+        [self setDisableAdvertisingIdentifiers:call result:result];
     }
     else{
         result(FlutterMethodNotImplemented);
     }
 }
 
+- (void)setDisableAdvertisingIdentifiers:(FlutterMethodCall*)call result:(FlutterResult)result{
+    id isAdvertiserIdEnabled = call.arguments;
+    if ([isAdvertiserIdEnabled isKindOfClass:[NSNumber class]]) {
+        BOOL _isAdvertiserIdEnabled = [isAdvertiserIdEnabled boolValue];
+        [[AppsFlyerLib shared] setDisableAdvertisingIdentifier: _isAdvertiserIdEnabled];
+    }
+    result(nil);
+}
+
 - (void)setSharingFilterForPartners:(FlutterMethodCall*)call result:(FlutterResult)result{
     NSArray* partners = call.arguments;
     [[AppsFlyerLib shared] setSharingFilterForPartners: partners];