com.amanotes.gdk 0.2.66-4 → 0.2.66-5

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## [0.2.66-5 - 2025-01-21]
+- [Fix] Early validate IDFA, GAId and update pattern of AmaDeviceId
+- [Fix] Send GDKVersionTracking only for Android/iOS
+
 ## [0.2.66-4 - 2024-12-03]
 - [Dev] Handle exception of FetchConfig
 - [Dev] Handle format exception in RemoteConfig

package/Editor/Extra/SDKVersionTracking.cs

@@ -2,6 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Net;
 using System.Net.Http;
 using System.Text;
 using System.Xml;
@@ -241,6 +242,26 @@ namespace Amanotes.Editor
         [PostProcessBuild(999)]
         public static void OnPostProcessBuild(BuildTarget target, string pathToBuiltProject)
         {
+            if (target != BuildTarget.Android && target != BuildTarget.iOS) return;
+
+            if (string.IsNullOrWhiteSpace(Application.productName) || Application.productName.ToLower() == "my project")
+            {
+                Debug.LogWarning("AmaGDK | [SDKVersionTracking] Please correct Application.productName");
+                return;
+            }
+            
+            if (string.IsNullOrWhiteSpace(PlayerSettings.applicationIdentifier) || PlayerSettings.applicationIdentifier.ToLower().StartsWith("com.defaultcompany"))
+            {
+                Debug.LogWarning("AmaGDK | [SDKVersionTracking] Please correct PlayerSettings.applicationIdentifier");
+                return;
+            }
+            
+            if (string.IsNullOrWhiteSpace(PlayerSettings.bundleVersion) || PlayerSettings.bundleVersion == "0")
+            {
+                Debug.LogWarning("AmaGDK | [SDKVersionTracking] Please correct PlayerSettings.bundleVersion");
+                return;
+            }
+            
             var rawData = _dicThirdPartyVersion
                 .Concat(_dicExtraVersion)
                 .Concat(_dicIronSourceAdapterVersion.ToDictionary(kvp => kvp.Key, kvp => (object)("IS_" + kvp.Value)))
@@ -288,7 +309,12 @@ namespace Amanotes.Editor
                 else
                 {
                     string errorData = await response.Content.ReadAsStringAsync();
-                    Debug.LogError($"AmaGDK | [SDKVersionTracking] Status code {response.StatusCode} Error Response: {errorData}");
+                    string errorMessage = $"AmaGDK | [SDKVersionTracking] Status code {response.StatusCode} Error Response: {errorData}";
+                    if ((int)response.StatusCode == 409)
+                    {
+                        throw new Exception(errorMessage);
+                    }
+                    Debug.LogError(errorMessage);
                 }
             }
             catch (HttpRequestException e)

package/Runtime/AmaGDK.UserProfile.cs

@@ -157,11 +157,7 @@ namespace Amanotes.Core
                 get => _amaDeviceId;
                 set
                 {
-                    var pattern = ALPHANUMERIC_HYPHEN_PATTERN;
-#if UNITY_ANDROID && !UNITY_EDITOR_OSX
-                    pattern = ALPHANUMERIC_PATTERN;
-#endif
-                    if (!ValidateId(value, pattern))
+                    if (!ValidateId(value, ALPHANUMERIC_OPTIONAL_HYPHEN_PATTERN))
                     {
                         Logging.LogError($"[UserProfile] Wrong format for AmaDeviceId. Value: {value}");
                         return;
@@ -299,6 +295,7 @@ namespace Amanotes.Core
             [SerializeField]
             private string _country;
 
+            private const string ALPHANUMERIC_OPTIONAL_HYPHEN_PATTERN = @"^(?=.*\d)(?=.*[a-zA-Z])[a-zA-Z\d-]+$";
             private const string ALPHANUMERIC_HYPHEN_PATTERN = @"^(?=.*\d)(?=.*[a-zA-Z])(?=.*-).+$";
             private const string ALPHANUMERIC_PATTERN = @"^(?=.*\d)(?=.*[a-zA-Z])[a-zA-Z\d]+$";
             private const string NUMERIC_HYPHEN_PATTERN = @"^(?=.*\d)(?=.*-)[\d-]+$";
@@ -347,9 +344,19 @@ namespace Amanotes.Core
                 switch (Application.platform)
                 {
                     case RuntimePlatform.IPhonePlayer:
+                        if (!ValidateId(id, ALPHANUMERIC_HYPHEN_PATTERN))
+                        {
+                            Logging.LogWarning($"[UserProfile] Wrong format for IDFA. Value: {id}");
+                            return;
+                        }
                         IDFA = id;
                         break;
                     case RuntimePlatform.Android:
+                        if (!ValidateId(id, ALPHANUMERIC_HYPHEN_PATTERN))
+                        {
+                            Logging.LogWarning($"[UserProfile] Wrong format for GAId. Value: {id}");
+                            return;
+                        }
                         GAId = id;
                         break;
                 }

package/Runtime/AmaGDK.cs

@@ -17,7 +17,7 @@ namespace Amanotes.Core
 {
     public partial class AmaGDK : MonoBehaviour
     {
-        public const string VERSION = "0.2.66-4";
+        public const string VERSION = "0.2.66-5";
         
         internal static Status _status = Status.None;
         private static ConfigAsset _config = null;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "com.amanotes.gdk",
-    "version": "0.2.66-4",
+    "version": "0.2.66-5",
     "displayName": "AmaGDK",
     "description": "Amanotes Game Development Kit",
     "unity": "2019.4",