From ccf3efe37f2e39f636eb9646d9ae4d45d833fa8c Mon Sep 17 00:00:00 2001
From: Alexander Zatsepin <az@mapswithme.com>
Date: Mon, 10 Sep 2018 16:30:55 +0300
Subject: [PATCH] [android] Review fixes

---
 .../AdsRemovalPurchaseController.java         | 28 +++++++++++++------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/android/src/com/mapswithme/maps/purchase/AdsRemovalPurchaseController.java b/android/src/com/mapswithme/maps/purchase/AdsRemovalPurchaseController.java
index 8d296b3da2..21952075ec 100644
--- a/android/src/com/mapswithme/maps/purchase/AdsRemovalPurchaseController.java
+++ b/android/src/com/mapswithme/maps/purchase/AdsRemovalPurchaseController.java
@@ -2,6 +2,7 @@ package com.mapswithme.maps.purchase;
 
 import android.app.Activity;
 import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 import android.text.TextUtils;
 
 import com.android.billingclient.api.Purchase;
@@ -21,7 +22,7 @@ class AdsRemovalPurchaseController extends AbstractPurchaseController<AdsRemoval
   @NonNull
   private final AdsRemovalValidationCallback mValidationCallback = new AdValidationCallbackImpl();
   @NonNull
-  private final PlayStoreBillingCallback mBillingCallback = new PlaysStoreBillingCallbackImpl();
+  private final PlayStoreBillingCallback mBillingCallback = new PlayStoreBillingCallbackImpl();
   @NonNull
   private final List<String> mProductIds;
 
@@ -58,7 +59,7 @@ class AdsRemovalPurchaseController extends AbstractPurchaseController<AdsRemoval
     }
   }
 
-  private class PlaysStoreBillingCallbackImpl implements PlayStoreBillingCallback
+  private class PlayStoreBillingCallbackImpl implements PlayStoreBillingCallback
   {
     @Override
     public void onPurchaseDetailsLoaded(@NonNull List<SkuDetails> details)
@@ -90,14 +91,11 @@ class AdsRemovalPurchaseController extends AbstractPurchaseController<AdsRemoval
     {
       String token = null;
       String productId = null;
-      for (Purchase purchase : purchases)
+      Purchase target = findTargetPurchase(purchases);
+      if (target != null)
       {
-        if (mProductIds.contains(purchase.getSku()))
-        {
-          token = purchase.getPurchaseToken();
-          productId = purchase.getSku();
-          break;
-        }
+        token = target.getPurchaseToken();
+        productId = target.getSku();
       }
 
       if (TextUtils.isEmpty(token))
@@ -109,5 +107,17 @@ class AdsRemovalPurchaseController extends AbstractPurchaseController<AdsRemoval
       LOGGER.i(TAG, "Validating existing purchase token for '" + productId + "'...");
       getValidator().validate(token);
     }
+
+    @Nullable
+    private Purchase findTargetPurchase(@NonNull List<Purchase> purchases)
+    {
+      for (Purchase purchase: purchases)
+      {
+        if (mProductIds.contains(purchase.getSku()))
+          return purchase;
+      }
+
+      return null;
+    }
   }
 }