From ee75a11e88553b5e2bc5822a7f708a4054b1d923 Mon Sep 17 00:00:00 2001 From: James Montemagno Date: Tue, 3 Oct 2023 11:08:14 -0700 Subject: [PATCH 1/3] Make the default firstSub one that isn't a trial Fixes #559 --- src/Plugin.InAppBilling/Converters.android.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Plugin.InAppBilling/Converters.android.cs b/src/Plugin.InAppBilling/Converters.android.cs index d3c7132..8232ef0 100644 --- a/src/Plugin.InAppBilling/Converters.android.cs +++ b/src/Plugin.InAppBilling/Converters.android.cs @@ -75,7 +75,7 @@ internal static InAppBillingProduct ToIAPProduct(this ProductDetails product) }).ToList() }).ToList(); - var firstSub = subs?.FirstOrDefault()?.PricingPhases?.FirstOrDefault(); + var firstSub = subs?.FirstOrDefault()?.PricingPhases.Where(p => p.PriceAmountMicros != 0)?.FirstOrDefault(); return new InAppBillingProduct { From e00e4aa29c8d672e887a65196d6e798d1cbe168e Mon Sep 17 00:00:00 2001 From: James Montemagno Date: Tue, 3 Oct 2023 11:10:08 -0700 Subject: [PATCH 2/3] add ? --- src/Plugin.InAppBilling/Converters.android.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Plugin.InAppBilling/Converters.android.cs b/src/Plugin.InAppBilling/Converters.android.cs index 8232ef0..5255dab 100644 --- a/src/Plugin.InAppBilling/Converters.android.cs +++ b/src/Plugin.InAppBilling/Converters.android.cs @@ -66,7 +66,7 @@ internal static InAppBillingProduct ToIAPProduct(this ProductDetails product) PricingPhases = s?.PricingPhases?.PricingPhaseList?.Select(p => new PricingPhase { - BillingCycleCount = p.BillingCycleCount, + BillingCycleCount = p., BillingPeriod = p.BillingPeriod, FormattedPrice = p.FormattedPrice, PriceAmountMicros = p.PriceAmountMicros, @@ -75,7 +75,7 @@ internal static InAppBillingProduct ToIAPProduct(this ProductDetails product) }).ToList() }).ToList(); - var firstSub = subs?.FirstOrDefault()?.PricingPhases.Where(p => p.PriceAmountMicros != 0)?.FirstOrDefault(); + var firstSub = subs?.FirstOrDefault()?.PricingPhases?.Where(p => p.PriceAmountMicros != 0)?.FirstOrDefault(); return new InAppBillingProduct { From b8d66087b6e3be24f069e7dcf1e628c240da61d7 Mon Sep 17 00:00:00 2001 From: James Montemagno Date: Tue, 3 Oct 2023 11:10:22 -0700 Subject: [PATCH 3/3] fix --- src/Plugin.InAppBilling/Converters.android.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Plugin.InAppBilling/Converters.android.cs b/src/Plugin.InAppBilling/Converters.android.cs index 5255dab..11f717e 100644 --- a/src/Plugin.InAppBilling/Converters.android.cs +++ b/src/Plugin.InAppBilling/Converters.android.cs @@ -66,7 +66,7 @@ internal static InAppBillingProduct ToIAPProduct(this ProductDetails product) PricingPhases = s?.PricingPhases?.PricingPhaseList?.Select(p => new PricingPhase { - BillingCycleCount = p., + BillingCycleCount = p.BillingCycleCount, BillingPeriod = p.BillingPeriod, FormattedPrice = p.FormattedPrice, PriceAmountMicros = p.PriceAmountMicros,