com.amanotes.gdk 0.2.81-alpha.8 → 0.2.81

package/CHANGELOG.md

@@ -1,3 +1,8 @@
+## [0.2.81] - 2025-01-16
+- [Fix] GDK Version
+- [Dev] Improve Google CMP
+- [Fix] Obsolete IronSource events
+
 ## [0.2.80] - 2024-11-13
 - [Dev] Don't use obsolete functions
 - [Dev] Add CrashlyticHook

package/Runtime/Ad/AdLogic.cs

@@ -8,7 +8,6 @@ namespace Amanotes.Core.Internal
 {
     public abstract class AdLogic
     {
-        private const int MAX_FRAMES_WAIT_FOR_CALLBACK = 60; 
         protected AdModuleConfig adConfig => Config.ad;
         protected AdShowContext context => Ads.context;
         
@@ -256,20 +255,18 @@ namespace Amanotes.Core.Internal
                 }
             };
             unityCallbacks.OnApplicationFocus += onApplicationFocusCallback;
-            int counter = 0;
             while (context != null && !context.potentiallyCompleted)
             {
                 if (hasFocusAgain && hasOutOfFocus)
                 {
-                    // Start counting frames only after closed the ad
-                    counter++;
-                }
-                if (counter > MAX_FRAMES_WAIT_FOR_CALLBACK)
-                {
-                    // Timeout reached, force close the ad
-                    LogError("Force close the ad");
-                    StopShowAd();
-                    break;
+                    // Start counting only after closed the ad
+                    yield return GDKUtils.WaitForSecondsRealtime(Config.ad.adCallBackTimeOut);
+                    if (context != null && !context.potentiallyCompleted)
+                    {
+                        LogError("Force close the ad");
+                        StopShowAd();
+                        break;   
+                    }
                 }
                 yield return null;
             }
@@ -351,24 +348,27 @@ namespace Amanotes.Core.Internal
 
         private void TriggerBeforeAdShow()
         {
-            bool willSaveVolume = Config.ad.autoMute
-                && AudioListener.volume > 0
-                && Ads._savedVolume < 0;
+            if (Application.platform == RuntimePlatform.IPhonePlayer)
+            {
+                bool willSaveVolume = Config.ad.autoMute
+                    && AudioListener.volume > 0
+                    && Ads._savedVolume < 0;
 
-            bool willSaveTimeScale = Config.ad.autoTimeScale
-                && Time.timeScale > 0
-                && Ads._savedTimeScale < 0;
+                bool willSaveTimeScale = Config.ad.autoTimeScale
+                    && Time.timeScale > 0
+                    && Ads._savedTimeScale < 0;
 
-            if (willSaveVolume)
-            {
-                Ads._savedVolume = AudioListener.volume;
-                AudioListener.volume = 0;
-            }
+                if (willSaveVolume)
+                {
+                    Ads._savedVolume = AudioListener.volume;
+                    AudioListener.volume = 0;
+                }
 
-            if (willSaveTimeScale)
-            {
-                Ads._savedTimeScale = Time.timeScale;
-                Time.timeScale = 0;
+                if (willSaveTimeScale)
+                {
+                    Ads._savedTimeScale = Time.timeScale;
+                    Time.timeScale = 0;
+                }
             }
 
             dispatcher.Dispatch(_isInterstitial ? AmaGDK.Event.INTER_SHOW_BEGIN : AmaGDK.Event.REWARD_VIDEO_SHOW_BEGIN);
@@ -377,24 +377,27 @@ namespace Amanotes.Core.Internal
 
         private void TriggerOnAfterAdShow()
         {
-            bool willRestoreVolume = Config.ad.autoMute
-                && AudioListener.volume == 0
-                && Ads._savedVolume > 0;
+            if (Application.platform == RuntimePlatform.IPhonePlayer)
+            {
+                bool willRestoreVolume = Config.ad.autoMute
+                    && Mathf.Approximately(AudioListener.volume, 0)
+                    && Ads._savedVolume > 0;
 
-            bool willRestoreTimeScale = Config.ad.autoTimeScale
-                && Time.timeScale == 0
-                && Ads._savedTimeScale > 0;
+                bool willRestoreTimeScale = Config.ad.autoTimeScale
+                    && Mathf.Approximately(Time.timeScale, 0)
+                    && Ads._savedTimeScale > 0;
 
-            if (willRestoreVolume)
-            {
-                AudioListener.volume = Ads._savedVolume;
-                Ads._savedVolume = -1;
-            }
+                if (willRestoreVolume)
+                {
+                    AudioListener.volume = Ads._savedVolume;
+                    Ads._savedVolume = -1;
+                }
 
-            if (willRestoreTimeScale)
-            {
-                Time.timeScale = Ads._savedTimeScale;
-                Ads._savedTimeScale = -1;
+                if (willRestoreTimeScale)
+                {
+                    Time.timeScale = Ads._savedTimeScale;
+                    Ads._savedTimeScale = -1;
+                }   
             }
             
             bool isSuccess = _showState == ShowAdsState.ShowSuccess;

package/Runtime/Ad/AdModuleConfig.cs

@@ -45,6 +45,9 @@ namespace Amanotes.Core.Internal
         [Header("EDITOR")]
         [Tooltip("Only applicable in Editor\n0 = 0% success\n1 = 100% success")]
         [Range(0f, 1f)] public float rewardAdShowSuccessRate = 1;
+
+        [Tooltip(("The maximum time (in seconds) to wait for the callback response after the ad activity has finished and the app returns to the Unity activity (default = 5s)"))]
+        public float adCallBackTimeOut = 5f;
     }
 
     public partial class ConfigAsset

package/Runtime/Ad/AmaGDK.Ads.cs

@@ -93,7 +93,7 @@ namespace Amanotes.Core
             
             internal void Save()
             {
-                this.SaveJsonToFile();
+                this.SaveJsonToFile(false);
             }
         }
 
@@ -345,6 +345,7 @@ namespace Amanotes.Core.Internal
     {
         protected AdShowContext context => Ads.context;
         protected AdModuleConfig moduleConfig => Config.ad;
+        public Dictionary<string, object> userData => context?.userData;
 
         // APIs
         internal protected abstract AdLogic interstitial { get; }

package/Runtime/AmaGDK.Analytics.cs

@@ -130,12 +130,11 @@ namespace Amanotes.Core
                 if (Config.analytics.autoFlushEventDetail)
                 {
                     LogWarning("[Analytics] This function FlushEventDetails() is not supposed to be called manually!");
-                    return;
                 }
                 
                 if (!localData._dirty) return;
                 localData._dirty = false;
-                localData.SaveJsonToFile();
+                localData.SaveJsonToFile(false);
             }
 
             public static IEventParamsBuilder LogFunnelEvent(string eventName, string signature = "")
@@ -648,7 +647,12 @@ namespace Amanotes.Core
             internal static void PostPrepareEventProcess(EventParams eventData)
             {
                 if (!eventData.parameters.ContainsKey("ama_device_id"))
-                    eventData.AddParam("ama_device_id", User.AmaDeviceId);
+                {
+                    if (!string.IsNullOrWhiteSpace(User.AmaDeviceId))
+                    {
+                        eventData.AddParam("ama_device_id", User.AmaDeviceId);    
+                    }
+                }
             }
             
             internal static bool ShouldSendEvent(EventParams eventData)
@@ -715,10 +719,13 @@ namespace Amanotes.Core
                 {
                     sb.Append(eventNameToSend);
                     sb.Append("\t");
-                    for (var i = 0; i < adapters.Count; i++)
+                    if (adapters != null && adapters.Count > 0)
                     {
-                        sb.Append(adapters[i]);
-                        if (i < adapters.Count - 1) sb.Append(",");
+                        for (var i = 0; i < adapters.Count; i++)
+                        {
+                            sb.Append(adapters[i]);
+                            if (i < adapters.Count - 1) sb.Append(",");
+                        }    
                     }
                     sb.Append("\t");
                     sb.AppendLine(eventParamsInJSON);
@@ -843,7 +850,7 @@ namespace Amanotes.Core
                     if (!Config.analytics.autoFlushEventDetail) return;
                     if (!_dirty) return;
                     _dirty = false;
-                    this.SaveJsonToFile();
+                    this.SaveJsonToFile(false);
                 }
 
                 internal void UpdateMigrationLog()

package/Runtime/AmaGDK.IAP.cs

@@ -21,7 +21,10 @@ namespace Amanotes.Core
             public static DateTime? SubscriptionExpiredDate => localData.SubscriptionExpiredDate;
             public static DateTime? UnsubscribedDate => localData.UnsubscribedDate;
             public static readonly Dictionary<string, ProductInfo> AllProducts = new Dictionary<string, ProductInfo>();
+            
             private const string DATE_FORMAT = "yyyy/MM/yy HH:mm:ss";
+            private static readonly GDKTaskTracker<bool> _syncTaskTracker = new GDKTaskTracker<bool>();
+            private static readonly GDKTaskTracker _getProductsTaskTracker = new GDKTaskTracker();
             
             public static void SetCallback_OnModuleReady(Action onReady)
             {
@@ -37,42 +40,32 @@ namespace Amanotes.Core
                 _onModuleReady += onReady;
             }
             
-            public static void SetCallback_OnGetProductsComplete(Action onComplete)
-            {
-                if (onComplete == null) return;
-            
-                if (isGetProductComplete)
-                {
-                    onComplete();
-                    return;
-                }
-            
-                _onGetProductsComplete -= onComplete;
-                _onGetProductsComplete += onComplete;
-            }
-            
-            public static void SetCallback_OnGetCustomerInfoComplete(Action onComplete)
-            {
-                if (onComplete == null) return;
-            
-                if (isGetCustomerInfoComplete)
-                {
-                    onComplete();
-                    return;
-                }
-            
-                _onGetCustomerInfoComplete -= onComplete;
-                _onGetCustomerInfoComplete += onComplete;
-            }
-
             public static void SyncCustomerInfo(Action<bool> onComplete = null)
             {
-                if (_adapter == null)
+                if (Adapter == null)
                 {
                     onComplete?.Invoke(false);
                     return;
                 }
-                _adapter.SyncCustomerInfo(onComplete);
+
+                _syncTaskTracker.RegisterOnCompleteCallback(onComplete);
+                if (_syncTaskTracker.HasStarted) return;
+
+                _syncTaskTracker.MarkStarted();
+                Adapter.SyncCustomerInfo(getSuccess =>
+                {
+                    if (getSuccess)
+                    {
+                        localData.Sync();
+                        _syncTaskTracker.MarkCompleted(true);
+                    }
+                    else
+                    {
+                        _syncTaskTracker.MarkCompleted(false);
+                        _syncTaskTracker.Reset();
+                        LogWarning("[IAP] Fail to sync customer info. Please try again later.");
+                    }
+                });
             }
             
             public static ISetupBuilder GetProducts(bool appendExistingList = false)
@@ -181,13 +174,8 @@ namespace Amanotes.Core
                 }
             }
 
-            private static bool isGetProductComplete;
-            private static bool isGetCustomerInfoComplete;
-            private static bool IsModuleReady => isGetProductComplete && isGetCustomerInfoComplete;
-            private static Action _onGetProductsComplete;
-            private static Action _onGetCustomerInfoComplete;
+            private static bool IsModuleReady => _syncTaskTracker.HasCompleted && _getProductsTaskTracker.HasCompleted;
             private static Action _onModuleReady;
-
             internal static bool InitModule()
             {
                 _adapter = Adapter2.GetAdapter<IAPAdapter>();
@@ -199,14 +187,8 @@ namespace Amanotes.Core
             internal static void StartModule()
             {
                 if (_adapter == null) return;
-                _adapter.SyncCustomerInfo(
-                    success =>
-                    {
-                        isGetCustomerInfoComplete = true;
-                        GDKUtils.SafeInvokeAndClear(ref _onGetCustomerInfoComplete);
-                        if (IsModuleReady) GDKUtils.SafeInvokeAndClear(ref _onModuleReady);
-                    });
-                localData.Sync();
+                SyncCustomerInfo(_ => CheckModuleReady());
+                _getProductsTaskTracker.MarkStarted();
                 if (Config.iap.autoGetProducts)
                 {
                     GetProducts()
@@ -218,11 +200,15 @@ namespace Amanotes.Core
                     OnGetProductsComplete();
                 }
             }
-
+            
             private static void OnGetProductsComplete()
             {
-                isGetProductComplete = true;
-                GDKUtils.SafeInvokeAndClear(ref _onGetProductsComplete);
+                _getProductsTaskTracker.MarkCompleted();
+                CheckModuleReady();
+            }
+
+            private static void CheckModuleReady()
+            {
                 if (IsModuleReady) GDKUtils.SafeInvokeAndClear(ref _onModuleReady);
             }
         }
@@ -284,19 +270,8 @@ namespace Amanotes.Core
                     }
                 }
 
-                public void Sync()
+                internal void Sync()
                 {
-                    GDKUtils.StartCoroutine(SyncRoutine());
-                }
-
-                IEnumerator SyncRoutine()
-                {
-                    if (Adapter == null)
-                    {
-                        LogWarning("[IAP] Adapter is not available");
-                        yield break;
-                    }
-                    yield return new WaitUntil(() => Adapter.IsReady);
                     activeSubscriptionId = Adapter.GetActiveSubscriptionId();
                     subscriptionPeriodType = Adapter.GetSubscriptionPeriodType();
                     purchasedProducts = Adapter.GetPurchasedProducts();
@@ -306,7 +281,7 @@ namespace Amanotes.Core
                     subscriptionExpiredDate = _subscriptionExpiredDate?.ToString(DATE_FORMAT);
                     _unsubscribedDate = Adapter.GetUnsubscribedDate();
                     unsubscribedDate = _unsubscribedDate?.ToString(DATE_FORMAT);
-                    this.SaveJsonToFile();
+                    this.SaveJsonToFile(false);
                 }
             }
         }

package/Runtime/AmaGDK.RemoteConfig.cs

@@ -235,7 +235,7 @@ namespace Amanotes.Core
                 }
                 
                 string filePath = GDKFileUtils.GetPath(fileName);
-                GDKFileUtils.Save(filePath, sb.ToString());
+                GDKFileUtils.Save(filePath, sb.ToString(), false);
                 GDKPool.Return(sb);
                 
                 Log($"[RemoteConfig] Saved remote config to {filePath}");

package/Runtime/AmaGDK.UserProfile.cs

@@ -33,14 +33,14 @@ namespace Amanotes.Core
             private bool _dirty = false;
             private void Save()
             {
-                this.SaveJsonToFile();
+                this.SaveJsonToFile(false);
             }
             
             private void SaveIfDirty()
             {
                 if (!_dirty) return;
                 _dirty = false;
-                this.SaveJsonToFile();
+                this.SaveJsonToFile(false);
             }
         }
 

package/Runtime/AmaGDK.cs

@@ -27,7 +27,7 @@ namespace Amanotes.Core
 {
     public partial class AmaGDK : MonoBehaviour
     {
-        public const string VERSION = "v0.2.81-alpha.8";
+        public const string VERSION = "0.2.81";
         
         internal static Status _status = Status.None;
         internal static ConfigAsset _config = null;

package/Runtime/Consent/AmaGDK.Consent.cs

@@ -1,6 +1,7 @@
 using System;
 using Amanotes.Core.Internal;
 using UnityEngine;
+using UnityEngine.Serialization;
 using static Amanotes.Core.GDKDebug;
 
 namespace Amanotes.Core
@@ -10,6 +11,8 @@ namespace Amanotes.Core
         public static partial class Consent //Public
         {
             private static readonly GDKTaskTracker _allConsentTaskTracker = new GDKTaskTracker();
+
+            public static void OnAllConsentsCompleted(Action onComplete) => _allConsentTaskTracker.RegisterOnCompleteCallback(onComplete);
             public static void RequestAllConsents(Action onComplete)
             {
                 _allConsentTaskTracker.RegisterOnCompleteCallback(onComplete);
@@ -72,21 +75,37 @@ namespace Amanotes.Core
                         onComplete?.Invoke(false);
                         return;
                     }
+                    
+                    void RequestATT()
+                    {
+                        ConsentHook.ATTRequest(
+                            isAllowed =>
+                            {
+                                data.att = isAllowed ? Status.Allowed : Status.NotAllowed;
+                                data.SaveJsonToFile(false);
+                                onComplete?.Invoke(allowedATT);
+                            }
+                        );
+                    }
 
-                    ConsentHook.ATTRequest(isAllowed =>
+                    if (_config.autoGetConsent)
                     {
-                        data.att = isAllowed ? Status.Allowed : Status.NotAllowed;
-                        data.SaveJsonToFile();
-                        onComplete?.Invoke(allowedATT);
-                    });
+                        // Delay 1s due to iOS issue, ATT popup will not show if we request soon at app launch
+                        GDKUtils.DelayCall(1f, RequestATT);
+                    }
+                    else
+                    {
+                        RequestATT();
+                    }
                 }
             }
-            
         }
         
         public static partial class Consent //CMP
         {
-            public static class CMP
+            public static readonly CMPConsent CMP = new CMPConsent(); 
+
+            public class CMPConsent
             {
                 /// <summary>
                 /// Determines if a consent popup should be shown to the user and displays it if required.
@@ -101,7 +120,7 @@ namespace Amanotes.Core
                 /// </param>
                 /// <param name="onError">Callback invoked with an error message if the consent
                 /// form could not be loaded or shown.</param>
-                public static void ShowConsentFormIfRequired(Action<bool> onComplete, Action<string> onError)
+                public void ShowConsentFormIfRequired(Action<bool> onComplete, Action<string> onError)
                 {
                     if (ConsentHook.ShowConsentFormIfRequired == null)
                     {
@@ -112,59 +131,17 @@ namespace Amanotes.Core
                     if (data.consentAlreadyShown)
                     {
                         Log("[Consent] Consent form has already been shown");
-                        onComplete?.Invoke(data.canShowAds);
+                        onComplete?.Invoke(data.canRequestAds);
                         return;
                     }
-                    ConsentHook.ShowConsentFormIfRequired(canShowAd =>
+                    ConsentHook.ShowConsentFormIfRequired(canRequestAds =>
                     {
-                        data.canShowAds = canShowAd;
+                        data.canRequestAds = canRequestAds;
                         data.consentAlreadyShown = true;
-                        data.SaveJsonToFile();
-                        onComplete?.Invoke(canShowAd);
+                        data.SaveJsonToFile(false);
+                        onComplete?.Invoke(canRequestAds);
                     }, onError);
                 }
-                
-                /// <summary>
-                /// Forces the consent popup to be shown to the user, regardless of previous
-                /// consent status.
-                /// </summary>
-                /// <param name="onComplete">Callback invoked with a boolean indicating the
-                /// ConsentInformation.CanRequestAds() result
-                /// </param>
-                /// <param name="onError">Callback invoked with an error message if the consent
-                /// form could not be loaded or shown.</param>
-                public static void ShowPrivacyForm(Action<bool> onComplete, Action<string> onError)
-                {
-                    if (ConsentHook.CheckPrivacyOptionsRequired == null)
-                    {
-                        LogWarning("[Consent] ConsentHook.ShowPrivacyForm is not implemented");
-                        onError?.Invoke("ShowPrivacyForm is not implemented");
-                        return;
-                    }
-                    ConsentHook.ShowPrivacyForm(onComplete, onError);
-                }
-
-                /// <summary>
-                /// Determines whether privacy options are required for the current user.
-                /// Updates the consent information before returning the result.
-                /// </summary>
-                /// <param name="onComplete">Callback invoked with `true` if privacy options are required, otherwise `false`.</param>
-                public static void CheckPrivacyOptionsRequired(Action<bool> onComplete)
-                {
-                    if (ConsentHook.CheckPrivacyOptionsRequired == null)
-                    {
-                        LogWarning("[Consent] ConsentHook.CheckPrivacyOptionsRequired is not implemented");
-                        onComplete?.Invoke(false);
-                        return;
-                    }
-                    ConsentHook.CheckPrivacyOptionsRequired(onComplete);
-                }
-
-                [Obsolete("Use ShowPrivacyForm instead")]
-                public static void ForceShowPopup(Action<bool> onComplete)
-                {
-                    ShowPrivacyForm(onComplete, s => onComplete?.Invoke(false));
-                }
             }
         }
 
@@ -177,7 +154,7 @@ namespace Amanotes.Core
             internal static bool checkedATT => data.att >= Status.Allowed;
             internal static bool allowedATT => data.att == Status.Allowed;
             
-            internal enum Status
+            public enum Status
             {
                 None,
                 NotRequired,
@@ -201,14 +178,13 @@ namespace Amanotes.Core
     {
         [SerializeField] internal AmaGDK.Consent.Status att;
         [SerializeField] internal bool consentAlreadyShown;
-        [SerializeField] internal bool canShowAds;
+        [FormerlySerializedAs("canShowAds")]
+        [SerializeField] internal bool canRequestAds;
     }
 
     public static class ConsentHook
     {
         public static Action<Action<bool>, Action<string>> ShowConsentFormIfRequired;
-        public static Action<Action<bool>, Action<string>> ShowPrivacyForm;
-        public static Action<Action<bool>> CheckPrivacyOptionsRequired;
         public static Action<Action<bool>> ATTRequest;
     }
 }