Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 9 additions & 11 deletions source/com.android.billingclient/billing/Additions/Additions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,7 @@ public QueryProductDetailsResult() { }

public BillingResult Result { get; set; }

[Obsolete ($"Use {nameof(ProductDetailsList)} instead")]
public IList<ProductDetails> ProductDetails
{
get => ProductDetailsList;
set { /* Obsolete property setter does nothing */ }
}
public IList<ProductDetails> ProductDetails { get; set; }
}

public class QueryPurchasesResult
Expand Down Expand Up @@ -129,9 +124,14 @@ public Task<QueryProductDetailsResult> QueryProductDetailsAsync(QueryProductDeta
{
var tcs = new TaskCompletionSource<QueryProductDetailsResult>();

// NOTE: this creates a new QueryProductDetailsResult to avoid ObjectDisposedException
var listener = new InternalProductDetailsResponseListener
{
ProductDetailsResponseHandler = (r, queryResult) => tcs.TrySetResult(queryResult)
ProductDetailsResponseHandler = (r, s) => tcs.TrySetResult(new QueryProductDetailsResult
{
Result = r,
ProductDetails = s
})
};

QueryProductDetails(productDetailsParams, listener);
Expand Down Expand Up @@ -252,13 +252,11 @@ public void OnSkuDetailsResponse(BillingResult result, IList<SkuDetails> skuDeta

internal class InternalProductDetailsResponseListener : Java.Lang.Object, IProductDetailsResponseListener
{
public Action<BillingResult, QueryProductDetailsResult> ProductDetailsResponseHandler { get; set; }
public Action<BillingResult, IList<ProductDetails>> ProductDetailsResponseHandler { get; set; }

public void OnProductDetailsResponse(BillingResult result, QueryProductDetailsResult queryResult)
{
queryResult ??= new();
queryResult.Result = result;
ProductDetailsResponseHandler?.Invoke(result, queryResult);
ProductDetailsResponseHandler?.Invoke(result, queryResult?.ProductDetailsList);
}
}

Expand Down