diff --git a/android/src/com/mapswithme/maps/purchase/AdsRemovalPurchaseDialog.java b/android/src/com/mapswithme/maps/purchase/AdsRemovalPurchaseDialog.java index 3e37b1b0e7..73ef719149 100644 --- a/android/src/com/mapswithme/maps/purchase/AdsRemovalPurchaseDialog.java +++ b/android/src/com/mapswithme/maps/purchase/AdsRemovalPurchaseDialog.java @@ -10,6 +10,7 @@ import android.support.v4.app.DialogFragment; import android.support.v4.app.Fragment; import android.support.v4.app.FragmentActivity; import android.support.v4.app.FragmentManager; +import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -463,6 +464,17 @@ public class AdsRemovalPurchaseDialog extends BaseMwmDialogFragment // Order is important. P1Y, P1M, - P1W + P1W; + + @Nullable + public static Period getInstance(@Nullable String subscriptionPeriod) + { + for (Period each : values()) + { + if (TextUtils.equals(each.name(), subscriptionPeriod)) + return each; + } + return null; + } } } diff --git a/android/src/com/mapswithme/maps/purchase/QueryProductDetailsRequest.java b/android/src/com/mapswithme/maps/purchase/QueryProductDetailsRequest.java index 7fd66d8cac..68b0593a5b 100644 --- a/android/src/com/mapswithme/maps/purchase/QueryProductDetailsRequest.java +++ b/android/src/com/mapswithme/maps/purchase/QueryProductDetailsRequest.java @@ -48,7 +48,7 @@ class QueryProductDetailsRequest extends PlayStoreBillingRequest skuDetails) + { + for (SkuDetails each : skuDetails) + { + if (AdsRemovalPurchaseDialog.Period.getInstance(each.getSubscriptionPeriod()) == null) + return true; + } + return false; + } }