Merge branch 'master' into android-obfuscated

jamesmontemagno · May 6, 2021 · d483ce6 · d483ce6
2 parents 5809f72 + a85ae03
commit d483ce6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/Plugin.InAppBilling/InAppBilling.apple.cs b/src/Plugin.InAppBilling/InAppBilling.apple.cs
@@ -255,7 +255,9 @@ async Task<SKPaymentTransaction> PurchaseAsync(string productId)
 				var errorCode = tran?.Error?.Code ?? -1;
 				var description = tran?.Error?.LocalizedDescription ?? string.Empty;
 				var error = PurchaseError.GeneralError;
-				switch (errorCode)
+                var underlyingError = tran?.Error?.UserInfo?["NSUnderlyingError"] as NSError;
+
+                switch (errorCode)
 				{
 					case (int)SKError.PaymentCancelled:
 						error = PurchaseError.UserCancelled;
@@ -270,7 +272,7 @@ async Task<SKPaymentTransaction> PurchaseAsync(string productId)
 						error = PurchaseError.ItemUnavailable;
 						break;
 					case (int)SKError.Unknown:
-						error = PurchaseError.GeneralError;
+						error = underlyingError?.Code == 3038 ? PurchaseError.AppleTermsConditionsChanged : PurchaseError.GeneralError;
 						break;
 					case (int)SKError.ClientInvalid:
 						error = PurchaseError.BillingUnavailable;

diff --git a/src/Plugin.InAppBilling/Shared/InAppBillingExceptions.shared.cs b/src/Plugin.InAppBilling/Shared/InAppBillingExceptions.shared.cs
@@ -69,7 +69,8 @@ public enum PurchaseError
 		NotOwned,
         FeatureNotSupported,
         ServiceDisconnected,
-        ServiceTimeout
+        ServiceTimeout,
+        AppleTermsConditionsChanged
 	}
 
     /// <summary>