com.amanotes.gdk 0.2.31 → 0.2.32

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## [0.2.32 - 2023-11-08]
+- User mapping
+- Auto log Ad events
+
 ## [0.2.31 - 2023-11-06]
 - [Fix] False alarm when video reward ready
 - [Fix] Callbacks should trigger earlier (being delayed like 1s)

package/Packages/AppsFlyerAdRevenuePlugin.unitypackage.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 86143bf1eeccc4df3832a37f7548e2ff
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Runtime/AmaGDK.AdEvents.cs

@@ -0,0 +1,297 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using Amanotes.Core.Internal;
+using UnityEngine;
+
+namespace Amanotes.Core
+{
+    public partial class AmaGDK // Ad events
+    {
+        public static class AdEventContext
+        {
+            public delegate void UpdateAdEventContext (string eventName);
+            /// <summary>
+            /// Update AdEventContext's variables for ad event tracking
+            /// </summary>
+            public static event UpdateAdEventContext Update;
+
+            public static string connection;
+            public static string location;
+            public static string songACMid;
+            public static string songName;
+            public static string songUnlockType;
+            public static string reward;
+            public static string mediation;
+            public static Dictionary<string, object> customData = new Dictionary<string, object>();
+
+            internal static void UpdateFor(string eventName)
+            {
+                connection = null;
+                location = null;
+                songACMid = null;
+                songName = null;
+                songUnlockType = null;
+                reward = null;
+                mediation = null;
+                customData.Clear();
+                Update?.Invoke(eventName);
+            }
+        }
+        
+        public partial class AdEvents //Event name
+        {
+            const string FULLADS_REQUEST = "fullads_request";
+            const string FULLADS_REQUEST_FAILED = "fullads_request_failed";
+            const string FULLADS_REQUEST_SUCCESS = "fullads_request_success";
+            const string FULLADS_SHOW_READY = "fullads_show_ready";       
+            const string FULLADS_SHOW_NOTREADY = "fullads_show_notready";        
+            const string FULLADS_SHOW = "fullads_show";        
+            const string FULLADS_SHOW_FAILED = "fullads_show_failed";
+            const string FULLADS_FINISH = "fullads_finish";        
+            const string FULLADS_CLICK = "fullads_click";
+        
+            const string VIDEOADS_SHOW_READY = "videoads_show_ready";
+            const string VIDEOADS_SHOW_NOTREADY = "videoads_show_notready";
+            const string VIDEOADS_SHOW = "videoads_show";
+            const string VIDEOADS_SHOW_FAILED = "videoads_show_failed";
+            const string VIDEOADS_FINISH = "videoads_finish";
+            const string VIDEOADS_CLICK = "videoads_click";
+            
+            const string BANNER_CLICK = "bannerads_click";
+            
+            //Parameter name
+            const string PARAM_CONNECTION = "connection";
+            const string PARAM_LOCATION = "location";
+            const string PARAM_SONG_ACM_ID = "song_acm_id";
+            const string PARAM_SONG_NAME = "song_name";
+            const string PARAM_SONG_UNLOCK_TYPE = "song_unlock_type";
+            const string PARAM_REWARD = "reward";
+            const string PARAM_MEDIATION = "mediation";
+        }
+        
+        public partial class AdEvents //Impression
+        {
+            public static Action<Dictionary<string, object>> onAdImpression;
+
+            public static void LogAdImpression(Dictionary<string, object> impressionData)
+            {
+                Analytics.LogEvent("ad_impression", impressionData)
+                    .OnlyTo(AmaGDK.AdapterID.FIREBASE_ANALYTICS);
+                Analytics.LogEvent("ad_impression_ama", impressionData)
+                    .OnlyTo(AmaGDK.AdapterID.FIREBASE_ANALYTICS);
+            }
+        }
+        
+        public partial class AdEvents //Full ads
+        {
+            public static void LogFullAdsRequest()
+            {
+                AdEventContext.UpdateFor(FULLADS_REQUEST);
+                var dic = AdEventContext.customData;
+                dic[PARAM_CONNECTION] = AdEventContext.connection;
+                dic[PARAM_LOCATION] = AdEventContext.location;
+                dic[PARAM_MEDIATION] = AdEventContext.mediation;
+                Analytics.LogEvent(FULLADS_REQUEST, dic).SetAsAccumulated();
+            }
+            
+            public static void LogFullAdsRequestFailed()
+            {
+                AdEventContext.UpdateFor(FULLADS_REQUEST_FAILED);
+                var dic = AdEventContext.customData;
+                dic[PARAM_CONNECTION] = AdEventContext.connection;
+                dic[PARAM_LOCATION] = AdEventContext.location;
+                dic[PARAM_MEDIATION] = AdEventContext.mediation;
+                Analytics.LogEvent(FULLADS_REQUEST_FAILED, dic).SetAsAccumulated();
+            }
+            
+            public static void LogFullAdsRequestSuccess()
+            {
+                AdEventContext.UpdateFor(FULLADS_REQUEST_SUCCESS);
+                var dic = AdEventContext.customData;
+                dic[PARAM_CONNECTION] = AdEventContext.connection;
+                dic[PARAM_LOCATION] = AdEventContext.location;
+                dic[PARAM_MEDIATION] = AdEventContext.mediation;
+                Analytics.LogEvent(FULLADS_REQUEST_SUCCESS, dic).SetAsAccumulated();
+            }
+            
+            public static void LogFullAdsShowReady()
+            {
+                AdEventContext.UpdateFor(FULLADS_SHOW_READY);
+                var dic = AdEventContext.customData;
+                dic[PARAM_CONNECTION] = AdEventContext.connection;
+                dic[PARAM_LOCATION] = AdEventContext.location;
+                dic[PARAM_SONG_ACM_ID] = AdEventContext.songACMid;
+                dic[PARAM_SONG_NAME] = AdEventContext.songName;
+                dic[PARAM_SONG_UNLOCK_TYPE] = AdEventContext.songUnlockType;
+                dic[PARAM_MEDIATION] = AdEventContext.mediation;
+                Analytics.LogEvent(FULLADS_SHOW_READY, dic).SetAsAccumulated();
+            }
+            
+            public static void LogFullAdsShowNotReady()
+            {
+                AdEventContext.UpdateFor(FULLADS_SHOW_NOTREADY);
+                var dic = AdEventContext.customData;
+                dic[PARAM_CONNECTION] = AdEventContext.connection;
+                dic[PARAM_LOCATION] = AdEventContext.location;
+                dic[PARAM_SONG_ACM_ID] = AdEventContext.songACMid;
+                dic[PARAM_SONG_NAME] = AdEventContext.songName;
+                dic[PARAM_SONG_UNLOCK_TYPE] = AdEventContext.songUnlockType;
+                dic[PARAM_MEDIATION] = AdEventContext.mediation;
+                Analytics.LogEvent(FULLADS_SHOW_NOTREADY, dic).SetAsAccumulated();
+            }
+            
+            public static void LogFullAdsShow()
+            {
+                AdEventContext.UpdateFor(FULLADS_SHOW);
+                var dic = AdEventContext.customData;
+                dic[PARAM_CONNECTION] = AdEventContext.connection;
+                dic[PARAM_LOCATION] = AdEventContext.location;
+                dic[PARAM_SONG_ACM_ID] = AdEventContext.songACMid;
+                dic[PARAM_SONG_NAME] = AdEventContext.songName;
+                dic[PARAM_SONG_UNLOCK_TYPE] = AdEventContext.songUnlockType;
+                dic[PARAM_MEDIATION] = AdEventContext.mediation;
+                Analytics.LogEvent(FULLADS_SHOW, dic).SetAsAccumulated();
+            }
+            
+            public static void LogFullAdsShowFailed()
+            {
+                AdEventContext.UpdateFor(FULLADS_SHOW_FAILED);
+                var dic = AdEventContext.customData;
+                dic[PARAM_CONNECTION] = AdEventContext.connection;
+                dic[PARAM_LOCATION] = AdEventContext.location;
+                dic[PARAM_SONG_ACM_ID] = AdEventContext.songACMid;
+                dic[PARAM_SONG_NAME] = AdEventContext.songName;
+                dic[PARAM_SONG_UNLOCK_TYPE] = AdEventContext.songUnlockType;
+                dic[PARAM_MEDIATION] = AdEventContext.mediation;
+                Analytics.LogEvent(FULLADS_SHOW_FAILED, dic).SetAsAccumulated();
+            }
+            
+            public static void LogFullAdsFinish()
+            {
+                AdEventContext.UpdateFor(FULLADS_FINISH);
+                var dic = AdEventContext.customData;
+                dic[PARAM_CONNECTION] = AdEventContext.connection;
+                dic[PARAM_LOCATION] = AdEventContext.location;
+                dic[PARAM_SONG_ACM_ID] = AdEventContext.songACMid;
+                dic[PARAM_SONG_NAME] = AdEventContext.songName;
+                dic[PARAM_SONG_UNLOCK_TYPE] = AdEventContext.songUnlockType;
+                dic[PARAM_MEDIATION] = AdEventContext.mediation;
+                Analytics.LogEvent(FULLADS_FINISH, dic).SetAsAccumulated();
+            }
+            
+            public static void LogFullAdsClick()
+            {
+                AdEventContext.UpdateFor(FULLADS_CLICK);
+                var dic = AdEventContext.customData;
+                dic[PARAM_CONNECTION] = AdEventContext.connection;
+                dic[PARAM_LOCATION] = AdEventContext.location;
+                dic[PARAM_SONG_ACM_ID] = AdEventContext.songACMid;
+                dic[PARAM_SONG_NAME] = AdEventContext.songName;
+                dic[PARAM_SONG_UNLOCK_TYPE] = AdEventContext.songUnlockType;
+                dic[PARAM_MEDIATION] = AdEventContext.mediation;
+                Analytics.LogEvent(FULLADS_CLICK, dic).SetAsAccumulated();
+            }
+        }
+        
+        public partial class AdEvents //Rewarded
+        {
+            public static void LogVideoAdsShowReady()
+            {
+                AdEventContext.UpdateFor(VIDEOADS_SHOW_READY);
+                var dic = AdEventContext.customData;
+                dic[PARAM_CONNECTION] = AdEventContext.connection;
+                dic[PARAM_LOCATION] = AdEventContext.location;
+                dic[PARAM_SONG_ACM_ID] = AdEventContext.songACMid;
+                dic[PARAM_SONG_NAME] = AdEventContext.songName;
+                dic[PARAM_SONG_UNLOCK_TYPE] = AdEventContext.songUnlockType;
+                dic[PARAM_REWARD] = AdEventContext.reward;
+                dic[PARAM_MEDIATION] = AdEventContext.mediation;
+                Analytics.LogEvent(VIDEOADS_SHOW_READY, dic).SetAsAccumulated();
+            }
+            
+            public static void LogVideoAdsShowNotReady()
+            {
+                AdEventContext.UpdateFor(VIDEOADS_SHOW_NOTREADY);
+                var dic = AdEventContext.customData;
+                dic[PARAM_CONNECTION] = AdEventContext.connection;
+                dic[PARAM_LOCATION] = AdEventContext.location;
+                dic[PARAM_SONG_ACM_ID] = AdEventContext.songACMid;
+                dic[PARAM_SONG_NAME] = AdEventContext.songName;
+                dic[PARAM_SONG_UNLOCK_TYPE] = AdEventContext.songUnlockType;
+                dic[PARAM_REWARD] = AdEventContext.reward;
+                dic[PARAM_MEDIATION] = AdEventContext.mediation;
+                Analytics.LogEvent(VIDEOADS_SHOW_NOTREADY, dic).SetAsAccumulated();
+            }
+            
+            public static void LogVideoAdsShow()
+            {
+                AdEventContext.UpdateFor(VIDEOADS_SHOW);
+                var dic = AdEventContext.customData;
+                dic[PARAM_CONNECTION] = AdEventContext.connection;
+                dic[PARAM_LOCATION] = AdEventContext.location;
+                dic[PARAM_SONG_ACM_ID] = AdEventContext.songACMid;
+                dic[PARAM_SONG_NAME] = AdEventContext.songName;
+                dic[PARAM_SONG_UNLOCK_TYPE] = AdEventContext.songUnlockType;
+                dic[PARAM_REWARD] = AdEventContext.reward;
+                dic[PARAM_MEDIATION] = AdEventContext.mediation;
+                Analytics.LogEvent(VIDEOADS_SHOW, dic).SetAsAccumulated();
+            }
+            
+            public static void LogVideoAdsShowFailed()
+            {
+                AdEventContext.UpdateFor(VIDEOADS_SHOW_FAILED);
+                var dic = AdEventContext.customData;
+                dic[PARAM_CONNECTION] = AdEventContext.connection;
+                dic[PARAM_LOCATION] = AdEventContext.location;
+                dic[PARAM_SONG_ACM_ID] = AdEventContext.songACMid;
+                dic[PARAM_SONG_NAME] = AdEventContext.songName;
+                dic[PARAM_SONG_UNLOCK_TYPE] = AdEventContext.songUnlockType;
+                dic[PARAM_REWARD] = AdEventContext.reward;
+                dic[PARAM_MEDIATION] = AdEventContext.mediation;
+                Analytics.LogEvent(VIDEOADS_SHOW_FAILED, dic).SetAsAccumulated();
+            }
+            
+            public static void LogVideoAdsFinish()
+            {
+                AdEventContext.UpdateFor(VIDEOADS_FINISH);
+                var dic = AdEventContext.customData;
+                dic[PARAM_CONNECTION] = AdEventContext.connection;
+                dic[PARAM_LOCATION] = AdEventContext.location;
+                dic[PARAM_SONG_ACM_ID] = AdEventContext.songACMid;
+                dic[PARAM_SONG_NAME] = AdEventContext.songName;
+                dic[PARAM_SONG_UNLOCK_TYPE] = AdEventContext.songUnlockType;
+                dic[PARAM_REWARD] = AdEventContext.reward;
+                dic[PARAM_MEDIATION] = AdEventContext.mediation;
+                Analytics.LogEvent(VIDEOADS_FINISH, dic).SetAsAccumulated();
+            }
+            
+            public static void LogVideoAdsClick()
+            {
+                AdEventContext.UpdateFor(VIDEOADS_CLICK);
+                var dic = AdEventContext.customData;
+                dic[PARAM_CONNECTION] = AdEventContext.connection;
+                dic[PARAM_LOCATION] = AdEventContext.location;
+                dic[PARAM_SONG_ACM_ID] = AdEventContext.songACMid;
+                dic[PARAM_SONG_NAME] = AdEventContext.songName;
+                dic[PARAM_SONG_UNLOCK_TYPE] = AdEventContext.songUnlockType;
+                dic[PARAM_REWARD] = AdEventContext.reward;
+                dic[PARAM_MEDIATION] = AdEventContext.mediation;
+                Analytics.LogEvent(VIDEOADS_CLICK, dic).SetAsAccumulated();
+            }
+        }
+        
+        public partial class AdEvents //Banner
+        {
+            public static void LogBannerClick()
+            {
+                AdEventContext.UpdateFor(BANNER_CLICK);
+                var dic = AdEventContext.customData;
+                dic[PARAM_CONNECTION] = AdEventContext.connection;
+                dic[PARAM_LOCATION] = AdEventContext.location;
+                dic[PARAM_MEDIATION] = AdEventContext.mediation;
+                Analytics.LogEvent(BANNER_CLICK, dic).SetAsAccumulated();
+            }
+        }
+    }
+}

package/Runtime/AmaGDK.AdEvents.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: d65e821f5d1ce4c05aead50ca80d5b12
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Runtime/AmaGDK.Adapters.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using UnityEngine;
 using static Amanotes.Core.Internal.Logging;
 
 namespace Amanotes.Core.Internal
@@ -10,6 +11,7 @@ namespace Amanotes.Core.Internal
         public string adapterId;
         public string adapterVersion;
         public int initOrder;
+        public GameObject refObj;
 
         // Status support
         public Status status = Status.None;

package/Runtime/AmaGDK.Ads.cs

@@ -110,6 +110,7 @@ namespace Amanotes.Core
         [Serializable]
         public class AdAdapterConfig
         {
+            public bool autoInit;
             public int adLoadTimeoutInSecs = 60;
             public int adShowTimeoutInSecs = 5;
             public BannerPosition bannerPosition = BannerPosition.BOTTOM;
@@ -256,6 +257,11 @@ namespace Amanotes.Core
             public static int TimeSinceLastVideoReward => localData.TimeSinceLastShow(AdType.VideoReward);
             
             public static int TimeSinceLastAd => Math.Min(TimeSinceLastInterstitial, TimeSinceLastVideoReward) ;
+
+            public static void SetUserId(string userId)
+            {
+                _adapter.SetUserId(userId);
+            }
         }
     }
 }
@@ -274,6 +280,8 @@ namespace Amanotes.Core.Internal
         
         void ShowBanner(BannerPosition position);
         void HideBanner();
+
+        void SetUserId(string userId);
     }
 
     public enum LoadAdsState

package/Runtime/AmaGDK.Analytics.cs

@@ -771,5 +771,7 @@ namespace Amanotes.Core.Internal
         void SetUserId(string userId);
 
         void SetUserProperty(string key, string value);
+
+        void GetAppInstanceID(Action<string> appId);
     }
 }

package/Runtime/AmaGDK.IAP.cs

@@ -407,6 +407,7 @@ namespace Amanotes.Core.Internal
     [Serializable]
     public class IAPAdapterConfig
     {
+        public bool autoInit;
         [SerializeField] internal bool allPurchaseSuccessInEditor;
         [SerializeField] internal List<ProductInfo> products;
         [SerializeField] internal bool autoGetProducts;

package/Runtime/AmaGDK.UserProfile.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections;
+using System.Text.RegularExpressions;
 using Amanotes.Core.Internal;
 using UnityEngine;
 namespace Amanotes.Core
@@ -7,6 +8,7 @@ namespace Amanotes.Core
     public partial class AmaGDK //User profile
     {
         public static readonly UserProfile User = new UserProfile();
+        public static event Action<string> OnUserIdChanged;
 
         [Serializable]
         public partial class UserProfile : IJsonFile
@@ -26,28 +28,92 @@ namespace Amanotes.Core
                 this.SaveJsonToFile();
             }
         }
-        
-        public partial class UserProfile
+
+        public partial class UserProfile //PUBLIC
         {
-            public string GAId => gaid;
-            public string IDFA => idfa;
-            public string IDFV => idfv;
-            public string AndroidId => androidId;
-            public string AmaDeviceId => amaDeviceId;
-            public string AppsFlyerId => appsFlyerId;
+            public string UserId
+            {
+                get => _userId;
+                private set
+                {
+                    _userId = value;
+                    OnUserIdChanged?.Invoke(_userId);
+                }
+            }
+
+            public string GAId
+            {
+                get => _gaid;
+                set => _gaid = ValidateId(value, ALPHANUMERIC_HYPHEN_PATTERN);
+            }
+
+            public string IDFA
+            {
+                get => _idfa;
+                set => _idfa = ValidateId(value, ALPHANUMERIC_HYPHEN_PATTERN);
+            }
+            
+            public string IDFV
+            {
+                get => _idfv;
+                set => _idfv = ValidateId(value, ALPHANUMERIC_HYPHEN_PATTERN);
+            }
+            
+            public string AndroidId
+            {
+                get => _androidId;
+                set => _androidId = ValidateId(value, ALPHANUMERIC_PATTERN);
+            }
             
+            public string PseudoId
+            {
+                get => _pseudoId;
+                set => _pseudoId = ValidateId(value, ALPHANUMERIC_PATTERN);
+            }
+            
+            public string AmaDeviceId
+            {
+                get => _amaDeviceId;
+                set => _amaDeviceId = ValidateId(value, ALPHANUMERIC_HYPHEN_PATTERN);
+            }
+            
+            public string AppsFlyerId
+            {
+                get => _appsFlyerId;
+                set => _appsFlyerId = ValidateId(value, NUMERIC_HYPHEN_PATTERN);
+            }
+            
+            public string InstallationId
+            {
+                get => _installationId;
+                set => _installationId = ValidateId(value, ALPHANUMERIC_PATTERN);
+            }
+        }
+        
+        public partial class UserProfile //INTERNAL
+        {
+            [SerializeField]
+            private string _userId;
             [SerializeField]
-            private string gaid;
+            private string _gaid;
             [SerializeField]
-            private string idfa;
+            private string _idfa;
             [SerializeField]
-            private string idfv;
+            private string _idfv;
             [SerializeField]
-            private string androidId;
+            private string _androidId;
             [SerializeField]
-            private string amaDeviceId;
+            private string _pseudoId;
+            [SerializeField]
+            private string _amaDeviceId;
+            [SerializeField] 
+            private string _appsFlyerId;
             [SerializeField] 
-            private string appsFlyerId;
+            private string _installationId;
+
+            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-]+$";
             
             private const string AMA_DEVICE_ID_KEY = "ama_device_id";
             private const float TIME_OUT = 5f;
@@ -69,12 +135,73 @@ namespace Amanotes.Core
                     break;
                 }
             }
+
+            internal void UpdateUserId()
+            {
+                if (!string.IsNullOrWhiteSpace(_userId))
+                {
+                    OnUserIdChanged?.Invoke(_userId);
+                    return;
+                }
+                
+#if UNITY_ANDROID
+                if (!string.IsNullOrWhiteSpace(_gaid))
+                {
+                    UserId = $"GAID-{_gaid}";
+                    return;
+                }
+                
+                if (!string.IsNullOrWhiteSpace(_androidId))
+                {
+                    UserId = $"ADR-{_androidId}";
+                    return;
+                }
+#endif
+                
+#if UNITY_IOS
+                if (!string.IsNullOrWhiteSpace(_idfa))
+                {
+                    UserId = $"IDFA-{_idfa}";
+                    return;
+                }
+                
+                if (!string.IsNullOrWhiteSpace(_idfv))
+                {
+                    UserId = $"IDFV-{_idfv}";
+                    return;
+                }
+#endif
+                
+                if (!string.IsNullOrWhiteSpace(_pseudoId))
+                {
+                    UserId = $"FRB-{_pseudoId}";
+                    return;
+                }
+                
+                if (!string.IsNullOrWhiteSpace(_amaDeviceId))
+                {
+                    UserId = $"AMA-{_amaDeviceId}";
+                    return;
+                }
+                
+                if (!string.IsNullOrWhiteSpace(_appsFlyerId))
+                {
+                    UserId = $"AF-{_appsFlyerId}";
+                    return;
+                }
+                
+                if (!string.IsNullOrWhiteSpace(_installationId))
+                {
+                    UserId = $"INS-{_installationId}";
+                    return;
+                }
+            }
             
             private bool IsAmaDeviceIdExist()
             {
-                if (!string.IsNullOrEmpty(amaDeviceId))
+                if (!string.IsNullOrEmpty(_amaDeviceId))
                 {
-                    Logging.Log($"AmaDeviceId is already existed: {amaDeviceId}");
+                    Logging.Log($"AmaDeviceId is already existed: {_amaDeviceId}");
                     return true;
                 }
                 return false;
@@ -85,18 +212,19 @@ namespace Amanotes.Core
                 switch (Application.platform)
                 {
                     case RuntimePlatform.IPhonePlayer:
-                        idfa = id;
-                        idfv = SystemInfo.deviceUniqueIdentifier;
+                        IDFA = id;
+                        IDFV = SystemInfo.deviceUniqueIdentifier;
                         break;
                     case RuntimePlatform.Android:
-                        gaid = id;
-                        androidId = SystemInfo.deviceUniqueIdentifier;
+                        GAId = id;
+                        AndroidId = SystemInfo.deviceUniqueIdentifier;
                         break;
                     default:
                         Logging.LogWarning($"Unsupported platform: {Application.platform}");
                         break;
                 }
             }
+            
             private void GetAdvertisingId()
             {
                 AdvertisingIdFetcher.RequestAdvertisingId(advertisingId =>
@@ -111,27 +239,34 @@ namespace Amanotes.Core
                                 v = Guid.NewGuid().ToString();
                                 KeyChain.SetKeyChain(AMA_DEVICE_ID_KEY, v);
                             }
-                            amaDeviceId = v;
+                            AmaDeviceId = v;
                             break;
                 
                         case RuntimePlatform.Android:
-                            string _amaDeviceId = PlayerPrefs.GetString(AMA_DEVICE_ID_KEY);
-                            if (string.IsNullOrEmpty(amaDeviceId))
+                            string cachedAmaDeviceId = PlayerPrefs.GetString(AMA_DEVICE_ID_KEY);
+                            if (string.IsNullOrEmpty(cachedAmaDeviceId))
                             {
-                                _amaDeviceId = SystemInfo.deviceUniqueIdentifier;
-                                PlayerPrefs.SetString(AMA_DEVICE_ID_KEY, amaDeviceId);
+                                cachedAmaDeviceId = SystemInfo.deviceUniqueIdentifier;
+                                PlayerPrefs.SetString(AMA_DEVICE_ID_KEY, cachedAmaDeviceId);
                             }
-                            amaDeviceId = _amaDeviceId;
+                            AmaDeviceId = cachedAmaDeviceId;
                             break;
             
                         default:
-                            amaDeviceId = SystemInfo.deviceUniqueIdentifier;
+                            AmaDeviceId = SystemInfo.deviceUniqueIdentifier;
                             break;
                     }
-                    Logging.Log($"Generate AmaDeviceId completed: {amaDeviceId}");
+                    Logging.Log($"Generate AmaDeviceId completed: {_amaDeviceId}");
                     User.Save();
                 });
             }
+
+            private string ValidateId (string id, string pattern)
+            {
+                if (string.IsNullOrWhiteSpace(id)) return null;
+                if (!Regex.IsMatch(id, pattern)) return null;
+                return id;
+            }
         }
     }
 }

package/Runtime/AmaGDK.cs

@@ -14,7 +14,7 @@ namespace Amanotes.Core
 {
     public partial class AmaGDK : MonoBehaviour
     {
-        public const string VERSION = "0.2.31";
+        public const string VERSION = "0.2.32";
 
         internal static AmaGDK _instance;
         internal static Status _status = Status.None;
@@ -27,7 +27,7 @@ namespace Amanotes.Core
         private static readonly Dictionary<string, AdapterInfo> _adapters = new Dictionary<string, AdapterInfo>();
         private static readonly List<string> _firebaseServices = new List<string>() { AdapterID.FIREBASE_REMOTE_CONFIG, AdapterID.FIREBASE_ANALYTICS };
 
-        internal static ConfigAsset Config
+        public static ConfigAsset Config
         {
             get
             {
@@ -99,7 +99,7 @@ namespace Amanotes.Core
                 
                 time = 0;
 
-                while (!adapter.IsReady)
+                while (adapter.status == Status.None || adapter.status == Status.Initialize)
                 {
                     time += Time.deltaTime;
                     yield return null;
@@ -113,11 +113,16 @@ namespace Amanotes.Core
                     firebaseResolved = true;
                 }
 
-                var adapterInfo = new AdapterInfo(adapter.adapterId, adapter.adapterVersion, adapter.IsReady);
+                var adapterInfo = new AdapterInfo(adapter.adapterId, adapter.adapterVersion, adapter.IsReady, adapter.refObj);
                 _adapters[adapter.adapterId] = adapterInfo;
                 _onAdapterReadyCallback?.Invoke(adapterInfo);
                 adapterAnnounce.AppendLine(string.Format("[{0}] {1} (adapter v{2})", adapter.IsReady ? "OK" : "FAIL",
                     adapter.adapterId, adapter.adapterVersion));
+
+                if (adapter.adapterId == AdapterID.FIREBASE_ANALYTICS) User.UpdateUserId();
+
+                // Wait for postprocessing of each adapter
+                yield return null;
             }
             _onAdapterReadyCallback = null;
 
@@ -326,17 +331,19 @@ namespace Amanotes.Core
         }
     }
     
-    public struct AdapterInfo
+    public class AdapterInfo
     {
-        public string id;
-        public string version;
-        public bool isReady;
+        public readonly string id;
+        public readonly string version;
+        public readonly bool isReady;
+        public readonly GameObject refObj;
 
-        public AdapterInfo(string id, string version, bool isReady)
+        public AdapterInfo(string id, string version, bool isReady, GameObject refObj)
         {
             this.id = id;
             this.version = version;
             this.isReady = isReady;
+            this.refObj = refObj;
         }
     }
 }

package/package.json

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