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

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;
     }
 }

package/Runtime/Core/GDKDebug.cs

@@ -11,11 +11,12 @@ namespace Amanotes.Core
         Warning,
         Verbose
     }
-
-    internal struct NoStackTrace : IDisposable
+    
+    #if GDK_REMOVE_STACKTRACE
+    internal readonly struct NoStackTrace : IDisposable
     {
-        internal LogType logType;
-        internal StackTraceLogType stackTraceType;
+        internal readonly LogType logType;
+        internal readonly StackTraceLogType stackTraceType;
 
         internal NoStackTrace(LogType logType)
         {
@@ -34,8 +35,21 @@ namespace Amanotes.Core
         public static NoStackTrace Log => new NoStackTrace(LogType.Log);
     }
     
+    internal readonly struct NoStackTraceNull: IDisposable
+    {
+        public void Dispose()
+        {
+            
+        }
+    }
+    #endif
+    
     public class GDKDebug
     {
+        #if GDK_REMOVE_STACKTRACE
+        internal static readonly IDisposable NoStackTraceNull = new NoStackTraceNull();
+        #endif
+        
         public static Action<string> logNonfatalErrorHook = null;
         private static readonly HashSet<string> nonFatalDict = new HashSet<string>();
         private static readonly HashSet<string> logWarningDict = new HashSet<string>();
@@ -49,7 +63,9 @@ namespace Amanotes.Core
                 if (!logWarningDict.Add(key)) return;
             }
             
-            using (NoStackTrace.Warning)
+            #if GDK_REMOVE_STACKTRACE
+            using (GDKUtils.isOnMainThread ? NoStackTrace.Warning: NoStackTraceNull)
+            #endif
             {
                 Debug.LogWarning($"AmaGDK {message}"); 
             }
@@ -57,45 +73,46 @@ namespace Amanotes.Core
         public static void LogWarning(string message)
         {
             if (AmaGDK.logLevel < LogLevel.Warning) return;
-            using (NoStackTrace.Warning)
+            #if GDK_REMOVE_STACKTRACE
+            using (GDKUtils.isOnMainThread ? NoStackTrace.Warning: NoStackTraceNull)
+            #endif
             {
-                Debug.LogWarning($"AmaGDK {message}"); 
+                Debug.LogWarning($"AmaGDK {message}");
             }
         }
         public static void LogError(string message)
         {
             if (AmaGDK.logLevel < LogLevel.Error) return;
-            using (NoStackTrace.Error)
+            #if GDK_REMOVE_STACKTRACE
+            using (GDKUtils.isOnMainThread ? NoStackTrace.Error: NoStackTraceNull)
+            #endif
             {
-                Debug.LogError($"AmaGDK {message}");    
+                Debug.LogError($"AmaGDK {message}");
             }
             
             if (logNonfatalErrorHook == null) return;
             
             if (GDKUtils.isOnMainThread) // Most of the time
             {
-                lock (nonFatalDict)
-                {
-                    if (!nonFatalDict.Add(message)) return;
-                }
-                logNonfatalErrorHook(message);
+                LogNonFatalOnMainThread(message);
                 return;
             }
             
-            GDKUtils.DoOnMainThread(() =>
-            {
-                lock (nonFatalDict)
-                {
-                    if (!nonFatalDict.Add(message)) return; // LogOnce
-                }
-                logNonfatalErrorHook(message);
-            });
+            GDKUtils.DoOnMainThread(() => { LogNonFatalOnMainThread(message); });
+        }
+
+        private static void LogNonFatalOnMainThread(string message)
+        {
+            if (!nonFatalDict.Add(message)) return;
+            logNonfatalErrorHook(message);
         }
         
         public static void Log(string message)
         {
             if (AmaGDK.logLevel < LogLevel.Verbose) return;
-            using (NoStackTrace.Log)
+            #if GDK_REMOVE_STACKTRACE
+            using (GDKUtils.isOnMainThread ? NoStackTrace.Log: NoStackTraceNull)
+            #endif
             {
                 Debug.Log($"AmaGDK {message}");   
             }
@@ -103,7 +120,9 @@ namespace Amanotes.Core
         
         public static void ForceLog(string message)
         {
-            using (NoStackTrace.Log)
+            #if GDK_REMOVE_STACKTRACE
+            using (GDKUtils.isOnMainThread ? NoStackTrace.Log: NoStackTraceNull)
+            #endif
             {
                 Debug.Log($"AmaGDK {message}");
             }

package/Runtime/Internal/AmaGDK.Utils.cs

@@ -200,7 +200,7 @@ namespace Amanotes.Core.Internal
             return GDKFileUtils.LoadJsonFromFile(instance);
         }
 
-        internal static void SaveJsonToFile<T>(this T instance, bool immediately = true) where T: IJsonFile
+        internal static void SaveJsonToFile<T>(this T instance, bool immediately) where T: IJsonFile
         {
             GDKFileUtils.SaveJsonToFile(instance, immediately);
         }

package/Runtime/Internal/ForceQuitMonitor.cs

@@ -34,7 +34,7 @@ namespace Amanotes.Core.Internal
             internal void SaveIfDirty(bool forceSave = false)
             {
                 if (!isDirty && !forceSave) return;
-                this.SaveJsonToFile();
+                this.SaveJsonToFile(false);
                 isDirty = false;
             }
         }