Update to 6.16.2 & AppsFlyerConsent update

Update iOS to 6.16.2
Update Android to 6.16.2
Update AppsflyerConsent object and methods + deprecation of old methods
Fixing mediation network bug typo

Author: al-af

Docs/RN_Installation.md

@@ -137,45 +137,6 @@ So `getPackages()` should look like:
     }
 ```
 
-## Android Build Error Due to AGP Version
-
-If you encounter the following error while building your project:
-```
-Execution failed for task ':app:mergeExtDexDebug'.
-> Could not resolve all files for configuration ':app:debugRuntimeClasspath'.
-   > Failed to transform af-android-sdk-6.16.0.aar (com.appsflyer:af-android-sdk:6.16.0) to match attributes {artifactType=android-dex, asm-transformed-variant=NONE, dexing-enable-desugaring=true, dexing-is-debuggable=true, dexing-min-sdk=21, org.gradle.category=library, org.gradle.dependency.bundling=external, org.gradle.libraryelements=aar, org.gradle.status=release, org.gradle.usage=java-runtime}.
-      > Execution failed for DexingWithClasspathTransform: /Users/amit.levy/.gradle/caches/transforms-3/fb46dcab411d99e4e97f01029413cab1/transformed/jetified-af-android-sdk-6.16.0-runtime.jar.
-         > Error while dexing.
-```
-
-This error occurs if you are using Android Gradle Plugin (AGP) below 8.2.0 due to a known bug in R8.
-Google has already resolved this issue
-[see Google Issue Tracker](https://issuetracker.google.com/issues/290412574?pli=1).
-
-
-### Solutions
-
-To fix this issue, you have two options:
-1. Upgrade AGP to 8.2.0+ (Recommended):
-  <br/>Updating AGP to 8.2.0 or later ensures compatibility with the latest R8 version.<br/>Sync and rebuild your project
-
-2. Manually Override the R8 Version
-<br/>If upgrading AGP is not an option, you can manually set an external newer R8 version to override the bundled one.
-<br/> Open android/build.gradle and add this inside the buildscript {} block then sync and rebuild your project:
-```
-buildscript {
-    repositories {
-        mavenCentral()
-        maven {
-            url = uri("https://storage.googleapis.com/r8-releases/raw")
-        }
-    }
-    dependencies {
-        classpath("com.android.tools:r8:8.2.26")
-    }
-}
-```
-
 ## Add strict-mode for App-kids
 Starting from version **6.1.10** iOS SDK comes in two variants: **Strict** mode and **Regular** mode. Please read more [here](https://dev.appsflyer.com/hc/docs/install-ios-sdk#strict-mode-sdk)
 

README.md

@@ -17,7 +17,7 @@
 - Tested with React-Native **v0.62.0** (older versions might be supported)
 
 ## <a id="breaking-changes"> ❗❗ Breaking changes when updating to v6.x.x❗❗
-- Starting from version `6.16.0`, Android minimum SDK version is 21. 
+- Starting from version `6.16.2`, Android minimum SDK version is 21. 
 <br/>Potential Build Issues: If you are using Android Gradle Plugin (AGP) below 8.2.0, you may encounter build errors on Android.
 <br/>To resolve this, refer to the [Android Build Error Due to AGP Version](./Docs/RN_Installation.md#android-build-error-due-to-agp-version).
 

android/build.gradle

@@ -55,5 +55,5 @@ repositories {
 dependencies {
     implementation "com.facebook.react:react-native:${safeExtGet('reactNativeVersion', '+')}"
     implementation "com.android.installreferrer:installreferrer:${safeExtGet('installReferrerVersion', '2.1')}"
-    api "com.appsflyer:af-android-sdk:${safeExtGet('appsflyerVersion', '6.16.0')}"
+    api "com.appsflyer:af-android-sdk:${safeExtGet('appsflyerVersion', '6.16.2')}"
 }

android/src/main/java/com/appsflyer/reactnative/RNAppsFlyerConstants.java

@@ -6,7 +6,7 @@
 
 public class RNAppsFlyerConstants {
 
-    final static String PLUGIN_VERSION = "6.16.0";
+    final static String PLUGIN_VERSION = "6.16.2";
     final static String NO_DEVKEY_FOUND = "No 'devKey' found or its empty";
     final static String UNKNOWN_ERROR = "AF Unknown Error";
     final static String SUCCESS = "Success";

android/src/main/java/com/appsflyer/reactnative/RNAppsFlyerModule.java

@@ -8,6 +8,7 @@
 import android.os.Bundle;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import android.util.Log;
 
@@ -876,17 +877,41 @@ public void enableTCFDataCollection(Boolean enabled) {
     }
 
     @ReactMethod
-    public void setConsentData(ReadableMap consentData) {
+    public void setConsentData(@Nullable ReadableMap consentData) {
+        if (consentData == null) {
+            Log.e("AppsFlyer", "consentData is null");
+            return;
+        }
+
         JSONObject JSONConsentData = RNUtil.readableMapToJson(consentData);
-        boolean isUserSubjectToGDPR = JSONConsentData.optBoolean("isUserSubjectToGDPR");
-        boolean hasConsentForDataUsage = JSONConsentData.optBoolean("hasConsentForDataUsage");
-        boolean hasConsentForAdsPersonalization = JSONConsentData.optBoolean("hasConsentForAdsPersonalization");
-        AppsFlyerConsent consentObject;
-        if (isUserSubjectToGDPR) {
-            consentObject = AppsFlyerConsent.forGDPRUser(hasConsentForDataUsage, hasConsentForAdsPersonalization);
-        } else {
-            consentObject = AppsFlyerConsent.forNonGDPRUser();
+        if (JSONConsentData == null) {
+            Log.e("AppsFlyer", "Failed to convert consentData to JSON");
+            return;
         }
+
+        Boolean isUserSubjectToGDPR = JSONConsentData.has("isUserSubjectToGDPR") && !JSONConsentData.isNull("isUserSubjectToGDPR")
+                ? JSONConsentData.optBoolean("isUserSubjectToGDPR")
+                : null;
+
+        Boolean hasConsentForDataUsage = JSONConsentData.has("hasConsentForDataUsage") && !JSONConsentData.isNull("hasConsentForDataUsage")
+                ? JSONConsentData.optBoolean("hasConsentForDataUsage")
+                : null;
+
+        Boolean hasConsentForAdsPersonalization = JSONConsentData.has("hasConsentForAdsPersonalization") && !JSONConsentData.isNull("hasConsentForAdsPersonalization")
+                ? JSONConsentData.optBoolean("hasConsentForAdsPersonalization")
+                : null;
+
+        Boolean hasConsentForAdStorage = JSONConsentData.has("hasConsentForAdStorage") && !JSONConsentData.isNull("hasConsentForAdStorage")
+                ? JSONConsentData.optBoolean("hasConsentForAdStorage")
+                : null;
+
+        AppsFlyerConsent consentObject = new AppsFlyerConsent(
+                isUserSubjectToGDPR,
+                hasConsentForDataUsage,
+                hasConsentForAdsPersonalization,
+                hasConsentForAdStorage
+        );
+
         AppsFlyerLib.getInstance().setConsentData(consentObject);
     }
 

index.d.ts

@@ -114,11 +114,44 @@ declare module "react-native-appsflyer" {
         brandDomain?: string;
     }
 
-    export const AppsFlyerConsent: {
-        forGDPRUser: (hasConsentForDataUsage: boolean, hasConsentForAdsPersonalization: boolean) => AppsFlyerConsentType;
-        forNonGDPRUser: () => AppsFlyerConsentType;
+    export class AppsFlyerConsent {
+        isUserSubjectToGDPR?: boolean;
+        hasConsentForDataUsage?: boolean;
+        hasConsentForAdsPersonalization?: boolean;
+        hasConsentForAdStorage?: boolean;
+
+        /**
+         * Creates an instance of AppsFlyerConsent.
+         * @param isUserSubjectToGDPR - Indicates whether GDPR applies to the user.
+         * @param hasConsentForDataUsage - Indicates whether the user has consented to data usage.
+         * @param hasConsentForAdsPersonalization - Indicates whether the user has consented to ads personalization.
+         * @param hasConsentForAdStorage - Indicates whether the user has consented to ad storage.
+         */
+        constructor(
+            isUserSubjectToGDPR?: boolean,
+            hasConsentForDataUsage?: boolean,
+            hasConsentForAdsPersonalization?: boolean,
+            hasConsentForAdStorage?: boolean
+        ) {}
+
+        /**
+         * @deprecated since version 6.16.2. Use the AppsFlyerConsent constructor instead for more flexibility with optional booleans.
+         */
+        static forGDPRUser(hasConsentForDataUsage: boolean, hasConsentForAdsPersonalization: boolean): AppsFlyerConsent {
+            return new AppsFlyerConsent(true, hasConsentForDataUsage, hasConsentForAdsPersonalization);
+        }
+
+        /**
+         * @deprecated since version 6.16.2. Use the AppsFlyerConsent constructor instead for more flexibility with optional booleans.
+         */
+        static forNonGDPRUser(): AppsFlyerConsent {
+            return new AppsFlyerConsent(false);
+        }
     }
 
+    /**
+     * @deprecated since version 6.16.2. Use the AppsFlyerConsent class instead for a more integrated approach to consent management.
+     */
     export interface AppsFlyerConsentType {
         isUserSubjectToGDPR: boolean;
         hasConsentForDataUsage?: boolean;
@@ -190,7 +223,7 @@ declare module "react-native-appsflyer" {
         appendParametersToDeepLinkingURL(contains: string, parameters: object): void
         startSdk(): void
         enableTCFDataCollection(enabled: boolean): void
-        setConsentData(consentData: AppsFlyerConsentType): void
+        setConsentData(consentData: AppsFlyerConsent): void;
         logAdRevenue(adRevenueData: AFAdRevenueData) : void
         /**
          * For iOS Only

index.js

@@ -672,25 +672,45 @@ function AFParseJSONException(_message, _data) {
 }
 
 // Consent object
-export const AppsFlyerConsent = (function () {
-    // Private constructor
-    function AppsFlyerConsent(isUserSubjectToGDPR, hasConsentForDataUsage, hasConsentForAdsPersonalization) {
+export class AppsFlyerConsent {
+    /**
+     * Creates an instance of AppsFlyerConsent.
+     * @param {boolean} [isUserSubjectToGDPR] - Indicates whether GDPR applies to the user.
+     * @param {boolean} [hasConsentForDataUsage] - Indicates whether the user has consented to data usage.
+     * @param {boolean} [hasConsentForAdsPersonalization] - Indicates whether the user has consented to ads personalization.
+     * @param {boolean} [hasConsentForAdStorage] - Indicates whether the user has consented to ad storage.
+     */
+    constructor(
+        isUserSubjectToGDPR,
+        hasConsentForDataUsage,
+        hasConsentForAdsPersonalization,
+        hasConsentForAdStorage
+    ) {
         this.isUserSubjectToGDPR = isUserSubjectToGDPR;
         this.hasConsentForDataUsage = hasConsentForDataUsage;
         this.hasConsentForAdsPersonalization = hasConsentForAdsPersonalization;
+        this.hasConsentForAdStorage = hasConsentForAdStorage;
     }
 
-    return {
-        // Factory method for GDPR user
-        forGDPRUser: function(hasConsentForDataUsage, hasConsentForAdsPersonalization) {
-            return new AppsFlyerConsent(true, hasConsentForDataUsage, hasConsentForAdsPersonalization);
-        },
-
-        // Factory method for non GDPR user
-        forNonGDPRUser: function() {
-            return new AppsFlyerConsent(false, null, null);
-        }
-    };
-})();
+    /**
+     * @deprecated since version 6.16.2. Use the AppsFlyerConsent constructor instead for more flexibility with optional booleans.
+     */
+    static forGDPRUser(hasConsentForDataUsage, hasConsentForAdsPersonalization) {
+        console.warn(
+            'AppsFlyerConsent.forGDPRUser is deprecated since version 6.16.2. Use the AppsFlyerConsent constructor instead for more flexibility with optional booleans.'
+        );
+        return new AppsFlyerConsent(true, hasConsentForDataUsage, hasConsentForAdsPersonalization);
+    }
+
+    /**
+     * @deprecated since version 6.16.2. Use the AppsFlyerConsent constructor instead for more flexibility with optional booleans.
+     */
+    static forNonGDPRUser() {
+        console.warn(
+            'AppsFlyerConsent.forNonGDPRUser is deprecated since version 6.16.2. Use the AppsFlyerConsent constructor instead for more flexibility with optional booleans.'
+        );
+        return new AppsFlyerConsent(false);
+    }
+}
 
 export default appsFlyer;

ios/RNAppsFlyer.h

@@ -22,7 +22,7 @@
 @end
 
 
-static NSString *const kAppsFlyerPluginVersion      = @"6.16.0";
+static NSString *const kAppsFlyerPluginVersion      = @"6.16.2";
 static NSString *const NO_DEVKEY_FOUND              = @"No 'devKey' found or its empty";
 static NSString *const NO_APPID_FOUND               = @"No 'appId' found or its empty";
 static NSString *const NO_EVENT_NAME_FOUND          = @"No 'eventName' found or its empty";

ios/RNAppsFlyer.m

@@ -640,20 +640,36 @@ - (BOOL)isExpoApp {
     [[AppsFlyerLib shared] enableTCFDataCollection:enabled];
 }
 
-RCT_EXPORT_METHOD(setConsentData:(NSDictionary *)consentDictionary) {
-    if (![consentDictionary isKindOfClass:[NSNull null]]) {
-        BOOL isUserSubjectToGDPR = [consentDictionary[@"isUserSubjectToGDPR"] boolValue];
+RCT_EXPORT_METHOD(setConsentData:(nullable NSDictionary *)consentDictionary) {
+    if (consentDictionary && [consentDictionary isKindOfClass:[NSDictionary class]]) {
+        NSNumber *isUserSubjectToGDPR = consentDictionary[@"isUserSubjectToGDPR"];
+        if ([isUserSubjectToGDPR isKindOfClass:[NSNull class]]) {
+            isUserSubjectToGDPR = nil;
+        }
 
-        AppsFlyerConsent *consentData;
-        if (isUserSubjectToGDPR){
-            BOOL hasConsentForDataUsage = [consentDictionary[@"hasConsentForDataUsage"] boolValue];
-            BOOL hasConsentForAdsPersonalization = [consentDictionary[@"hasConsentForAdsPersonalization"] boolValue];
-            consentData = [[AppsFlyerConsent alloc] initForGDPRUserWithHasConsentForDataUsage:hasConsentForDataUsage hasConsentForAdsPersonalization:hasConsentForAdsPersonalization];
-        } else {
-            consentData = [[AppsFlyerConsent alloc] initNonGDPRUser];
+        NSNumber *hasConsentForDataUsage = consentDictionary[@"hasConsentForDataUsage"];
+        if ([hasConsentForDataUsage isKindOfClass:[NSNull class]]) {
+            hasConsentForDataUsage = nil;
         }
-         
+        
+        NSNumber *hasConsentForAdsPersonalization = consentDictionary[@"hasConsentForAdsPersonalization"];
+        if ([hasConsentForAdsPersonalization isKindOfClass:[NSNull class]]) {
+            hasConsentForAdsPersonalization = nil;
+        }
+        
+        NSNumber *hasConsentForAdStorage = consentDictionary[@"hasConsentForAdStorage"];
+        if ([hasConsentForAdStorage isKindOfClass:[NSNull class]]) {
+            hasConsentForAdStorage = nil;
+        }
+        
+        AppsFlyerConsent *consentData = [[AppsFlyerConsent alloc] initWithIsUserSubjectToGDPR:isUserSubjectToGDPR
+                                                                       hasConsentForDataUsage:hasConsentForDataUsage
+                                                             hasConsentForAdsPersonalization:hasConsentForAdsPersonalization
+                                                                       hasConsentForAdStorage:hasConsentForAdStorage];
+        
         [[AppsFlyerLib shared] setConsentData:consentData];
+    } else {
+        NSLog(@"Invalid consentDictionary provided: %@", consentDictionary);
     }
 }
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-appsflyer",
-  "version": "6.16.0",
+  "version": "6.16.2",
   "description": "React Native Appsflyer plugin",
   "main": "index.js",
   "types": "index.d.ts",