Merge pull request #37 from AppsFlyerSDK/dev/DELIVERY-39475/6.12.2-pl…

…ugin-update 6.12.2 Plugin Update
AppsFlyerSDK · Oct 17, 2023 · 9933769 · 9933769
2 parents e2397eb + f4b4d05
commit 9933769
Show file tree

Hide file tree

Showing 8 changed files with 43 additions and 16 deletions.
diff --git a/AppsFlyerSDK/AppsFlyerSDK.uplugin b/AppsFlyerSDK/AppsFlyerSDK.uplugin
@@ -1,7 +1,7 @@
 {
 	"FileVersion": 3,
 	"Version": 2,
-	"VersionName": "6.10.1",
+	"VersionName": "6.12.2",
 	"FriendlyName": "AppsFlyerSDK",
 	"Description": "UE4/UE5 AppsFlyer Plugin",
 	"Category": "Misc",

diff --git a/AppsFlyerSDK/Source/AppsFlyerSDK/AppsFlyerSDK.Build.cs b/AppsFlyerSDK/Source/AppsFlyerSDK/AppsFlyerSDK.Build.cs
@@ -38,12 +38,16 @@ public AppsFlyerSDK(ReadOnlyTargetRules Target) : base(Target)
 				"CFNetwork"
 			}
 			);
+
+			//UPL
+			string PluginPath = Utils.MakePathRelativeTo(ModuleDirectory, Target.RelativeEnginePath);
+			AdditionalPropertiesForReceipt.Add("IOSPlugin", Path.Combine(PluginPath, "AppsFlyer_UPL_IOS.xml"));
 		}
 		else if (Target.Platform == UnrealTargetPlatform.Android)
 		{
 			// Unreal Plugin Language
 			string PluginPath = Utils.MakePathRelativeTo(ModuleDirectory, Target.RelativeEnginePath);
-			AdditionalPropertiesForReceipt.Add("AndroidPlugin", System.IO.Path.Combine(PluginPath, "AppsFlyer_UPL.xml"));
+			AdditionalPropertiesForReceipt.Add("AndroidPlugin", System.IO.Path.Combine(PluginPath, "AppsFlyer_UPL_Android.xml"));
 			// JNI
 			PublicIncludePathModuleNames.Add("Launch");
 		}

diff --git a/...SDK/Source/AppsFlyerSDK/AppsFlyer_UPL.xml → ...ce/AppsFlyerSDK/AppsFlyer_UPL_Android.xml b/...SDK/Source/AppsFlyerSDK/AppsFlyer_UPL.xml → ...ce/AppsFlyerSDK/AppsFlyer_UPL_Android.xml
@@ -5,8 +5,8 @@
                 mavenCentral()
             }
             dependencies {
-                implementation 'com.android.installreferrer:installreferrer:1.0'
-                implementation 'com.appsflyer:af-android-sdk:6.9.1'
+                implementation 'com.android.installreferrer:installreferrer:2.1'
+                implementation 'com.appsflyer:af-android-sdk:6.12.2'
             }
             android {
                 compileOptions {
@@ -37,6 +37,10 @@
         <insert>
             import android.app.Application;
             import com.appsflyer.*;
+            import com.appsflyer.internal.platform_extension.Plugin;
+            import com.appsflyer.internal.platform_extension.PluginInfo;
+            import java.util.HashMap;
+            import java.util.Map;
         </insert>
     </gameActivityImportAdditions>
     <gameActivityClassAdditions>
@@ -70,6 +74,18 @@
             public void afSetAdditionalData(Map&lt;String, Object&gt; customData) {
                 AppsFlyerLib.getInstance().setAdditionalData(customData);
             }
+
+            public void afSetPluginInfo(String pluginVersion, String engineVersion) {
+
+
+                Map&lt;String, String&gt; additionalData = new HashMap&lt;String,String&gt;();
+                additionalData.put("engine_version", engineVersion);
+
+                PluginInfo pluginInfo = new PluginInfo(Plugin.UNREAL, pluginVersion, additionalData);
+                AppsFlyerLib.getInstance().setPluginInfo(pluginInfo);   
+
+            }
+
         </insert>
     </gameActivityClassAdditions>
 </root>
diff --git a/AppsFlyerSDK/Source/AppsFlyerSDK/AppsFlyer_UPL_IOS.xml b/AppsFlyerSDK/Source/AppsFlyerSDK/AppsFlyer_UPL_IOS.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root xmlns:android="http://schemas.ios.com/res/ios">
+  <init>
+	  <log text="iOS AppsFlyerSDK Init"/>
+  </init>
+</root>
diff --git a/AppsFlyerSDK/Source/AppsFlyerSDK/Private/AppsFlyerSDKBlueprint.cpp b/AppsFlyerSDK/Source/AppsFlyerSDK/Private/AppsFlyerSDKBlueprint.cpp
@@ -18,7 +18,7 @@
 #include "Android/AndroidApplication.h"
 #elif PLATFORM_IOS
 #import <AppsFlyerLib/AppsFlyerLib.h>
-#import "UE4AFSDKDelegate.h"
+#import "IOS/UE4AFSDKDelegate.h"
 #include "IOSAppDelegate.h"
 #import <objc/message.h>
 
@@ -151,10 +151,18 @@ void UAppsFlyerSDKBlueprint::configure()
     const bool isDebug = defaultSettings->bIsDebug; 
     const bool isAutoStart = defaultSettings->bEnableAutoStart; 
 #if PLATFORM_ANDROID
-    if(isAutoStart){
-        JNIEnv* env = FAndroidApplication::GetJavaEnv();
-        jmethodID appsflyer =
-            FJavaWrapper::FindMethod(env, FJavaWrapper::GameActivityClassID, "afStart", "(Ljava/lang/String;Z)V", false);
+    JNIEnv* env = FAndroidApplication::GetJavaEnv();
+
+    jmethodID PluginMethodID = FJavaWrapper::FindMethod(env, FJavaWrapper::GameActivityClassID, "afSetPluginInfo", "(Ljava/lang/String;Ljava/lang/String;)V", false);
+    jstring jVersionName = env->NewStringUTF(TCHAR_TO_UTF8(*VersionName));
+    jstring jEngineVersion = env->NewStringUTF(TCHAR_TO_UTF8(*EngineVersion));
+    FJavaWrapper::CallVoidMethod(env, FJavaWrapper::GameActivityThis, PluginMethodID, jVersionName, jEngineVersion);
+    env->DeleteLocalRef(jVersionName);
+    env->DeleteLocalRef(jEngineVersion);
+
+    if (isAutoStart)
+    {
+        jmethodID appsflyer = FJavaWrapper::FindMethod(env, FJavaWrapper::GameActivityClassID, "afStart", "(Ljava/lang/String;Z)V", false);
         jstring key = env->NewStringUTF(TCHAR_TO_UTF8(*defaultSettings->appsFlyerDevKey));
 
         FJavaWrapper::CallVoidMethod(env, FJavaWrapper::GameActivityThis, appsflyer, key, isDebug);

diff --git a/...e/AppsFlyerSDK/Private/UE4AFSDKDelegate.h → ...psFlyerSDK/Private/IOS/UE4AFSDKDelegate.h b/...e/AppsFlyerSDK/Private/UE4AFSDKDelegate.h → ...psFlyerSDK/Private/IOS/UE4AFSDKDelegate.h
@@ -6,8 +6,6 @@
 //  Copyright © 2019 Epic Games, Inc. All rights reserved.
 //
 
-#ifndef PLATFORM_IOS 
-#else
 #if PLATFORM_IOS
 
 #import <Foundation/Foundation.h>
@@ -26,4 +24,3 @@ NS_ASSUME_NONNULL_BEGIN
 NS_ASSUME_NONNULL_END
 
 #endif
-#endif
diff --git a/.../AppsFlyerSDK/Private/UE4AFSDKDelegate.mm → ...sFlyerSDK/Private/IOS/UE4AFSDKDelegate.mm b/.../AppsFlyerSDK/Private/UE4AFSDKDelegate.mm → ...sFlyerSDK/Private/IOS/UE4AFSDKDelegate.mm
@@ -6,13 +6,10 @@
 //  Copyright © 2019 Epic Games, Inc. All rights reserved.
 //
 
-#ifndef PLATFORM_IOS 
-#else
 #if PLATFORM_IOS
 
 #import "UE4AFSDKDelegate.h"
 
-
 @implementation UE4AFSDKDelegate
 
 - (instancetype)init {
@@ -77,4 +74,3 @@ + (NSDictionary *)dictionaryByReplacingNullsWithStrings:(NSDictionary *)dict {
 @end
 
 #endif
-#endif
diff --git a/AppsFlyerSDK/Source/ThirdParty/iOS/AppsFlyerLib.embeddedframework.zip b/AppsFlyerSDK/Source/ThirdParty/iOS/AppsFlyerLib.embeddedframework.zip