Merge pull request #29 from thisisthekap/br_28_fix_argument_null_exce…

…ption
thisisthekap · Oct 27, 2022 · a9ddf27 · a9ddf27
2 parents 54a20c5 + 069d6e8
commit a9ddf27
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 4 deletions.
diff --git a/Xamarin.RevenueCat.iOS.Extensions/PurchasesErrorException.cs b/Xamarin.RevenueCat.iOS.Extensions/PurchasesErrorException.cs
@@ -15,8 +15,7 @@ public class PurchasesErrorException : Exception
         public RCPurchasesErrorCode PurchasesErrorCode { get; }
 
         public PurchasesErrorException(NSError purchasesError, bool userCancelled)
-            : base($"{purchasesError?.Description} userCancelled: {userCancelled}",
-                new NSErrorException(purchasesError))
+            : base($"{purchasesError?.Description} userCancelled: {userCancelled}", WrapError(purchasesError))
         {
             PurchasesError = purchasesError;
             UserCancelled = userCancelled;
@@ -33,5 +32,15 @@ public PurchasesErrorException(NSError purchasesError, bool userCancelled)
                 PurchasesErrorCode = (RCPurchasesErrorCode)purchaseErrorCodeInt;
             }
         }
+
+        private static NSErrorException WrapError(NSError purchasesError)
+        {
+            if (purchasesError != null)
+            {
+                return new NSErrorException(purchasesError);
+            }
+
+            return null;
+        }
     }
 }
diff --git a/Xamarin.RevenueCat.iOS.Extensions/Xamarin.RevenueCat.iOS.Extensions.csproj b/Xamarin.RevenueCat.iOS.Extensions/Xamarin.RevenueCat.iOS.Extensions.csproj
@@ -4,7 +4,7 @@
         <IsPackable>true</IsPackable>
         <PackageId>Xamarin.RevenueCat.iOS.Extensions</PackageId>
         <Description>Contains convenience methods and async extensions for Xamarin.RevenueCat.iOS</Description>
-        <Version>4.9.0.3</Version>
+        <Version>4.9.0.4</Version>
         <Authors>Christian Kapplmüller</Authors>
         <Company>fun.music IT GmbH</Company>
         <PackageOutputPath>nugetoutput</PackageOutputPath>

diff --git a/Xamarin.RevenueCat.iOS.UsageChecker/ViewController.cs b/Xamarin.RevenueCat.iOS.UsageChecker/ViewController.cs
@@ -1,13 +1,15 @@
-using Foundation;
 using System;
 using UIKit;
+using Xamarin.RevenueCat.iOS.Extensions;
 
 namespace Xamarin.RevenueCat.iOS.UsageChecker
 {
     public partial class ViewController : UIViewController
     {
         public ViewController(IntPtr handle) : base(handle)
         {
+            var userCancelledException = new PurchasesErrorException(null, true);
+            Console.WriteLine(userCancelledException);
         }
 
         public override void ViewDidLoad()

diff --git a/Xamarin.RevenueCat.iOS.UsageChecker/Xamarin.RevenueCat.iOS.UsageChecker.csproj b/Xamarin.RevenueCat.iOS.UsageChecker/Xamarin.RevenueCat.iOS.UsageChecker.csproj
@@ -136,6 +136,10 @@
         </Compile>
     </ItemGroup>
     <ItemGroup>
+      <ProjectReference Include="..\Xamarin.RevenueCat.iOS.Extensions\Xamarin.RevenueCat.iOS.Extensions.csproj">
+        <Project>{9774c184-1a52-40a3-82f7-3d27f92ad38e}</Project>
+        <Name>Xamarin.RevenueCat.iOS.Extensions</Name>
+      </ProjectReference>
       <ProjectReference Include="..\Xamarin.RevenueCat.iOS\Xamarin.RevenueCat.iOS.csproj">
         <Project>{EAA9C04E-CFAD-49D2-A3A8-168A811D79DA}</Project>
         <Name>Xamarin.RevenueCat.iOS</Name>