Releases/6.x.x/6.16.x/6.16.2-rc1 into master (#385)

- setConsentData is now deprecated!
- setConsentDataV2 is the new and recommended way to set manual user consent.
- Added getVersionNumber, returns the plugin's version.
- Fixed typos within the code.
- Fixed and updated tests and their frameworks.
- Push notification measurement API's documentation has been updated.
- Closed a few potential memory leaks.
- Update iOS version to 6.16.2
- Update Android version to 6.16.2
- Updated entire example project.

Author: Dani-Koza-AF

.gitignore

@@ -105,6 +105,8 @@ example/windows/*
 
 example/web/*
 
+example/android/app/.cxx
+
 example/\.metadata
 example/analysis_options.yaml
 
@@ -114,9 +116,3 @@ node_modules/
 covBadgeGen.js
 coverage/
 .env
-example/windows/*
-example/macos/*
-example/linux/*
-example/web/*
-example/analysis_options.yaml
-

CHANGELOG.md

@@ -1,4 +1,14 @@
 # Versions
+## 6.16.2
+- setConsentData is now deprecated!
+- setConsentDataV2 is the new and recommended way to set manual user consent.
+- Added getVersionNumber, returns the plugin's version.
+- Fixed typos within the code.
+- Fixed and updated tests and their frameworks.
+- Push notification measurment API's documentation has been updated.
+- Closed a few potential memory leaks.
+- Update iOS version to 6.16.2
+- Update Android version to 6.16.2
 ## 6.15.2
 - Fixed NullPointerException issue on Android that some clients had.
 - Fixed Android MediationNetwork enum issue.

README.md

@@ -12,8 +12,8 @@
 
 ### <a id="plugin-build-for"> This plugin is built for
 
-- Android AppsFlyer SDK **v6.15.2**
-- iOS AppsFlyer SDK **v6.15.3**
+- Android AppsFlyer SDK **v6.16.2**
+- iOS AppsFlyer SDK **v6.16.2**
 
 ## <a id="breaking-changes"> 	❗❗ Breaking changes when updating to v6.x.x❗❗
 

android/build.gradle

@@ -14,10 +14,12 @@ rootProject.allprojects {
     }
 }
 apply plugin: 'com.android.library'
+apply plugin: 'org.jetbrains.kotlin.android'
+
 android {
     defaultConfig {
-        minSdkVersion 16
-        compileSdk 31
+        minSdkVersion 19
+        compileSdk 35
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
         multiDexEnabled true
@@ -26,11 +28,21 @@ android {
         disable 'InvalidPackage'
     }
     namespace 'com.appsflyer.appsflyersdk'
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
+    }
+
+    kotlinOptions {
+        jvmTarget = '17'
+    }
+
 }
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation 'androidx.appcompat:appcompat:1.0.0'
-    implementation 'com.appsflyer:af-android-sdk:6.15.2'
+    implementation 'com.appsflyer:af-android-sdk:6.16.2'
     implementation 'com.android.installreferrer:installreferrer:2.1'
 }

android/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

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

@@ -1,7 +1,7 @@
 package com.appsflyer.appsflyersdk;
 
 public final class AppsFlyerConstants {
-    final static String PLUGIN_VERSION = "6.15.1";
+    final static String PLUGIN_VERSION = "6.16.2";
     final static String AF_APP_INVITE_ONE_LINK = "appInviteOneLink";
     final static String AF_HOST_PREFIX = "hostPrefix";
     final static String AF_HOST_NAME = "hostName";

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

@@ -52,6 +52,8 @@
 import static com.appsflyer.appsflyersdk.AppsFlyerConstants.AF_PLUGIN_TAG;
 import static com.appsflyer.appsflyersdk.AppsFlyerConstants.AF_SUCCESS;
 
+import androidx.annotation.NonNull;
+
 /**
  * AppsflyerSdkPlugin
  */
@@ -72,7 +74,6 @@ public class AppsflyerSdkPlugin implements MethodCallHandler, FlutterPlugin, Act
     //private FlutterView mFlutterView;
     private Context mContext;
     private Application mApplication;
-    private Intent mIntent;
     private MethodChannel mMethodChannel;
     private MethodChannel mCallbackChannel;
     private Activity activity;
@@ -175,7 +176,6 @@ private void onAttachedToEngine(Context applicationContext, BinaryMessenger mess
         mMethodChannel.setMethodCallHandler(this);
         mCallbackChannel = new MethodChannel(messenger, AppsFlyerConstants.AF_CALLBACK_CHANNEL);
         mCallbackChannel.setMethodCallHandler(callbacksHandler);
-
     }
 
 
@@ -205,6 +205,7 @@ private void startListening(Object arguments, Result rawResult) {
     public void onMethodCall(MethodCall call, Result result) {
         if (activity == null) {
             Log.d(AF_PLUGIN_TAG, LogMessages.ACTIVITY_NOT_ATTACHED_TO_ENGINE);
+            result.error("NO_ACTIVITY", "The current activity is null", null);
             return;
         }
         final String method = call.method;
@@ -233,6 +234,9 @@ public void onMethodCall(MethodCall call, Result result) {
             case "setConsentData":
                 setConsentData(call, result);
                 break;
+            case "setConsentDataV2":
+                setConsentDataV2(call, result);
+                break;    
             case "setIsUpdate":
                 setIsUpdate(call, result);
                 break;
@@ -424,6 +428,11 @@ private void startSDK(MethodCall call, final Result result) {
         result.success(null);
     }
 
+    /**
+     * Sets the user consent data for tracking.
+     * @deprecated Use {@link #setConsentDataV2(MethodCall, Result)} instead.
+     */
+    @Deprecated
     public void setConsentData(MethodCall call, Result result) {
         Map<String, Object> arguments = (Map<String, Object>) call.arguments;
         Map<String, Object> consentDict = (Map<String, Object>) arguments.get("consentData");
@@ -445,6 +454,35 @@ public void setConsentData(MethodCall call, Result result) {
         result.success(null);
     }
 
+    /**
+     * Sets the user consent data for tracking with flexible parameters.
+     */
+    public void setConsentDataV2(MethodCall call, Result result) {
+        try {
+            AppsFlyerConsent consent = getAppsFlyerConsentFromCall(call);
+            AppsFlyerLib.getInstance().setConsentData(consent);
+            result.success(null);
+        } catch (Exception e) {
+            Log.e(AF_PLUGIN_TAG, LogMessages.ERROR_WHILE_SETTING_CONSENT + e.getMessage(), e);
+            result.error("CONSENT_ERROR", LogMessages.ERROR_WHILE_SETTING_CONSENT + e.getMessage(), null);
+        }
+    }
+
+    @NonNull
+    @SuppressWarnings("unchecked")
+    private AppsFlyerConsent getAppsFlyerConsentFromCall(MethodCall call) {
+        Map<String, Object> args = (Map<String, Object>) call.arguments;
+
+        // Extract nullable Boolean arguments
+        Boolean isUserSubjectToGDPR = (Boolean) args.get("isUserSubjectToGDPR");
+        Boolean consentForDataUsage = (Boolean) args.get("consentForDataUsage");
+        Boolean consentForAdsPersonalization = (Boolean) args.get("consentForAdsPersonalization");
+        Boolean hasConsentForAdStorage = (Boolean) args.get("hasConsentForAdStorage");
+
+        // Create and return AppsFlyerConsent object with the given parameters
+        return new AppsFlyerConsent(isUserSubjectToGDPR, consentForDataUsage, consentForAdsPersonalization, hasConsentForAdStorage);
+    }
+
     private void enableTCFDataCollection(MethodCall call, Result result) {
         boolean shouldCollect = (boolean) call.argument("shouldCollect");
         AppsFlyerLib.getInstance().enableTCFDataCollection(shouldCollect);
@@ -1075,31 +1113,33 @@ public void onDetachedFromEngine(FlutterPluginBinding binding) {
         mMethodChannel = null;
         mEventChannel.setStreamHandler(null);
         mEventChannel = null;
+        mContext = null;
+        mApplication = null;
     }
 
     @Override
     public void onAttachedToActivity(ActivityPluginBinding binding) {
         activity = binding.getActivity();
-        mIntent = binding.getActivity().getIntent();
         mApplication = binding.getActivity().getApplication();
         binding.addOnNewIntentListener(onNewIntentListener);
     }
 
     @Override
     public void onDetachedFromActivityForConfigChanges() {
-
+        this.activity = null;
     }
 
     @Override
     public void onReattachedToActivityForConfigChanges(ActivityPluginBinding binding) {
         sendCachedCallbacksToDart();
         binding.addOnNewIntentListener(onNewIntentListener);
+        activity = binding.getActivity();
     }
 
     @Override
     public void onDetachedFromActivity() {
         activity = null;
         saveCallbacks = true;
+        AppsFlyerLib.getInstance().unregisterConversionListener();
     }
-
 }

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

@@ -9,4 +9,5 @@ private LogMessages() {
 
     public static final String METHOD_CHANNEL_IS_NULL = "mMethodChannel is null, cannot invoke the callback";
     public static final String ACTIVITY_NOT_ATTACHED_TO_ENGINE = "Activity isn't attached to the flutter engine";
+    public static final String ERROR_WHILE_SETTING_CONSENT = "Error while setting consent data: ";
 }