com.amanotes.gdk 0.2.70 → 0.2.72

package/Runtime/Internal/AmaGDK.Internal.cs

@@ -1,10 +1,10 @@
-using System;
+using System;
 using System.Collections.Generic;
-using System.Text;
 using UnityEngine;
 using UnityObject = UnityEngine.Object;
 using static Amanotes.Core.AmaGDK.Analytics;
 using static Amanotes.Core.AmaGDK;
+using static Amanotes.Core.GDKDebug;
 
 #if UNITY_EDITOR
 using UnityEditor;
@@ -63,40 +63,29 @@ namespace Amanotes.Core.Internal
         }
 #endif
     }
-
+    
+    #if !AMAGDK_DEV
+    
+    [Obsolete("Deprecated class - use GDKDebug instead!")]
     public static class Logging
     {
-        public static Action<string> logNonfatalErrorHook = null;
-        private static readonly HashSet<string> nonFatalDict = new HashSet<string>();
-        public static readonly HashSet<string> logWarningDict = new HashSet<string>();
-
+        [Obsolete("Deprecated method - use GDKDebug.LogWarningOnce() instead!")]
         public static void LogWarningOnce(string message, string key = null)
-        {
-            if (Config.common.logLevel < LogLevel.Warning) return;
-            if (string.IsNullOrEmpty(key)) key = message;
-            if (!logWarningDict.Add(key)) return;
-            Debug.LogWarning($"AmaGDK {message}");
-        }
+            => GDKDebug.LogWarningOnce(message, key);
+    
+        [Obsolete("Deprecated method - use GDKDebug.LogWarning() instead!")]
         public static void LogWarning(string message)
-        {
-            if (Config.common.logLevel >= LogLevel.Warning) Debug.LogWarning($"AmaGDK {message}");
-        }
+            => GDKDebug.LogWarning(message);
+        
+        [Obsolete("Deprecated method - use GDKDebug.LogError() instead!")]
         public static void LogError(string message)
-        {
-            if (Config.common.logLevel >= LogLevel.Error) Debug.LogError($"AmaGDK {message}");
-            if (logNonfatalErrorHook == null) return;
-            GDKUtils.DoOnMainThread(() =>
-            {
-                if (nonFatalDict.Contains(message)) return; // LogOnce
-                nonFatalDict.Add(message);
-                logNonfatalErrorHook(message);    
-            });
-        }
+            => GDKDebug.LogError(message);
+        
+        [Obsolete("Deprecated method - use GDKDebug.Log() instead!")]
         public static void Log(string message)
-        {
-            if (Config.common.logLevel == LogLevel.Verbose) Debug.Log($"AmaGDK {message}");
-        }
+            => GDKDebug.Log(message);
     }
+    #endif
 
     public static class Forbidden
     {
@@ -141,7 +130,7 @@ namespace Amanotes.Core.Internal
                 }
 #endif
 
-                // Logging.LogWarning("Something wrong: another AmaGDK instance found!");
+                // LogWarning("Something wrong: another AmaGDK instance found!");
                 UnityObject.Destroy(result[i].gameObject);
             }
             
@@ -203,10 +192,10 @@ namespace Amanotes.Core.Internal
         public static void ThrowExceptionIfEditor(string message)
         {
             #if UNITY_EDITOR
-            throw new GDKException(message);
-            #else
-            Logging.LogError(message);
+            if (Application.isEditor) throw new GDKException(message);
             #endif
+            
+            LogError(message);
         }
         
         /// <summary>

package/Runtime/Internal/AmaGDK.Utils.cs

@@ -8,7 +8,7 @@ using System.Text;
 using System.Text.RegularExpressions;
 using UnityEngine;
 using UnityEngine.Profiling;
-using static Amanotes.Core.Internal.Logging;
+using static Amanotes.Core.GDKDebug;
 
 namespace Amanotes.Core.Internal
 {

package/Runtime/Internal/AmaGDK.WebUtils.cs

@@ -4,7 +4,7 @@ using System.Collections.Generic;
 using System.Text;
 using UnityEngine;
 using UnityEngine.Networking;
-using static Amanotes.Core.Internal.Logging;
+using static Amanotes.Core.GDKDebug;
 
 namespace Amanotes.Core.Internal
 {

package/Runtime/Internal/ForceQuitMonitor.cs

@@ -39,8 +39,13 @@ namespace Amanotes.Core.Internal
             }
         }
                 
-        private readonly ForceQuitData localData = new ForceQuitData();
-
+	    private readonly ForceQuitData localData = new ForceQuitData();
+        
+	    public ForceQuitMonitor()
+	    {
+	    	AmaGDK.Analytics.OnEventSent += OnLogEvent;
+	    }
+		
         private string GetStringValueOrDefault(Dictionary<string, object> dict, string key, string defaultValue = "")
         {
             return dict.TryGetValue(key, out object result) 

package/Runtime/Internal/GDKGeoLocationcs.cs

@@ -2,6 +2,7 @@ using System;
 using System.Collections;
 using UnityEngine;
 using UnityEngine.Networking;
+using static Amanotes.Core.GDKDebug;
 
 namespace Amanotes.Core.Internal
 {
@@ -39,7 +40,7 @@ namespace Amanotes.Core.Internal
             {
                 result?.Invoke(data.countryCode?.ToUpper());
                 if (data.errorMessage != null)
-                    Logging.Log(data.errorMessage);
+                    Log(data.errorMessage);
             });
         }
 

package/Runtime/Internal/GDKServerTime.cs

@@ -3,6 +3,7 @@ using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.Networking;
+using static Amanotes.Core.GDKDebug;
 
 namespace Amanotes.Core
 {
@@ -189,7 +190,7 @@ namespace Amanotes.Core.Internal
                 else
                 {
                     result?.Invoke(null);
-                    Logging.Log(data.errorMessage);
+                    Log(data.errorMessage);
                     FetchTimeWithOtherProvider();
                 }
             });

package/Runtime/Klavar/KlavarContainer.cs

@@ -1,8 +1,8 @@
 using System;
 using System.Reflection;
-using Amanotes.Core.Internal;
 using UnityEngine;
 using GUID = System.Guid;
+using static Amanotes.Core.GDKDebug;
 
 namespace Amanotes.Core
 {
@@ -26,10 +26,10 @@ namespace Amanotes.Core
         public static void ThrowIfEditor(string message)
         {
             #if UNITY_EDITOR
-            throw new KlavarException(message);
-            #else
-            Logging.LogError(message);
+            if (Application.isEditor) throw new KlavarException(message);
             #endif
+            
+            LogError(message);
         }
 
         public static void ThrowErrorOnField(object parent, FieldInfo fieldInfo, string message)

package/Runtime/UserProfile/Plugins/Android/AdvertisingIdFetcher.cs

@@ -1,6 +1,6 @@
 using System;
 using UnityEngine;
-using static Amanotes.Core.Internal.Logging;
+using static Amanotes.Core.GDKDebug;
 
 namespace Amanotes.Core
 {

package/Runtime/Utils/GDKUtils.cs

@@ -1,6 +1,6 @@
 using System;
 using UnityEngine;
-using static Amanotes.Core.Internal.Logging;
+using static Amanotes.Core.GDKDebug;
 
 namespace Amanotes.Core.Internal
 {
@@ -12,13 +12,13 @@ namespace Amanotes.Core.Internal
             
             if (Application.isEditor)
             {
-                action.Invoke();
+                action();
                 return;
             }
             
             try
             {
-                action.Invoke();
+                action();
             } catch (Exception e)
             {
                 LogError(e.ToString());
@@ -27,9 +27,40 @@ namespace Amanotes.Core.Internal
         
         public static void SafeInvoke<T>(Action<T> action, T eventObject)
         {
-            SafeInvoke(() => action?.Invoke(eventObject));
+            if (action == null) return;
+            
+            if (Application.isEditor)
+            {
+                action(eventObject);
+                return;
+            }
+            
+            try
+            {
+                action(eventObject);
+            } catch (Exception e)
+            {
+                LogError(e.ToString());
+            }
         }
         
+	    public static void SafeInvoke<T1, T2>(Action<T1, T2> action, T1 p1, T2 p2)
+	    {
+            if (Application.isEditor)
+            {
+                action(p1, p2);
+                return;
+            }
+            
+            try
+            {
+                action(p1, p2);
+            } catch (Exception e)
+            {
+                LogError(e.ToString());
+            }
+	    }
+        
         public static void ThrowExceptionInEditor<T>(string message, Func<string, T> exceptionCreator) where T: Exception
         {
             if (Application.isEditor)

package/package.json

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