com.amanotes.gdk 0.2.70 → 0.2.71

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # Changelog
 
+## [0.2.71 - 2024-08-22]
+- [Dev] Add export stage to reduce pipeline build time
+- [Dev] Cache IL2CPP and Gradle user home
+- [Dev] Improve GDKPool performance main thread by using non-locking structure
+- [Fix] Accidental GC generated with SafeInvoke()
+- [Dev] Add capping config for interstitial
+- [Dev] Add event videoads_closed
+- [Klavar] GDUC 0.3.0
+- [Fix] Missing handle for Rectangle banner in IronSourceAdapter
+- [Feature] Add GDKAudio with Audio Time-Stretching Support
+- - Available on iOS, android, and Editor Apple silicon
+- [Fix] CI Job retry for Unity Editor stuck issue
+- [Dev] Reduce the unit test time
+- [Dev] Improve FirebaseAnalytics GC by reuse Parameter Array
+- [Feature] Add callback Analytics.OnEventSent
+- [Dev] Add support pod install and debug symbol generation in CI script
+- [Fix] Missing handler for various types in FirebaseAnalyticsAdapter
+
 ## [0.2.70 - 2024-08-02]
 - [Fix] onAdResult call multiple times
 - [Dev] Show SQLite analytics in GDK Inspector

package/Editor/Extra/GDKCIBuildCommand.cs

@@ -1,10 +1,12 @@
 using UnityEditor;
 using System.Linq;
 using System;
+using System.Diagnostics;
 using System.IO;
 using UnityEditor.Build;
 using UnityEditor.Build.Reporting;
 using UnityEngine;
+using Debug = UnityEngine.Debug;
 
 namespace Amanotes.Core
 {
@@ -18,8 +20,40 @@ namespace Amanotes.Core
         private const string ANDROID_BUNDLE_VERSION_CODE = "VERSION_BUILD_VAR";
         private const string ANDROID_APP_BUNDLE = "BUILD_APP_BUNDLE";
         private const string SCRIPTING_BACKEND_ENV_VAR = "SCRIPTING_BACKEND";
+        private const string EXPORT_ANDROID_PROJECT = "EXPORT_ANDROID_PROJECT";
         private const string VERSION_NUMBER_VAR = "VERSION_NUMBER_VAR";
         private const string VERSION_iOS = "VERSION_BUILD_VAR";
+        
+        public static void InstallPod(EventHandler processExit)
+        {
+            try
+            {
+                if (TryGetEnv("CI_SCRIPT_DIR", out string scriptDir))
+                {
+                    var startInfo = new ProcessStartInfo()
+                    {
+                        FileName = "/bin/bash",
+                        Arguments = $"{scriptDir}/utils.sh pod-install",
+                        CreateNoWindow = true
+                    };
+                    var proc = new Process
+                    {
+                        StartInfo = startInfo,
+                        EnableRaisingEvents = true
+                    };
+                    proc.Exited += processExit;
+                    proc.Start();
+                    proc.WaitForExit();
+                }
+                else
+                {
+                    Debug.Log("Failed to run pod install: $CI_SCRIPT_DIR not found");
+                }
+            } catch (Exception e)
+            {
+                Debug.LogError(e);
+            }
+        }
 
         static string GetArgument(string name)
         {
@@ -200,6 +234,8 @@ namespace Amanotes.Core
                 HandleAndroidAppBundle();
                 HandleAndroidBundleVersionCode();
                 HandleAndroidKeystore();
+                HandleDebugSymbols();
+                HandleExportAndroidProject();
             }
 
             var buildPath = GetBuildPath();
@@ -251,6 +287,16 @@ namespace Amanotes.Core
             }
         }
 
+        private static void HandleExportAndroidProject()
+        {
+            EditorUserBuildSettings.exportAsGoogleAndroidProject = false;
+            if (!TryGetEnv(EXPORT_ANDROID_PROJECT, out string stringValue)) return;
+            if (bool.TryParse(stringValue, out bool exportAndroidProject))
+            {
+                EditorUserBuildSettings.exportAsGoogleAndroidProject = exportAndroidProject;
+            }
+        }
+
         private static string GetIosVersion()
         {
             if (TryGetEnv(VERSION_iOS, out string value))
@@ -311,6 +357,15 @@ namespace Amanotes.Core
             PlayerSettings.Android.keystorePass = keystorePass;
             PlayerSettings.Android.keyaliasPass = keystoreAliasPass;
         }
+        
+        private static void HandleDebugSymbols()
+        {
+            #if UNITY_2021_1_OR_NEWER
+            EditorUserBuildSettings.androidCreateSymbols = AndroidCreateSymbols.Debugging;
+            #elif UNITY_2019_2_OR_NEWER
+            EditorUserBuildSettings.androidCreateSymbolsZip = true;
+            #endif
+        }
     }
     
     public class GDKPreProcessBuild: IPreprocessBuildWithReport

package/Runtime/Ad/AdModuleConfig.cs

@@ -1,8 +1,20 @@
-using System;
+using System;
 using UnityEngine;
 
 namespace Amanotes.Core.Internal
 {
+	[Serializable] public class AdCapping 
+	{
+		[Tooltip("Capping time (in seconds, default = 0s) since App Open.")]
+		public float sinceAppOpen = 0;
+		
+		[Tooltip("Capping time (in seconds, default = 15s) calculated since last interstitial closed.")]
+		public float sinceLastInterstitial = 15;
+		
+		[Tooltip("Capping time (in seconds, default = 10s) calculated since last video reward closed.")]
+		public float sinceLastVideoReward = 10;
+	}
+	
     [Serializable] public class AdModuleConfig
     {
         [Tooltip("Automatically retry requesting ad if an ad failed to response in this amount of time (in secs)")]
@@ -12,11 +24,14 @@ namespace Amanotes.Core.Internal
         public int adShowTimeoutInSecs = 5;
         
         [Tooltip("When an ad is not ready to show, verify that there is an internet connection by ping the internet check URL .\nIf there is no internet connection, we will not need to wait for adShowTimeout secs")]
-        public bool checkInternet = true;
-                
+	    public bool checkInternet = true;
+	    
         [NonSerialized] public bool enableInterstitial = true;
         [NonSerialized] public bool enableRewarded = true;
-        [NonSerialized] public bool enableBanner = true;
+	    [NonSerialized] public bool enableBanner = true;
+        
+	    [Tooltip("Capping configuration for Interstitial\n\n - All the conditions below must be satisfied for interstitial to show")]
+	    public AdCapping interstitialCapping;
         
         [Tooltip("Before showing an ad: set AudioListener.volume to 0\nAfter the ad is closed: restore the previously saved AudioListener.volume")]
         public bool autoMute = true;

package/Runtime/Ad/AmaGDK.Ads.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
@@ -46,7 +46,12 @@ namespace Amanotes.Core
             
             // persistent
             public int successTotal;
-            public int failedTotal;
+	        public int failedTotal;
+            
+	        internal bool IsCapped(float cappingTime)
+	        {
+	        	return (successTotal > 0) && (Time.realtimeSinceStartup - lastSuccessTime < cappingTime);
+	        }
         }
 
         [Serializable]
@@ -301,11 +306,18 @@ namespace Amanotes.Core
             /// <param name="interstitialCappingTime"></param>
             /// <param name="rewardedVideoCappingTime"></param>
             /// <returns></returns>
-            public static bool IsCapped(float interstitialCappingTime = 0, float rewardedVideoCappingTime = 0)
-            {
-                bool interCapped = (interstitialCappingTime > 0) && TimeSinceLastInterstitialSucceed < interstitialCappingTime;
-                bool rewardCapped = (rewardedVideoCappingTime > 0) && TimeSinceLastVideoRewardSucceed < rewardedVideoCappingTime;
-                return interCapped || rewardCapped;
+	        public static bool IsCapped(float? interstitialCappingTime = null, float? rewardedVideoCappingTime = null)
+	        {
+	        	var config = Config.ad.interstitialCapping;
+	        	
+	        	// cap by interstitial
+		        if (localData.interstitial.IsCapped(interstitialCappingTime ?? config.sinceLastInterstitial)) return true;
+		        
+		        // cap by rewarded video
+		        if (localData.reward.IsCapped(rewardedVideoCappingTime ?? config.sinceLastVideoReward)) return true;
+                
+		        // cap by app Open
+		        return Time.realtimeSinceStartup < config.sinceAppOpen;
             }
 
             public static int TimeSinceLastInterstitialSucceed => localData.TimeSinceLastShowSuccess(AdType.Interstitial);

package/Runtime/AmaGDK.Analytics.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Text;
@@ -15,6 +15,8 @@ namespace Amanotes.Core
         //PUBLIC APIS
         public static partial class Analytics
         {
+	        public static event Action<string, Dictionary<string, object>> OnEventSent;
+            
             public static bool HasMigrated => localData.migrationLog.count > 0;
             
             public static bool enableAnalyticsLog
@@ -23,9 +25,9 @@ namespace Amanotes.Core
                 get => Config.analytics.showAnalyticsLog;
             }
 
-            public interface IEventParamsBuilder { }            
+            public interface IEventParamsBuilder { }
 
-            public class EventParams : IEventParamsBuilder, IPoolItem
+            public class EventParams : IEventParamsBuilder, GDKPool.IPoolItem
             {
                 public string eventName { get; private set; }
                 public readonly Dictionary<string, object> parameters = new Dictionary<string, object>();
@@ -54,6 +56,7 @@ namespace Amanotes.Core
 
                 internal EventParams SetEventName(string eventName)
                 {
+	                // Debug.Log($"SetEventName --> {this} : {GetHashCode()}");
                     this.eventName = eventName;
                     return this;
                 }
@@ -71,6 +74,8 @@ namespace Amanotes.Core
                     
                     GDKPool.ReturnAndNullize(ref ignoreAdapterIds);
                     GDKPool.ReturnAndNullize(ref allowAdapterIds);
+                    
+                    //Debug.Log($"Reset --> {this} : {GetHashCode()}");
                     _detail = null;
                 }
                 
@@ -308,7 +313,6 @@ namespace Amanotes.Core
             internal static readonly List<AnalyticsAdapter> listAdapters = new List<AnalyticsAdapter>();
             internal static readonly AnalyticsData localData = new AnalyticsData().LoadJsonFromFile().BuildCache();
             internal static SessionStat sessionStat;
-            internal static readonly GDKPool.Pool<EventParams> epPool = new GDKPool.Pool<EventParams>(1);
             
             internal static readonly Dictionary<string, string> reservedPrefixes = new Dictionary<string, string>()
             {
@@ -373,7 +377,7 @@ namespace Amanotes.Core
             internal static EventParams PrepareEvent(string eventName)
             {
                 PrepareEventCheck(eventName);
-                var result = epPool.Get().SetEventName(eventName);
+                var result = GDKPool.Take<EventParams>().SetEventName(eventName);
                 PostPrepareEventProcess(result);
                 return result;
             }
@@ -382,7 +386,7 @@ namespace Amanotes.Core
             {
                 if (parameters == null) return PrepareEvent(eventName);
                 PrepareEventCheck(eventName);
-                var result = epPool.Get().SetEventName(eventName);
+                var result = GDKPool.Take<EventParams>().SetEventName(eventName);
                 result.AddParam(parameters);
                 PostPrepareEventProcess(result);
                 return result;
@@ -392,7 +396,7 @@ namespace Amanotes.Core
             {
                 if (parameters == null) return PrepareEvent(eventName);
                 PrepareEventCheck(eventName);
-                var result = epPool.Get().SetEventName(eventName);
+                var result = GDKPool.Take<EventParams>().SetEventName(eventName);
                 for (var i = 0; i < parameters.Length; i++)
                 {
                     result.AddParam(parameters[i].Item1, parameters[i].Item2);
@@ -412,11 +416,12 @@ namespace Amanotes.Core
                 while (eventQueue.TryDequeue(out var eventData))
                 {
                     if (eventData.isLoggedImmediately) continue;
-                    if (Config.analytics.immediatelyLoggedEvents.Contains(eventData.eventName))
-                        Utils.ThrowExceptionIfEditor($"This event '{eventData.eventName}' must be sent immediately by AmaGDK.Analytics.LogEvent(eventName).LogImmediately()");
-                    var (eventNameToSend, inUseAdapterIDs) = LogEventActually(eventData);
-                    sessionStat?.Add(eventNameToSend, eventData, inUseAdapterIDs);
-                    epPool.Return(eventData);
+	                if (Config.analytics.immediatelyLoggedEvents.Contains(eventData.eventName)){
+	                	Utils.ThrowExceptionIfEditor($"This event '{eventData.eventName}' must be sent immediately by AmaGDK.Analytics.LogEvent(eventName).LogImmediately()");
+	                }
+                    
+	                LogEventActually(eventData);
+                    GDKPool.Return(eventData);
                 }
 
                 localData.SaveIfDirty();
@@ -424,10 +429,10 @@ namespace Amanotes.Core
 				Profiler.EndSample();
             }
 
-            internal static (string eventNameToSend, List<string> inUseAdapterIDs) LogEventActually(EventParams eventParams)
+	        internal static void LogEventActually(EventParams eventParams)
             {
-                if (eventParams == null) return ("", null);
-                if (!ShouldSendEvent(eventParams)) return ("", null);
+	            if (eventParams == null) return;
+                if (!ShouldSendEvent(eventParams)) return;
                 var (countInSession, totalCount) = localData.IncreaseCounter(eventParams);
                 if (eventParams.accumulated || eventParams.parameters.ContainsKey("accumulated_count"))
                 {
@@ -442,9 +447,9 @@ namespace Amanotes.Core
                 {
                     Debug.Log($"AmaGDK [Analytics] Event <{eventNameToSend}> (in session: {countInSession}, total: {totalCount})\n{JsonUtils.DictionaryToJson(eventParams.parameters, true)}");
                 }
-                    
-                config.quality.CheckEventQuality(eventParams.eventName, eventParams.parameters);
-
+                
+	            config.quality.CheckEventQuality(eventParams.eventName, eventParams.parameters);
+	            
                 var inUseAdapterIDs = config.enableEventStat ? new List<string>(listAdapters.Count) : null;
                 foreach (AnalyticsAdapter m in listAdapters)
                 {
@@ -463,16 +468,15 @@ namespace Amanotes.Core
                     m.LogEvent(eventNameToSend, eventParams.parameters);
                     inUseAdapterIDs?.Add(m.adapterId);
                 }
-                ForceQuit.OnLogEvent(eventNameToSend, eventParams.parameters);
-
-                return (eventNameToSend, inUseAdapterIDs);
+                
+	            GDKUtils.SafeInvoke(OnEventSent, eventNameToSend, eventParams.parameters);
+	            sessionStat?.OnEventSent(eventNameToSend, eventParams.parameters, inUseAdapterIDs);
             }
-
+			
             internal static void LogEventImmediately(EventParams eventParams)
-            {
-                var (eventNameToSend, inUseAdapterIDs) = LogEventActually(eventParams);
-                sessionStat?.Add(eventNameToSend, eventParams, inUseAdapterIDs);
-                epPool.Return(eventParams);
+	        {
+	            LogEventActually(eventParams);
+                GDKPool.Return(eventParams);
                 sessionStat?.Save();
                 localData.SaveIfDirty();
             }
@@ -515,7 +519,7 @@ namespace Amanotes.Core
             {
                 Profiler.BeginSample("AmaGDK.Analytics.NormalizeEventName()");
                 {
-                    var warningLog = GDKPool.GetStringBuilder(8);
+                    var warningLog = GDKPool.TakeStringBuilder(8192);
                     NormalizeKeyString(ref eventName, warningLog, dryRun);
                     if (reservedEvents.Contains(eventName))
                     {
@@ -537,9 +541,9 @@ namespace Amanotes.Core
                 
                 Profiler.BeginSample("AmaGDK.Analytics.NormalizeKeyString()");
                 {
-                    var willLog = Config.common.logLevel != LogLevel.None;
-                    var tempLog = willLog ? GDKPool.GetStringBuilder() : null;
-                    var tempKey = GDKPool.GetStringBuilder();
+                    bool willLog = Config.common.logLevel != LogLevel.None;
+                    var tempLog = willLog ? GDKPool.TakeStringBuilder() : null;
+                    var tempKey = GDKPool.TakeStringBuilder();
                     
                     var hasChanged = false;
                     var trimKey = key.Trim();
@@ -688,20 +692,22 @@ namespace Amanotes.Core
             }
 
             [Serializable]
-            internal class EventStat
+	        internal class EventStat
             {
                 public string eventNameToSend;
+                public Dictionary<string, object> eventParams;
+                internal string eventParamsInJSON;
                 public List<string> adapters;
-                public string parameters;
 
-                public EventStat(string eventNameToSend, EventParams eventParams, List<string> adapterIDs)
+                public EventStat(string eventNameToSend, Dictionary<string, object> eventParams, List<string> adapterIDs)
                 {
                     this.eventNameToSend = eventNameToSend;
-                    parameters = JsonUtils.DictionaryToJson(eventParams.parameters);
+                    this.eventParams = eventParams;
+                    eventParamsInJSON = JsonUtils.DictionaryToJson(eventParams);
                     adapters = adapterIDs;
                 }
 
-                public void AppendAsTSV(StringBuilder sb)
+                internal void AppendAsTSV(StringBuilder sb)
                 {
                     sb.Append(eventNameToSend);
                     sb.Append("\t");
@@ -711,7 +717,7 @@ namespace Amanotes.Core
                         if (i < adapters.Count - 1) sb.Append(",");
                     }
                     sb.Append("\t");
-                    sb.Append(parameters);
+                    sb.AppendLine(eventParamsInJSON);
                 }
             }
 
@@ -866,15 +872,13 @@ namespace Amanotes.Core
                 private bool isFirstSave = true;
                 private StringBuilder contents = new StringBuilder(8192);
                 private readonly ConcurrentQueue<EventStat> lastFrameEventStats = new ConcurrentQueue<EventStat>();
-                internal readonly ConcurrentQueue<EventStat> savedEventStatsInLastFrame = new ConcurrentQueue<EventStat>();
-
-                internal void Add(string eventNameToSend, EventParams eventParams, List<string> adapterIDs)
-                {
-                    if (string.IsNullOrEmpty(eventNameToSend) || adapterIDs == null) return;
-                    var eventStat = new EventStat(eventNameToSend, eventParams, adapterIDs);
-                    lastFrameEventStats.Enqueue(eventStat);
-                }
-
+	            internal readonly ConcurrentQueue<EventStat> savedEventStatsInLastFrame = new ConcurrentQueue<EventStat>();
+                
+	            internal void OnEventSent(string eventName, Dictionary<string, object> eventParams, List<string> inUseAdapterIDs)
+	            {
+	            	lastFrameEventStats.Enqueue(new EventStat(eventName, eventParams, inUseAdapterIDs));
+	            }
+				
                 internal void Save()
                 {
                     contents.Clear();
@@ -979,7 +983,7 @@ namespace Amanotes.Core
             }
 
             eventData.overrideConfig = true;
-            eventData.ignoreAdapterIds ??= GDKPool.GetHashSet();
+            eventData.ignoreAdapterIds ??= GDKPool.TakeHashSet();
             
             foreach (string mId in analyticIds)
             {
@@ -1005,7 +1009,18 @@ namespace Amanotes.Core
             }
 
             eventData.overrideConfig = true;
-            eventData.allowAdapterIds ??= GDKPool.GetHashSet();
+            if (eventData.allowAdapterIds != null)
+            {
+                LogWarning($"OnlyTo() why should allowAdapterIds != null? ({eventData.allowAdapterIds.Count})");
+                return ap;
+            }
+            
+            eventData.allowAdapterIds = GDKPool.TakeHashSet();
+            if (eventData.allowAdapterIds.Count != 0)
+            {
+                Debug.Break();
+                throw new Exception($"GDKPool.TakeHashSet() should return empty HashSet! ({eventData.GetHashCode()})");
+            }
             
             foreach (string mId in analyticIds)
             {
@@ -1087,7 +1102,7 @@ namespace Amanotes.Core
         {
             string eventName = (ap as EventParams)?.eventName;
             
-            var sb = GDKPool.GetStringBuilder();
+            var sb = GDKPool.TakeStringBuilder();
             sb.Clear();
             NormalizeKeyString(ref key, sb, AmaGDK.Config.analytics.normalizeEventName);
             

package/Runtime/AmaGDK.Device.cs

@@ -67,14 +67,14 @@ namespace Amanotes.Core.Internal
             
             if (AmaGDK.Config.common.logLevel == LogLevel.Verbose)
             {
-                var stringBuilder = GDKPool.GetStringBuilder();
+                var stringBuilder = GDKPool.TakeStringBuilder();
                 stringBuilder.Append("Device info:");
                 stringBuilder.AppendLine("DeviceSpec: " + result);
                 stringBuilder.AppendLine("systemMemorySize: " + SystemInfo.systemMemorySize);
                 stringBuilder.AppendLine("processorCount: " + SystemInfo.processorCount);
                 stringBuilder.AppendLine("processorFrequency: " + SystemInfo.processorFrequency);
                 stringBuilder.AppendLine("graphicsMemorySize: " + SystemInfo.graphicsMemorySize);    
-                Logging.Log(GDKPool.ReturnString(stringBuilder));
+                Logging.Log(GDKPool.ReturnAndStringify(stringBuilder));
             }
             
             return result;

package/Runtime/AmaGDK.RemoteConfig.cs

@@ -214,7 +214,7 @@ namespace Amanotes.Core
                 Profiler.BeginSample("AmaGDK.RemoteConfig.SaveCache()");
                 
                 _fetchState = FetchState.SaveCache;
-                StringBuilder sb = GDKPool.GetStringBuilder(8);
+                StringBuilder sb = GDKPool.TakeStringBuilder(8192);
                 
                 //Add embedded remote config version to force load from embedded config after app update
                 sb.AppendLine($"{VERSION_PREFIX}{EmbedVersion}");

package/Runtime/AmaGDK.cs

@@ -17,7 +17,7 @@ namespace Amanotes.Core
 {
     public partial class AmaGDK : MonoBehaviour
     {
-        public const string VERSION = "0.2.70";
+        public const string VERSION = "0.2.71";
         
         internal static Status _status = Status.None;
         private static ConfigAsset _config = null;
@@ -176,7 +176,7 @@ namespace Amanotes.Core
             }
             
             var startTime = Time.realtimeSinceStartup;
-            var sb = GDKPool.GetStringBuilder();
+	        var sb = GDKPool.TakeStringBuilder(1024);
 
             InitModules();
             

package/Runtime/AnalyticQualityAsset.cs

@@ -4,6 +4,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using UnityEngine;
+using UnityEngine.Assertions;
 using static Amanotes.Core.Internal.Logging;
 #if UNITY_EDITOR
 using UnityEditor;
@@ -83,11 +84,11 @@ namespace Amanotes.Core
 
         internal void ValidateParams(string eventName, Dictionary<string, object> eventParams)
         {
-            var logBuilder = GDKPool.GetStringBuilder();
+            var logBuilder = GDKPool.TakeStringBuilder();
             
             logBuilder.AppendLine($"Analytics quality violation found for event <{eventName}>");
             var isValid = true;
-            HashSet<string> checkedParameters = GDKPool.GetHashSet();
+            HashSet<string> checkedParameters = GDKPool.TakeHashSet();
 
             foreach (var kvp in DicParam)
             {
@@ -182,7 +183,7 @@ namespace Amanotes.Core
         [ContextMenu("Validate Unique EventNames")]
         private void ValidateUniqueEventNames()
         {
-            HashSet<string> eventNames = GDKPool.GetHashSet();
+            HashSet<string> eventNames = GDKPool.TakeHashSet();
             
             lstEvent = lstEvent.OrderBy(evt => evt.eventName).ToList();
             
@@ -192,7 +193,7 @@ namespace Amanotes.Core
 
                 if (!eventNames.Add(eventQuality.eventName)) Debug.LogWarning($"Duplicate event name found: {eventQuality.eventName}. Event names must be unique.");
 
-                HashSet<string> paramNames = GDKPool.GetHashSet();
+                HashSet<string> paramNames = GDKPool.TakeHashSet();
                 
                 eventQuality.lstParam = eventQuality.lstParam.OrderBy(param => param.paramName).ToList();
                 

package/Runtime/AudioToolkit/Plugins/AudioDeviceDetector.cs

@@ -176,7 +176,7 @@ namespace Amanotes.Core
                 {
                     if (sb == null)
                     {
-                        sb = GDKPool.GetStringBuilder();
+                        sb = GDKPool.TakeStringBuilder();
                         sb.Append(str, 0, i);
                     }
                     
@@ -194,7 +194,7 @@ namespace Amanotes.Core
                 }
             }
             
-            return sb == null ? str : GDKPool.ReturnString(sb);
+            return sb == null ? str : GDKPool.ReturnAndStringify(sb);
         }
     }