Merge pull request #39 from AppsFlyerSDK/dev/DELIVERY-54544/6.13.0-pl…

…ugin-update

6.13.0 Plugin Update. Added DMA Feature

AppsFlyerSDK/AppsFlyerSDK.uplugin

@@ -1,7 +1,7 @@
 {
 	"FileVersion": 3,
 	"Version": 2,
-	"VersionName": "6.12.2",
+	"VersionName": "6.13.0",
 	"FriendlyName": "AppsFlyerSDK",
 	"Description": "UE4/UE5 AppsFlyer Plugin",
 	"Category": "Misc",

AppsFlyerSDK/Source/AppsFlyerSDK/AppsFlyer_UPL_Android.xml

@@ -6,7 +6,7 @@
             }
             dependencies {
                 implementation 'com.android.installreferrer:installreferrer:2.1'
-                implementation 'com.appsflyer:af-android-sdk:6.12.2'
+                implementation 'com.appsflyer:af-android-sdk:6.13.0'
             }
             android {
                 compileOptions {
@@ -77,15 +77,27 @@
 
             public void afSetPluginInfo(String pluginVersion, String engineVersion) {
 
-
                 Map<String, String> additionalData = new HashMap<String,String>();
                 additionalData.put("engine_version", engineVersion);
 
                 PluginInfo pluginInfo = new PluginInfo(Plugin.UNREAL, pluginVersion, additionalData);
                 AppsFlyerLib.getInstance().setPluginInfo(pluginInfo);   
-
             }
 
+            public void afEnableTCFDataCollection(boolean isTCFDataCollectionEnabled) {
+                AppsFlyerLib.getInstance().enableTCFDataCollection(isTCFDataCollectionEnabled);
+            }
+
+            public void afSetConsentData(boolean isGDPR, boolean hasConsentForDataUsage, boolean hasConsentForAdsPersonalization) {
+                AppsFlyerConsent consent;
+                if (isGDPR == true) {
+                    consent = AppsFlyerConsent.forGDPRUser(hasConsentForDataUsage, hasConsentForAdsPersonalization);
+                } else {
+                    consent = AppsFlyerConsent.forNonGDPRUser();
+                }
+
+                AppsFlyerLib.getInstance().setConsentData(consent);
+            }
         </insert>
     </gameActivityClassAdditions>
 </root>

AppsFlyerSDK/Source/AppsFlyerSDK/Private/AppsFlyerSDKBlueprint.cpp

@@ -13,6 +13,7 @@
 // Core
 #include "Misc/EngineVersion.h"
 
+
 #if PLATFORM_ANDROID
 #include "Android/AndroidJNI.h"
 #include "Android/AndroidApplication.h"
@@ -150,6 +151,8 @@ void UAppsFlyerSDKBlueprint::configure()
     const UAppsFlyerSDKSettings *defaultSettings = GetDefault<UAppsFlyerSDKSettings>();
     const bool isDebug = defaultSettings->bIsDebug; 
     const bool isAutoStart = defaultSettings->bEnableAutoStart; 
+    const bool isTCFDataCollectionEnabled = defaultSettings->bEnableTCFDataCollection;   
+
 #if PLATFORM_ANDROID
     JNIEnv* env = FAndroidApplication::GetJavaEnv();
 
@@ -168,6 +171,13 @@ void UAppsFlyerSDKBlueprint::configure()
         FJavaWrapper::CallVoidMethod(env, FJavaWrapper::GameActivityThis, appsflyer, key, isDebug);
     }
 
+    if (isTCFDataCollectionEnabled)
+    {
+        jmethodID UPLMethod = FJavaWrapper::FindMethod(env, FJavaWrapper::GameActivityClassID, "afEnableTCFDataCollection", "(Z)V", false);
+        FJavaWrapper::CallVoidMethod(env, FJavaWrapper::GameActivityThis, UPLMethod, true);
+    }
+
+
 #elif PLATFORM_IOS
     dispatch_async(dispatch_get_main_queue(), ^ {
         if ((!defaultSettings->appsFlyerDevKeyIOS.IsEmpty() || !defaultSettings->appsFlyerDevKey.IsEmpty()) && !defaultSettings->appleAppID.IsEmpty()) {
@@ -189,6 +199,10 @@ void UAppsFlyerSDKBlueprint::configure()
                 [AppsFlyerLib shared].currencyCode = currencyCode;   
             }
 
+            if (isTCFDataCollectionEnabled) {
+                [[AppsFlyerLib shared] enableTCFDataCollection:YES];
+            }
+
             FIOSCoreDelegates::OnOpenURL.AddStatic(&OnOpenURL);
             UE4AFSDKDelegate *delegate = [[UE4AFSDKDelegate alloc] init];
             delegate.onConversionDataSuccess = onConversionDataSuccess;
@@ -389,3 +403,32 @@ void UAppsFlyerSDKBlueprint::setAdditionalData(TMap <FString, FString> customDat
     return;
 #endif
 }
+
+void UAppsFlyerSDKBlueprint::SetConsentForNonGDPRUser() 
+{
+#if PLATFORM_ANDROID
+    JNIEnv* env = FAndroidApplication::GetJavaEnv();
+    jmethodID UPLMethod1 = FJavaWrapper::FindMethod(env, FJavaWrapper::GameActivityClassID, "afSetConsentData", "(ZZZ)V", false);
+    FJavaWrapper::CallVoidMethod(env, FJavaWrapper::GameActivityThis, UPLMethod1, false, false, false);
+#elif PLATFORM_IOS    
+    AppsFlyerConsent *consent = [[AppsFlyerConsent alloc] initNonGDPRUser];
+    [[AppsFlyerLib shared] setConsentData:consent];
+#else
+    return;
+#endif
+}
+
+void UAppsFlyerSDKBlueprint::SetConsentForGDPRUser(bool hasConsentForDataUsage, bool hasConsentForAdsPersonalization)
+{
+#if PLATFORM_ANDROID
+    JNIEnv* env = FAndroidApplication::GetJavaEnv(); 
+    jmethodID UPLMethod = FJavaWrapper::FindMethod(env, FJavaWrapper::GameActivityClassID, "afSetConsentData", "(ZZZ)V", false);
+    FJavaWrapper::CallVoidMethod(env, FJavaWrapper::GameActivityThis, UPLMethod, true, hasConsentForDataUsage, hasConsentForAdsPersonalization);
+#elif PLATFORM_IOS
+    AppsFlyerConsent *consent = [[AppsFlyerConsent alloc] initForGDPRUserWithHasConsentForDataUsage:hasConsentForDataUsage
+                                                                    hasConsentForAdsPersonalization:hasConsentForAdsPersonalization];
+    [[AppsFlyerLib shared] setConsentData:consent];
+#else
+    return;
+#endif
+}

AppsFlyerSDK/Source/AppsFlyerSDK/Private/AppsFlyerSDKSettings.cpp

@@ -13,5 +13,6 @@ UAppsFlyerSDKSettings::UAppsFlyerSDKSettings(const FObjectInitializer& ObjectIni
     , currencyCode("")
     , bDisableSKAdNetwork(false)
     , bEnableAutoStart(true)
+    , bEnableTCFDataCollection(false)
 {
 }

AppsFlyerSDK/Source/AppsFlyerSDK/Public/AppsFlyerSDKBlueprint.h

@@ -53,4 +53,9 @@ class APPSFLYERSDK_API UAppsFlyerSDKBlueprint : public UBlueprintFunctionLibrary
 	UFUNCTION(BlueprintCallable, Category = AppsFlyerSDK, DisplayName = "AppsFlyerSDK add custom data to events in the payload")
     static void setAdditionalData(TMap <FString, FString> customData);
 
+	UFUNCTION(BlueprintCallable, Category = AppsFlyerSDK, DisplayName = "AppsFlyerConsent For *Non GDPR* User")
+    static void SetConsentForNonGDPRUser();
+
+	UFUNCTION(BlueprintCallable, Category = AppsFlyerSDK, DisplayName = "AppsFlyerConsent For *GDPR* User")
+    static void SetConsentForGDPRUser(bool hasConsentForDataUsage, bool hasConsentForAdsPersonalization);
 };

AppsFlyerSDK/Source/AppsFlyerSDK/Public/AppsFlyerSDKSettings.h

@@ -41,4 +41,7 @@ class UAppsFlyerSDKSettings : public UObject
      // Enable AppsFlyerSDK automatic start
     UPROPERTY(Config, EditAnywhere, config, Category = "AppsFlyer", meta = (DisplayName = "Automatically start the AppsFlyer SDK"))
     bool bEnableAutoStart;
+
+    UPROPERTY(Config, EditAnywhere, config, Category = "AppsFlyer", meta = (DisplayName = "Instruct the SDK to collect the TCF data from the device"))
+    bool bEnableTCFDataCollection;
 };

Demo/.gitignore

@@ -1,3 +1,4 @@
+
 # Visual Studio 2015 user specific files
 .vs/
 

UE_5.1_Demo/Demo/.gitignore

@@ -76,4 +76,13 @@ Plugins/*/Intermediate/*
 ./AppsFlyerSDK/Intermediate/*
 
 # Cache files for the editor to use
-DerivedDataCache/*
+DerivedDataCache/*
+
+/Saved
+/Demo (IOS).xcworkspace
+/Content
+/DerivedDataCache
+/Demo (Mac).xcworkspace
+/.vscode
+/Intermediate
+/Plugins/AppsFlyerSDK/Intermediate

UE_5.1_Demo/Demo/Config/DefaultEngine.ini

@@ -205,4 +205,8 @@ ManualIPAddress=
 appsFlyerDevKey=LYPnLsdJuSwjgAQ2GTZehc
 appleAppID=1217828636
 bIsDebug=True
+bEnableTCFDataCollection=True
+
+[/Script/MacTargetPlatform.XcodeProjectSettings]
+CodeSigningTeam=6UQAD4B3U2
 

UE_5.1_Demo/Demo/Demo.uproject

@@ -1,6 +1,6 @@
 {
 	"FileVersion": 3,
-	"EngineAssociation": "{89CF005C-2E45-EE90-3C62-39B910725CF3}",
+	"EngineAssociation": "5.3",
 	"Category": "",
 	"Description": "",
 	"Modules": [

UE_5.1_Demo/Demo/Plugins/AppsFlyerSDK

@@ -1 +1 @@
-/Volumes/T7 Shield/appsflyer-unreal-plugin/AppsFlyerSDK
+../../../AppsFlyerSDK