Check for null serviceConnection #80

jamesmontemagno · Oct 2, 2017 · 4e79abc · 4e79abc
1 parent 3523a95
commit 4e79abc
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/src/Plugin.InAppBilling.Android/InAppBillingImplementation.cs b/src/Plugin.InAppBilling.Android/InAppBillingImplementation.cs
@@ -73,7 +73,7 @@ public InAppBillingImplementation()
         /// <returns></returns>
         public async override Task<IEnumerable<InAppBillingProduct>> GetProductInfoAsync(ItemType itemType, params string[] productIds)
         {
-            if (serviceConnection.Service == null)
+            if (serviceConnection?.Service == null)
             {
                 throw new InAppBillingPurchaseException(PurchaseError.BillingUnavailable, "You are not connected to the Google Play App store.");
             }
@@ -143,7 +143,7 @@ Task<IEnumerable<Product>> GetProductInfoAsync(string[] productIds, string itemT
         /// <returns>The current purchases</returns>
         public async override Task<IEnumerable<InAppBillingPurchase>> GetPurchasesAsync(ItemType itemType, IInAppBillingVerifyPurchase verifyPurchase = null)
         {
-            if (serviceConnection.Service == null)
+            if (serviceConnection?.Service == null)
             {
                 throw new InAppBillingPurchaseException(PurchaseError.BillingUnavailable, "You are not connected to the Google Play App store.");
             }
@@ -244,7 +244,7 @@ public async override Task<InAppBillingPurchase> PurchaseAsync(string productId,
                 throw new ArgumentNullException(nameof(payload), "Payload can not be null");
 
 
-            if (serviceConnection.Service == null)
+            if (serviceConnection?.Service == null)
             {
                 throw new InAppBillingPurchaseException(PurchaseError.BillingUnavailable, "You are not connected to the Google Play App store.");
             }
@@ -395,7 +395,7 @@ public async override Task DisconnectAsync()
         /// <returns>If consumed successful</returns>
         public override Task<InAppBillingPurchase> ConsumePurchaseAsync(string productId, string purchaseToken)
         {
-            if (serviceConnection.Service == null)
+            if (serviceConnection?.Service == null)
             {
                 throw new InAppBillingPurchaseException(PurchaseError.BillingUnavailable, "You are not connected to the Google Play App store.");
             }
@@ -459,7 +459,7 @@ bool ParseConsumeResult(int response)
         /// <returns>If consumed successful</returns>
         public async override Task<InAppBillingPurchase> ConsumePurchaseAsync(string productId, ItemType itemType, string payload, IInAppBillingVerifyPurchase verifyPurchase)
         {
-            if (serviceConnection.Service == null)
+            if (serviceConnection?.Service == null)
                 throw new InAppBillingPurchaseException(PurchaseError.BillingUnavailable, "You are not connected to the Google Play App store.");