com.amanotes.gdk 0.2.85 → 0.2.87

package/Runtime/Ad/AdLogic.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections;
+using System.Collections.Generic;
 using UnityEngine;
 using static Amanotes.Core.GDKDebug;
 using static Amanotes.Core.AmaGDK;
@@ -69,55 +70,72 @@ namespace Amanotes.Core.Internal
             {
                 yield return wait1Sec;
 
-                if (!Ads.allowAdRequest)
-                {
-                    Log("[Ad] LoadAdRoutine: allowAdRequest = false");
-                    continue;
-                }
+                if (!CanRequestAd()) continue;
 
-                if (!HasLocalNetworkConnection)
+                yield return ProcessAdRequest();
+                if (isAdReady)
                 {
-                    Log("[Ad] LoadAdRoutine: hasInternet = " + HasLocalNetworkConnection);
-                    continue;
+                    _loadState = LoadAdsState.Ready;
+                    Log("[Ad] LoadAdRoutine: Ad is ready!");
+                    yield break;
                 }
+            }
+        }
 
-                _loadState = LoadAdsState.Requesting;
-                _isRequesting = true;
-                Log("[Ad] LoadAdRoutine: RequestAd()");
-                RequestAd();
-                dispatcher.Dispatch(
-                    _isInterstitial ? AmaGDK.Event.INTER_REQUEST : AmaGDK.Event.REWARD_REQUEST
-                );
+        private bool CanRequestAd()
+        {
+            if (!Ads.allowAdRequest)
+            {
+                Log("[Ad] LoadAdRoutine: allowAdRequest = false");
+                return false;
+            }
 
-                int timeout = Config.ad.adLoadTimeoutInSecs;
-                var counter = 0;
+            if (!HasLocalNetworkConnection)
+            {
+                Log("[Ad] LoadAdRoutine: hasInternet = " + HasLocalNetworkConnection);
+                return false;
+            }
+            return true;
+        }
 
-                while (counter < timeout || timeout == -1)
-                {
-                    yield return wait1Sec;
-                    counter++;
-                    if (_isRequesting == false) break;
-                }
+        private IEnumerator ProcessAdRequest()
+        {
+            _loadState = LoadAdsState.Requesting;
+            _isRequesting = true;
+            Log("[Ad] LoadAdRoutine: RequestAd()");
+            RequestAd();
+            dispatcher.Dispatch(
+                _isInterstitial ? AmaGDK.Event.INTER_REQUEST : AmaGDK.Event.REWARD_REQUEST
+            );
 
-                if (counter > timeout && timeout > 0) // timeout
-                {
-                    Log("[Ad] LoadAdRoutine: RequestAd not responding (timeout) " + timeout + " secs");
-                    continue;
-                }
-                
-                // request should be completed here!
-                if (!isAdReady)
-                {
-                    LogWarning($"[Ad] Request complete but failed! (load duration = {counter} secs)");
-                    continue;
-                }
+            yield return WaitForAdRequestCompletion();
+        }
 
-                _loadState = LoadAdsState.Ready;
-                Log($"[Ad] LoadAdRoutine: Ad is ready! (load duration = {counter} secs)");
-                yield break;
+        private IEnumerator WaitForAdRequestCompletion()
+        {
+            var wait1Sec = new WaitForSecondsRealtime(1f);
+            int timeout = Config.ad.adLoadTimeoutInSecs;
+            var counter = 0;
+
+            while (counter < timeout || timeout == -1)
+            {
+                yield return wait1Sec;
+                counter++;
+                if (_isRequesting == false) break;
+            }
+
+            if (counter > timeout && timeout > 0)
+            {
+                Log("[Ad] LoadAdRoutine: RequestAd not responding (timeout) " + timeout + " secs");
+            }
+            else if (!isAdReady)
+            {
+                LogWarning($"[Ad] Request complete but failed! (load duration = {counter} secs)");
             }
         }
 
+
+
         bool HasLocalNetworkConnection => Application.internetReachability != NetworkReachability.NotReachable;
 
         // Override by actual Ad instance
@@ -188,38 +206,48 @@ namespace Amanotes.Core.Internal
             // Wait for Ad
             if (!isAdReady)
             {
-                if (_loadState == LoadAdsState.Ready)
-                {
-                    LogWarning("[Ad] Inconsistent state report: isAdReady == false while _loadState == Ready");
-                    _loadState = LoadAdsState.None;
-                }
+                yield return HandleNotReadyAd();
+                if (_showState == ShowAdsState.ShowFail) yield break;
+            }
 
-                if (!HasLocalNetworkConnection)
-                {
-                    EndShowAdRoutineWithFailure(AdShowReadyStatus.Wifi3GDisabled);
-                    yield break;
-                }
+            yield return ExecuteAdShow();
+        }
 
-                int timeout = Config.ad.adShowTimeoutInSecs;
-                if (timeout == 0) // do not wait for Ad
-                {
-                    EndShowAdRoutineWithFailure(AdShowReadyStatus.TimeOut);
-                    yield break;
-                }
+        private IEnumerator HandleNotReadyAd()
+        {
+            if (_loadState == LoadAdsState.Ready)
+            {
+                LogWarning("[Ad] Inconsistent state report: isAdReady == false while _loadState == Ready");
+                _loadState = LoadAdsState.None;
+            }
 
-                _showState = ShowAdsState.WaitForAd;
-                OnAdShowReadyStatus(false, AdShowReadyStatus.WaitForAd);
+            if (!HasLocalNetworkConnection)
+            {
+                EndShowAdRoutineWithFailure(AdShowReadyStatus.Wifi3GDisabled);
+                yield break;
+            }
 
-                yield return WaitForAdReadyWithTimeout(timeout);
-                
-                if (!isAdReady)
-                {
-                    Log("[Ad] WaitForAd failed (timeout) " + " | timeout = " + timeout + " secs");
-                    EndShowAdRoutineWithFailure(AdShowReadyStatus.TimeOut);
-                    yield break;
-                }
+            int timeout = Config.ad.adShowTimeoutInSecs;
+            if (timeout == 0) // do not wait for Ad
+            {
+                EndShowAdRoutineWithFailure(AdShowReadyStatus.TimeOut);
+                yield break;
+            }
+
+            _showState = ShowAdsState.WaitForAd;
+            OnAdShowReadyStatus(false, AdShowReadyStatus.WaitForAd);
+
+            yield return WaitForAdReadyWithTimeout(timeout);
+            
+            if (!isAdReady)
+            {
+                Log("[Ad] WaitForAd failed (timeout) " + " | timeout = " + timeout + " secs");
+                EndShowAdRoutineWithFailure(AdShowReadyStatus.TimeOut);
             }
+        }
 
+        private IEnumerator ExecuteAdShow()
+        {
             _showState = ShowAdsState.Showing;
             OnAdShowReadyStatus(true, AdShowReadyStatus.Ready);
             TriggerBeforeAdShow();
@@ -241,38 +269,56 @@ namespace Amanotes.Core.Internal
             if (context != null && !context.hasReward && adType == AdType.VideoReward && !context.hasFailedOrCancelled) yield return null;
         }
 
+        private class FocusState
+        {
+            public bool hasOutOfFocus = false;
+            public bool hasFocusAgain = false;
+        }
+
         private IEnumerator HandleAdActivityKilledSilently()
         {
-            bool hasOutOfFocus = false;
-            bool hasFocusAgain = false;
-            Action<bool> onApplicationFocusCallback = focus =>
-            {
-                if (focus)
-                {
-                    hasFocusAgain = true;
-                }
-                else
-                {
-                    hasOutOfFocus = true;
-                }
-            };
+            var focusState = new FocusState();
+            Action<bool> onApplicationFocusCallback = focus => UpdateFocusState(focus, focusState);
+            
             unityCallbacks.OnApplicationFocus += onApplicationFocusCallback;
+            yield return MonitorAdActivity(focusState);
+            unityCallbacks.OnApplicationFocus -= onApplicationFocusCallback;
+        }
+
+        private void UpdateFocusState(bool focus, FocusState focusState)
+        {
+            if (focus)
+            {
+                focusState.hasFocusAgain = true;
+            }
+            else
+            {
+                focusState.hasOutOfFocus = true;
+            }
+        }
+
+        private IEnumerator MonitorAdActivity(FocusState focusState)
+        {
             while (context != null && !context.potentiallyCompleted)
             {
-                if (hasFocusAgain && hasOutOfFocus)
+                if (focusState.hasFocusAgain && focusState.hasOutOfFocus)
                 {
-                    // 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 HandleFocusRegained();
+                    if (context == null || context.potentiallyCompleted) break;
                 }
                 yield return null;
             }
-            unityCallbacks.OnApplicationFocus -= onApplicationFocusCallback;
+        }
+
+        private IEnumerator HandleFocusRegained()
+        {
+            // 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();
+            }
         }
         
         private void StopHandleAdActivityKilledRoutine()
@@ -304,19 +350,28 @@ namespace Amanotes.Core.Internal
                 counter++;
                 Log($"[Ad] Waiting for ad {counter} secs");
 
-                // finish checking internet & result is false
-                if (adConfig.checkInternet && hasInternet == false)
-                {
-                    Log("[Ad] Stop WaitForAd : No internet!");
-                    EndShowAdRoutineWithFailure(AdShowReadyStatus.NoInternet);
-                    yield break;
-                }
+                if (ShouldStopWaitingForInternet(hasInternet)) yield break;
+                if (IsAdLoadReady(counter, timeout)) break;
+            }
+        }
 
-                if (_loadState != LoadAdsState.Ready) continue;
-                Log("[Ad] WaitForAd success after " + counter + " | timeout = " + timeout + " secs");
-                break;
+        private bool ShouldStopWaitingForInternet(bool? hasInternet)
+        {
+            if (adConfig.checkInternet && hasInternet == false)
+            {
+                Log("[Ad] Stop WaitForAd : No internet!");
+                EndShowAdRoutineWithFailure(AdShowReadyStatus.NoInternet);
+                return true;
             }
-        }        
+            return false;
+        }
+
+        private bool IsAdLoadReady(int counter, int timeout)
+        {
+            if (_loadState != LoadAdsState.Ready) return false;
+            Log("[Ad] WaitForAd success after " + counter + " | timeout = " + timeout + " secs");
+            return true;
+        }
         
         private void ShowAdRoutineCompleted(bool isSuccess)
         {
@@ -329,8 +384,15 @@ namespace Amanotes.Core.Internal
 
             _showState = isSuccess ? ShowAdsState.ShowSuccess : ShowAdsState.ShowFail;
 
+            UpdateAdStatistics(isSuccess);
+            TriggerOnAfterAdShow();
             
+            var currentContext = ProcessAdContext(isSuccess);
+            CompleteAdRoutine(currentContext, isSuccess);
+        }
 
+        private void UpdateAdStatistics(bool isSuccess)
+        {
             var localData = Ads.localData;
             var stat = _isInterstitial ? localData.interstitial : localData.reward;
             if (isSuccess)
@@ -343,15 +405,31 @@ namespace Amanotes.Core.Internal
                 stat.failed++;
                 stat.failedTotal++;
             }
-
             localData.Save();
-            TriggerOnAfterAdShow();
+        }
 
-            Log($"[Ad] {adType} ShowAdRoutineCompleted: {isSuccess}\n{JsonUtility.ToJson(Ads.context)}");
+        private AdShowContext ProcessAdContext(bool isSuccess)
+        {
+            var currentContext = Ads.context;
+            Log($"[Ad] {adType} ShowAdRoutineCompleted: {isSuccess}\n{(currentContext != null ? JsonUtility.ToJson(currentContext) : "Context is null")}");
             
+            // Fix: https://amanotes.sentry.io/issues/6366233489/events/0f3f58d81f0848b9bdbf1fd3e4a8161f/   
+            if (currentContext != null)
+            {
+                currentContext.showFinishAt = Time.realtimeSinceStartup;
+            }
+            return currentContext;
+        }
+
+        private void CompleteAdRoutine(AdShowContext currentContext, bool isSuccess)
+        {
+            Action<bool> resultCallback = null;
+            if (currentContext != null)
+            {
+                resultCallback = currentContext.onAdResult;
+            }
+
             // Extra callback
-            context.showFinishAt = Time.realtimeSinceStartup;
-            var resultCallback = context.onAdResult;
             Ads.context = null;
             _showState = ShowAdsState.None;
             resultCallback?.Invoke(isSuccess);
@@ -361,60 +439,60 @@ namespace Amanotes.Core.Internal
         {
             if (Application.platform == RuntimePlatform.IPhonePlayer)
             {
-                bool willSaveVolume = Config.ad.autoMute
-                    && AudioListener.volume > 0
-                    && Ads._savedVolume < 0;
+                HandleVolumeAndTimeScale();
+            }
 
-                bool willSaveTimeScale = Config.ad.autoTimeScale
-                    && Time.timeScale > 0
-                    && Ads._savedTimeScale < 0;
+            dispatcher.Dispatch(_isInterstitial ? AmaGDK.Event.INTER_SHOW_BEGIN : AmaGDK.Event.REWARD_VIDEO_SHOW_BEGIN);
+            Ads.context.onBeforeAdOpen?.Invoke();
+        }
 
-                if (willSaveVolume)
-                {
-                    Ads._savedVolume = AudioListener.volume;
-                    AudioListener.volume = 0;
-                }
+        private void HandleVolumeAndTimeScale()
+        {
+            bool willSaveVolume = Config.ad.autoMute && AudioListener.volume > 0 && Ads._savedVolume < 0;
+            bool willSaveTimeScale = Config.ad.autoTimeScale && Time.timeScale > 0 && Ads._savedTimeScale < 0;
 
-                if (willSaveTimeScale)
-                {
-                    Ads._savedTimeScale = Time.timeScale;
-                    Time.timeScale = 0;
-                }
+            if (willSaveVolume)
+            {
+                Ads._savedVolume = AudioListener.volume;
+                AudioListener.volume = 0;
             }
 
-            dispatcher.Dispatch(_isInterstitial ? AmaGDK.Event.INTER_SHOW_BEGIN : AmaGDK.Event.REWARD_VIDEO_SHOW_BEGIN);
-            Ads.context.onBeforeAdOpen?.Invoke();
+            if (willSaveTimeScale)
+            {
+                Ads._savedTimeScale = Time.timeScale;
+                Time.timeScale = 0;
+            }
         }
 
         private void TriggerOnAfterAdShow()
         {
             if (Application.platform == RuntimePlatform.IPhonePlayer)
             {
-                bool willRestoreVolume = Config.ad.autoMute
-                    && Mathf.Approximately(AudioListener.volume, 0)
-                    && Ads._savedVolume > 0;
-
-                bool willRestoreTimeScale = Config.ad.autoTimeScale
-                    && Mathf.Approximately(Time.timeScale, 0)
-                    && Ads._savedTimeScale > 0;
-
-                if (willRestoreVolume)
-                {
-                    AudioListener.volume = Ads._savedVolume;
-                    Ads._savedVolume = -1;
-                }
-
-                if (willRestoreTimeScale)
-                {
-                    Time.timeScale = Ads._savedTimeScale;
-                    Ads._savedTimeScale = -1;
-                }   
+                RestoreVolumeAndTimeScale();
             }
             
             bool isSuccess = _showState == ShowAdsState.ShowSuccess;
             dispatcher.Dispatch(_isInterstitial ? AmaGDK.Event.INTER_SHOW_END : AmaGDK.Event.REWARD_VIDEO_SHOW_END, isSuccess);
         }
 
+        private void RestoreVolumeAndTimeScale()
+        {
+            bool willRestoreVolume = Config.ad.autoMute && Mathf.Approximately(AudioListener.volume, 0) && Ads._savedVolume > 0;
+            bool willRestoreTimeScale = Config.ad.autoTimeScale && Mathf.Approximately(Time.timeScale, 0) && Ads._savedTimeScale > 0;
+
+            if (willRestoreVolume)
+            {
+                AudioListener.volume = Ads._savedVolume;
+                Ads._savedVolume = -1;
+            }
+
+            if (willRestoreTimeScale)
+            {
+                Time.timeScale = Ads._savedTimeScale;
+                Ads._savedTimeScale = -1;
+            }
+        }
+
         // Default implementation
         protected void OnAdClosed()
         {
@@ -485,6 +563,13 @@ namespace Amanotes.Core.Internal
             }
         }
 
+        private static readonly HashSet<AdShowReadyStatus> NotReadyStatuses = new HashSet<AdShowReadyStatus>
+        {
+            AdShowReadyStatus.NoInternet,
+            AdShowReadyStatus.TimeOut,
+            AdShowReadyStatus.Wifi3GDisabled
+        };
+
         protected void OnAdShowReadyStatus(bool isReady, AdShowReadyStatus status)
         {
             if (Ads.context == null)
@@ -495,17 +580,14 @@ namespace Amanotes.Core.Internal
 
             Ads.context.adCallback |= AdCallback.ShowReadyStatus;
             Ads.context.onAdShowReadyStatus?.Invoke(status);
+            
             if (status == AdShowReadyStatus.Ready)
             {
-                dispatcher.Dispatch(
-                    _isInterstitial ? AmaGDK.Event.INTER_SHOW_READY : AmaGDK.Event.REWARD_VIDEO_SHOW_READY
-                );
-            } else if (status == AdShowReadyStatus.NoInternet || status == AdShowReadyStatus.TimeOut || status == AdShowReadyStatus.Wifi3GDisabled)
+                dispatcher.Dispatch(_isInterstitial ? AmaGDK.Event.INTER_SHOW_READY : AmaGDK.Event.REWARD_VIDEO_SHOW_READY);
+            }
+            else if (NotReadyStatuses.Contains(status))
             {
-                dispatcher.Dispatch(
-                    _isInterstitial ? AmaGDK.Event.INTER_SHOW_NOT_READY : AmaGDK.Event.REWARD_VIDEO_SHOW_NOT_READY,
-                    status
-                );
+                dispatcher.Dispatch(_isInterstitial ? AmaGDK.Event.INTER_SHOW_NOT_READY : AmaGDK.Event.REWARD_VIDEO_SHOW_NOT_READY, status);
             }
         }
         

package/Runtime/AmaGDK.Adapters.cs

@@ -63,6 +63,8 @@ namespace Amanotes.Core.Internal
                 return false;
             }
             
+            Log($"Registering Adapter<{id}>");
+            
             var adapter = AmaGDK.Config.GetFieldValue<Adapter2>(id);
             if (adapter == null)
             {