From b6e56dc39bbbd5868b8445af2797bb6c560f3afe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=80=20?=
 =?UTF-8?q?=D0=97=D0=B0=D1=86=D0=B5=D0=BF=D0=B8=D0=BD?= <az@mapswithme.com>
Date: Fri, 21 Dec 2018 13:13:09 +0300
Subject: [PATCH] [android] Fixed bad conflict resolving

---
 .../purchase/QueryProductDetailsRequest.java  | 24 -------------------
 1 file changed, 24 deletions(-)

diff --git a/android/src/com/mapswithme/maps/purchase/QueryProductDetailsRequest.java b/android/src/com/mapswithme/maps/purchase/QueryProductDetailsRequest.java
index c0c7dce823..7fd66d8cac 100644
--- a/android/src/com/mapswithme/maps/purchase/QueryProductDetailsRequest.java
+++ b/android/src/com/mapswithme/maps/purchase/QueryProductDetailsRequest.java
@@ -6,7 +6,6 @@ import android.support.annotation.Nullable;
 import com.android.billingclient.api.BillingClient;
 import com.android.billingclient.api.SkuDetails;
 import com.android.billingclient.api.SkuDetailsParams;
-import com.mapswithme.util.CrashlyticsUtils;
 
 import java.util.Collections;
 import java.util.List;
@@ -57,31 +56,8 @@ class QueryProductDetailsRequest extends PlayStoreBillingRequest<PlayStoreBillin
       return;
     }
 
-    if (hasIncorrectSkuDetails(skuDetails))
-    {
-      LOGGER.w(TAG, "Purchase details incorrect");
-      if (getCallback() != null)
-        getCallback().onPurchaseDetailsFailure();
-      return;
-    }
-
     LOGGER.i(TAG, "Purchase details obtained: " + skuDetails);
     if (getCallback() != null)
       getCallback().onPurchaseDetailsLoaded(skuDetails);
   }
-
-  private static boolean hasIncorrectSkuDetails(@NonNull List<SkuDetails> skuDetails)
-  {
-    for (SkuDetails each : skuDetails)
-    {
-      if (AdsRemovalPurchaseDialog.Period.getInstance(each.getSubscriptionPeriod()) == null)
-      {
-        String msg = "Unsupported subscription period: '" + each.getSubscriptionPeriod() + "'";
-        CrashlyticsUtils.logException(new IllegalStateException(msg));
-        LOGGER.e(TAG, msg);
-        return true;
-      }
-    }
-    return false;
-  }
 }