Fix BillingResult ObjectDisposedException using GC.KeepAlive approach

Co-authored-by: jonathanpeppers <[email protected]>

Author: Copilot

source/com.android.billingclient/billing/Additions/Additions.cs

@@ -65,7 +65,7 @@ public void SetListener(Action<BillingResult, IList<Purchase>> handler)
             }
         }
 
-        public Task<BillingResult> AcknowledgePurchaseAsync(AcknowledgePurchaseParams acknowledgePurchaseParams)
+        public async Task<BillingResult> AcknowledgePurchaseAsync(AcknowledgePurchaseParams acknowledgePurchaseParams)
         {
             var tcs = new TaskCompletionSource<BillingResult>();
 
@@ -76,10 +76,12 @@ public Task<BillingResult> AcknowledgePurchaseAsync(AcknowledgePurchaseParams ac
 
             AcknowledgePurchase(acknowledgePurchaseParams, listener);
 
-            return tcs.Task;
+            var result = await tcs.Task;
+            GC.KeepAlive(listener);
+            return result;
         }
 
-        public Task<ConsumeResult> ConsumeAsync(ConsumeParams consumeParams)
+        public async Task<ConsumeResult> ConsumeAsync(ConsumeParams consumeParams)
         {
             var tcs = new TaskCompletionSource<ConsumeResult>();
 
@@ -94,7 +96,9 @@ public Task<ConsumeResult> ConsumeAsync(ConsumeParams consumeParams)
 
             Consume(consumeParams, listener);
 
-            return tcs.Task;
+            var result = await tcs.Task;
+            GC.KeepAlive(listener);
+            return result;
         }
 
         const string QueryPurchaseHistoryNotSupported = "QueryPurchaseHistory method was removed in Billing Client v8.0.0. Use QueryPurchasesAsync instead. See: https://developer.android.com/google/play/billing/migrate";
@@ -125,7 +129,7 @@ public Task<QuerySkuDetailsResult> QuerySkuDetailsAsync(SkuDetailsParams skuDeta
             throw new NotSupportedException(QuerySkuDetailsNotSupported);
         }
 
-        public Task<QueryProductDetailsResult> QueryProductDetailsAsync(QueryProductDetailsParams productDetailsParams)
+        public async Task<QueryProductDetailsResult> QueryProductDetailsAsync(QueryProductDetailsParams productDetailsParams)
         {
             var tcs = new TaskCompletionSource<QueryProductDetailsResult>();
 
@@ -136,10 +140,12 @@ public Task<QueryProductDetailsResult> QueryProductDetailsAsync(QueryProductDeta
 
             QueryProductDetails(productDetailsParams, listener);
 
-            return tcs.Task;
+            var result = await tcs.Task;
+            GC.KeepAlive(listener);
+            return result;
         }
 
-        public Task<QueryPurchasesResult> QueryPurchasesAsync(QueryPurchasesParams purchasesParams)
+        public async Task<QueryPurchasesResult> QueryPurchasesAsync(QueryPurchasesParams purchasesParams)
         {
             var tcs = new TaskCompletionSource<QueryPurchasesResult>();
 
@@ -154,10 +160,12 @@ public Task<QueryPurchasesResult> QueryPurchasesAsync(QueryPurchasesParams purch
 
             QueryPurchases(purchasesParams, listener);
 
-            return tcs.Task;
+            var result = await tcs.Task;
+            GC.KeepAlive(listener);
+            return result;
         }
 
-        public Task<BillingResult> StartConnectionAsync(Action onDisconnected = null)
+        public async Task<BillingResult> StartConnectionAsync(Action onDisconnected = null)
         {
             var tcs = new TaskCompletionSource<BillingResult>();
 
@@ -174,7 +182,9 @@ public Task<BillingResult> StartConnectionAsync(Action onDisconnected = null)
 
             StartConnection(listener);
 
-            return tcs.Task;
+            var result = await tcs.Task;
+            GC.KeepAlive(listener);
+            return result;
         }
 
         public void StartConnection(Action<BillingResult> setupFinished, Action onDisconnected)
@@ -196,15 +206,7 @@ internal class InternalAcknowledgePurchaseResponseListener : Java.Lang.Object, I
         public Action<BillingResult> AcknowledgePurchaseResponseHandler { get; set; }
 
         public void OnAcknowledgePurchaseResponse(BillingResult result)
-        {
-            // Create a copy of the BillingResult to ensure it stays alive after the callback
-            var resultCopy = BillingResult.NewBuilder()
-                .SetResponseCode((int)result.ResponseCode)
-                .SetDebugMessage(result.DebugMessage)
-                .SetOnPurchasesUpdatedSubResponseCode(result.OnPurchasesUpdatedSubResponseCode)
-                .Build();
-            AcknowledgePurchaseResponseHandler?.Invoke(resultCopy);
-        }
+            => AcknowledgePurchaseResponseHandler?.Invoke(result);
     }
 
     internal class InternalBillingClientStateListener : Java.Lang.Object, IBillingClientStateListener
@@ -217,76 +219,36 @@ public void OnBillingServiceDisconnected()
             => BillingServiceDisconnectedHandler?.Invoke();
 
         public void OnBillingSetupFinished(BillingResult result)
-        {
-            // Create a copy of the BillingResult to ensure it stays alive after the callback
-            var resultCopy = BillingResult.NewBuilder()
-                .SetResponseCode((int)result.ResponseCode)
-                .SetDebugMessage(result.DebugMessage)
-                .SetOnPurchasesUpdatedSubResponseCode(result.OnPurchasesUpdatedSubResponseCode)
-                .Build();
-            BillingSetupFinishedHandler?.Invoke(resultCopy);
-        }
+            => BillingSetupFinishedHandler?.Invoke(result);
     }
 
     internal class InternalConsumeResponseListener : Java.Lang.Object, IConsumeResponseListener
     {
         public Action<BillingResult, string> ConsumeResponseHandler { get; set; }
         public void OnConsumeResponse(BillingResult result, string str)
-        {
-            // Create a copy of the BillingResult to ensure it stays alive after the callback
-            var resultCopy = BillingResult.NewBuilder()
-                .SetResponseCode((int)result.ResponseCode)
-                .SetDebugMessage(result.DebugMessage)
-                .SetOnPurchasesUpdatedSubResponseCode(result.OnPurchasesUpdatedSubResponseCode)
-                .Build();
-            ConsumeResponseHandler?.Invoke(resultCopy, str);
-        }
+            => ConsumeResponseHandler?.Invoke(result, str);
     }
 
     internal class InternalPriceChangeConfirmationListener : Java.Lang.Object //, IPriceChangeConfirmationListener
     {
         public Action<BillingResult> PriceChangeConfirmationHandler { get; set; }
         public void OnPriceChangeConfirmationResult(BillingResult result)
-        {
-            // Create a copy of the BillingResult to ensure it stays alive after the callback
-            var resultCopy = BillingResult.NewBuilder()
-                .SetResponseCode((int)result.ResponseCode)
-                .SetDebugMessage(result.DebugMessage)
-                .SetOnPurchasesUpdatedSubResponseCode(result.OnPurchasesUpdatedSubResponseCode)
-                .Build();
-            PriceChangeConfirmationHandler?.Invoke(resultCopy);
-        }
+            => PriceChangeConfirmationHandler?.Invoke(result);
     }
 
     internal class InternalPurchaseHistoryResponseListener : Java.Lang.Object, IPurchaseHistoryResponseListener
     {
         public Action<BillingResult, IList<PurchaseHistoryRecord>> PurchaseHistoryResponseHandler { get; set; }
 
         public void OnPurchaseHistoryResponse(BillingResult result, IList<PurchaseHistoryRecord> history)
-        {
-            // Create a copy of the BillingResult to ensure it stays alive after the callback
-            var resultCopy = BillingResult.NewBuilder()
-                .SetResponseCode((int)result.ResponseCode)
-                .SetDebugMessage(result.DebugMessage)
-                .SetOnPurchasesUpdatedSubResponseCode(result.OnPurchasesUpdatedSubResponseCode)
-                .Build();
-            PurchaseHistoryResponseHandler?.Invoke(resultCopy, history);
-        }
+            => PurchaseHistoryResponseHandler?.Invoke(result, history);
     }
 
     internal class InternalPurchasesUpdatedListener : Java.Lang.Object, IPurchasesUpdatedListener
     {
         public Action<BillingResult, IList<Purchase>> PurchasesUpdatedHandler { get; set; }
         public void OnPurchasesUpdated(BillingResult result, IList<Purchase> purchases)
-        {
-            // Create a copy of the BillingResult to ensure it stays alive after the callback
-            var resultCopy = BillingResult.NewBuilder()
-                .SetResponseCode((int)result.ResponseCode)
-                .SetDebugMessage(result.DebugMessage)
-                .SetOnPurchasesUpdatedSubResponseCode(result.OnPurchasesUpdatedSubResponseCode)
-                .Build();
-            PurchasesUpdatedHandler?.Invoke(resultCopy, purchases);
-        }
+            => PurchasesUpdatedHandler?.Invoke(result, purchases);
     }
 
     [Obsolete("Use QueryProductDetailsAsync(QueryProductDetailsParams) instead")]
@@ -305,15 +267,8 @@ internal class InternalProductDetailsResponseListener : Java.Lang.Object, IProdu
         public void OnProductDetailsResponse(BillingResult result, QueryProductDetailsResult queryResult)
         {
             queryResult ??= new();
-            // Create a copy of the BillingResult to ensure it stays alive after the callback
-            // The original result may be disposed by the native side, causing ObjectDisposedException
-            var resultCopy = BillingResult.NewBuilder()
-                .SetResponseCode((int)result.ResponseCode)
-                .SetDebugMessage(result.DebugMessage)
-                .SetOnPurchasesUpdatedSubResponseCode(result.OnPurchasesUpdatedSubResponseCode)
-                .Build();
-            queryResult.Result = resultCopy;
-            ProductDetailsResponseHandler?.Invoke(resultCopy, queryResult);
+            queryResult.Result = result;
+            ProductDetailsResponseHandler?.Invoke(result, queryResult);
         }
     }