com.amanotes.gdk 0.2.78 → 0.2.79-2

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## [0.2.79-2] - 2024-12-03
+- [Fix] IAP data sync with RevenueCat's customer info
+- [Fix] Do not set user of RevenueCat
+
+## [0.2.79] - 2024-11-13
+- [Dev] Add callbacks for IAP module
+- [Fix] Return empty collections instead of null in RevenueCatAdapter
+- [GameOps] Remove durationInSecs
+
 ## [0.2.78] - 2024-11-11
 - [Dev] Add iOS and Android ad unit configuration for MAX
 - [Dev] Track Adapters and Third-party packages used in games

package/Runtime/AmaGDK.IAP.cs

@@ -23,6 +23,67 @@ namespace Amanotes.Core
             public static readonly Dictionary<string, ProductInfo> AllProducts = new Dictionary<string, ProductInfo>();
             private const string DATE_FORMAT = "yyyy/MM/yy HH:mm:ss";
             
+            public static void SetCallback_OnModuleReady(Action onReady)
+            {
+                if (onReady == null) return;
+            
+                if (IsModuleReady)
+                {
+                    onReady();
+                    return;
+                }
+            
+                _onModuleReady -= onReady;
+                _onModuleReady += onReady;
+            }
+            
+            public static void SetCallback_OnGetProductsComplete(Action onComplete)
+            {
+                if (onComplete == null) return;
+            
+                if (isGetProductComplete)
+                {
+                    onComplete();
+                    return;
+                }
+            
+                _onGetProductsComplete -= onComplete;
+                _onGetProductsComplete += onComplete;
+            }
+            
+            public static void SetCallback_OnGetCustomerInfoComplete(Action onComplete)
+            {
+                if (onComplete == null) return;
+            
+                if (isGetCustomerInfoComplete)
+                {
+                    onComplete();
+                    return;
+                }
+            
+                _onGetCustomerInfoComplete -= onComplete;
+                _onGetCustomerInfoComplete += onComplete;
+            }
+
+            public static void SyncCustomerInfo(Action<bool> onComplete = null)
+            {
+                if (_adapter == null)
+                {
+                    onComplete?.Invoke(false);
+                    return;
+                }
+                _adapter.SyncCustomerInfo(success =>
+                {
+                    if (!success)
+                    {
+                        onComplete?.Invoke(false);
+                        return;
+                    }
+                    localData.Sync();
+                    onComplete?.Invoke(true);
+                });
+            }
+            
             public static ISetupBuilder GetProducts(bool appendExistingList = false)
             {
                 if (!appendExistingList)
@@ -129,6 +190,13 @@ namespace Amanotes.Core
                 }
             }
 
+            private static bool isGetProductComplete;
+            private static bool isGetCustomerInfoComplete;
+            private static bool IsModuleReady => isGetProductComplete && isGetCustomerInfoComplete;
+            private static Action _onGetProductsComplete;
+            private static Action _onGetCustomerInfoComplete;
+            private static Action _onModuleReady;
+
             internal static bool InitModule()
             {
                 _adapter = Adapter2.GetAdapter<IAPAdapter>();
@@ -140,8 +208,30 @@ namespace Amanotes.Core
             internal static void StartModule()
             {
                 if (_adapter == null) return;
-                localData.Sync();
-                if (Config.iap.autoGetProducts) GetProducts();
+                SyncCustomerInfo(
+                    success =>
+                    {
+                        isGetCustomerInfoComplete = true;
+                        GDKUtils.SafeInvokeAndClear(ref _onGetCustomerInfoComplete);
+                        if (IsModuleReady) GDKUtils.SafeInvokeAndClear(ref _onModuleReady);
+                    });
+                if (Config.iap.autoGetProducts)
+                {
+                    GetProducts()
+                        .OnSuccess(_ => OnGetProductsComplete())
+                        .OnFail(_ => OnGetProductsComplete());
+                }
+                else
+                {
+                    OnGetProductsComplete();
+                }
+            }
+
+            private static void OnGetProductsComplete()
+            {
+                isGetProductComplete = true;
+                GDKUtils.SafeInvokeAndClear(ref _onGetProductsComplete);
+                if (IsModuleReady) GDKUtils.SafeInvokeAndClear(ref _onModuleReady);
             }
         }
         
@@ -442,6 +532,7 @@ namespace Amanotes.Core.Internal
             if (ls == null || ls.Count == 0)
             {
                 LogWarning("There is no IAP product");
+                onSuccess?.Invoke(AllProducts);
                 return;
             }
             
@@ -506,8 +597,7 @@ namespace Amanotes.Core.Internal
                 {
                     foreach (var p in pList)
                     {
-                        if (AllProducts.ContainsKey(p.id)) AllProducts[p.id] = p;
-                        else AllProducts.Add(p.id, p);  
+                        AllProducts[p.id] = p;
                     }
                     GDKUtils.DelayCall(0f, GetNextProductsInQueue);
                 }, error => onFail?.Invoke(error));
@@ -573,5 +663,7 @@ namespace Amanotes.Core.Internal
         public abstract DateTime? GetUnsubscribedDate();
         public abstract HashSet<PurchaseRecord> GetPurchaseHistory();
         public abstract DateTime? GetLastPurchaseDate(string productAndPlanId);
+        
+        public abstract void SyncCustomerInfo(Action<bool> onComplete = null);
     }
 }

package/Runtime/AmaGDK.cs

@@ -27,7 +27,7 @@ namespace Amanotes.Core
 {
     public partial class AmaGDK : MonoBehaviour
     {
-        public const string VERSION = "0.2.78";
+        public const string VERSION = "0.2.79-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.78",
+    "version": "0.2.79-2",
     "displayName": "AmaGDK",
     "description": "Amanotes Game Development Kit",
     "unity": "2019.4",