Fix crash in billing client

6 years ago · 6556a7f7b5
parent de95a601de
commit 6556a7f7b5
1 changed files with 6 additions and 2 deletions
--- a/app/src/googleplay/java/org/tasks/billing/BillingClientImpl.java
+++ b/app/src/googleplay/java/org/tasks/billing/BillingClientImpl.java
@ -105,9 +105,13 @@ public class BillingClientImpl implements BillingClient, PurchasesUpdatedListene
                    purchases,
                    Single.fromCallable(() -> billingClient.queryPurchases(SkuType.SUBS)),
                    (iaps, subs) -> {
-                      if (subs.getResponseCode() == BillingResponse.OK) {
-                        iaps.getPurchasesList().addAll(subs.getPurchasesList());
+                      if (iaps.getResponseCode() != BillingResponse.OK) {
+                        return iaps;
                      }
+                      if (subs.getResponseCode() != BillingResponse.OK) {
+                        return subs;
+                      }
+                      iaps.getPurchasesList().addAll(subs.getPurchasesList());
                      return iaps;
                    });
          }