com.amanotes.gdk 0.2.70-1 → 0.2.70-2

package/Runtime/Ad/AdLogic.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Collections;
 using UnityEngine;
 using static Amanotes.Core.Internal.Logging;
@@ -131,14 +132,9 @@ namespace Amanotes.Core.Internal
         private Coroutine _showAdRoutine;
         protected bool _isRequesting;
         protected bool _isInterstitial => adType == AdType.Interstitial;
-        private bool isFocus;
         
         public void StartShowAd()
         {
-            isFocus = false;
-            unityCallbacks.OnApplicationFocus -= OnApplicationFocus;
-            unityCallbacks.OnApplicationFocus += OnApplicationFocus;
-            
             if (_showState != ShowAdsState.None)
             {
                 LogWarning("[Ad] StartShowAd() --> Invalid _showState: " + _showState);
@@ -160,14 +156,6 @@ namespace Amanotes.Core.Internal
             _showAdRoutine = _instance.StartCoroutine(ShowAdRoutine());
         }
 
-        private void OnApplicationFocus(bool focus)
-        {
-            if (!focus) return;
-            
-            unityCallbacks.OnApplicationFocus -= OnApplicationFocus;
-            isFocus = true;
-        }
-
         public void StopShowAd()
         {
             Log($"[Ad] {adType} StopShowAd");
@@ -235,14 +223,61 @@ namespace Amanotes.Core.Internal
             _showState = ShowAdsState.Showing;
             OnAdShowReadyStatus(true, AdShowReadyStatus.Ready);
             TriggerBeforeAdShow();
+            #if !UNITY_EDITOR && UNITY_ANDROID
+            GDKUtils.StartCoroutine(HandleAdActivityKilledSilently());
+            #endif
             ShowAd();
 
             yield return WaitForMediationCallback();
             
-            // wait 1 frame in case hasReward callback after onClose
-            if (!context.hasReward && adType == AdType.VideoReward && !context.hasFailedOrCancelled) yield return null;
             ShowAdRoutineCompleted(context.isSuccess);
         }
+        
+        private IEnumerator WaitForMediationCallback()
+        {
+            while (context != null && !context.potentiallyCompleted)
+            {
+                yield return null;
+            }
+            // wait 1 frame in case hasReward callback after onClose
+            if (context != null && !context.hasReward && adType == AdType.VideoReward && !context.hasFailedOrCancelled) yield return null;
+        }
+
+        private IEnumerator HandleAdActivityKilledSilently()
+        {
+            bool hasOutOfFocus = false;
+            bool hasFocusAgain = false;
+            Action<bool> onApplicationFocusCallback = focus =>
+            {
+                if (focus)
+                {
+                    hasFocusAgain = true;
+                }
+                else
+                {
+                    hasOutOfFocus = true;
+                }
+            };
+            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;
+                }
+                yield return null;
+            }
+            unityCallbacks.OnApplicationFocus -= onApplicationFocusCallback;
+        }
 
         private void EndShowAdRoutineWithFailure(AdShowReadyStatus status)
         {
@@ -279,37 +314,6 @@ namespace Amanotes.Core.Internal
             }
         }
 
-        private IEnumerator WaitForMediationCallback()
-        {
-            #if !UNITY_EDITOR
-            while (!isFocus) yield return null; 
-            #endif
-            
-            int wait4CallbackCounter = 0;
-            while (!context.potentiallyCompleted && wait4CallbackCounter <= MAX_FRAMES_WAIT_FOR_CALLBACK)
-            {
-                wait4CallbackCounter++;
-                yield return null;
-            }
-            Log($"[Ad] Waiting for potentially completed callback: {wait4CallbackCounter} frames");
-            
-            if (!context.hasClosed) yield return WaitForAdClosedCallback();
-        }
-
-        private IEnumerator WaitForAdClosedCallback()
-        {
-            int counter = 0;
-            while (!context.hasClosed && counter <= MAX_FRAMES_WAIT_FOR_CALLBACK)
-            {
-                counter++;
-                yield return null;
-            }
-            Log($"[Ad] Waiting for ad closed callback: {counter} frames");
-            if (context.hasClosed) yield break;
-            LogWarning("[Ad] Force close ad (mediation missing OnAdClose callback)");
-            OnAdClosed();
-        }
-
         private void ShowAdRoutineCompleted(bool isSuccess)
         {
             if (_loadState == LoadAdsState.Ready)

package/Runtime/Ad/AdShowContext.cs

@@ -35,7 +35,7 @@ namespace Amanotes.Core.Internal
         }
 
         public bool hasFailedOrCancelled => (adCallback & (AdCallback.Fail | AdCallback.Cancel)) != 0;
-        public bool potentiallyCompleted => (adCallback & (AdCallback.Close | AdCallback.Fail | AdCallback.Reward | AdCallback.Cancel)) != 0;
+        public bool potentiallyCompleted => (adCallback & (AdCallback.Close | AdCallback.Fail | AdCallback.Cancel)) != 0;
         public bool hasReward => (adCallback & AdCallback.Reward) != 0;
         public bool hasClosed => (adCallback & AdCallback.Close) != 0;
         public bool hasClicked => (adCallback & AdCallback.Click) != 0;

package/Runtime/AmaGDK.cs

@@ -17,7 +17,7 @@ namespace Amanotes.Core
 {
     public partial class AmaGDK : MonoBehaviour
     {
-        public const string VERSION = "0.2.70-1";
+        public const string VERSION = "0.2.70-2";
         
         internal static Status _status = Status.None;
         private static ConfigAsset _config = null;

package/package.json

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