From a8baf7bc2dd0cbfbfb14b8555bf0a9d1c929a141 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: Thu, 14 Nov 2019 18:51:43 +0300
Subject: [PATCH] [android] Added start validation for bookmark sights
 subscription

---
 .../src/com/mapswithme/maps/MwmActivity.java  | 23 +++++++++++++------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/android/src/com/mapswithme/maps/MwmActivity.java b/android/src/com/mapswithme/maps/MwmActivity.java
index 5f8622b1bb..7ab8fa156f 100644
--- a/android/src/com/mapswithme/maps/MwmActivity.java
+++ b/android/src/com/mapswithme/maps/MwmActivity.java
@@ -248,7 +248,9 @@ public class MwmActivity extends BaseMwmFragmentActivity
   @Nullable
   private PurchaseController<FailedPurchaseChecker> mBookmarkInappPurchaseController;
   @Nullable
-  private PurchaseController<PurchaseCallback> mBookmarksSubscriptionController;
+  private PurchaseController<PurchaseCallback> mBookmarksAllSubscriptionController;
+  @Nullable
+  private PurchaseController<PurchaseCallback> mBookmarksSightsSubscriptionController;
   @NonNull
   private final OnClickListener mOnMyPositionClickListener = new CurrentPositionClickListener();
   @SuppressWarnings("NullableProblems")
@@ -257,6 +259,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
   @Nullable
   private Tutorial mTutorial;
 
+
   public interface LeftAnimationTrackListener
   {
     void onTrackStarted(boolean collapsed);
@@ -541,16 +544,21 @@ public class MwmActivity extends BaseMwmFragmentActivity
     mBookmarkInappPurchaseController = PurchaseFactory.createFailedBookmarkPurchaseController(this);
     mBookmarkInappPurchaseController.initialize(this);
 
-    mBookmarksSubscriptionController
+    mBookmarksAllSubscriptionController
         = PurchaseFactory.createBookmarksAllSubscriptionController(this);
-    mBookmarksSubscriptionController.initialize(this);
+    mBookmarksAllSubscriptionController.initialize(this);
+
+    mBookmarksSightsSubscriptionController
+        = PurchaseFactory.createBookmarksSightsSubscriptionController(this);
+    mBookmarksSightsSubscriptionController.initialize(this);
 
     // To reduce number of parasite validation requests during orientation change.
     if (savedInstanceState == null)
     {
       mAdsRemovalPurchaseController.validateExistingPurchases();
       mBookmarkInappPurchaseController.validateExistingPurchases();
-      mBookmarksSubscriptionController.validateExistingPurchases();
+      mBookmarksAllSubscriptionController.validateExistingPurchases();
+      mBookmarksSightsSubscriptionController.validateExistingPurchases();
     }
   }
 
@@ -1379,9 +1387,10 @@ public class MwmActivity extends BaseMwmFragmentActivity
       mAdsRemovalPurchaseController.destroy();
     if (mBookmarkInappPurchaseController != null)
       mBookmarkInappPurchaseController.destroy();
-    if (mBookmarksSubscriptionController != null)
-      mBookmarksSubscriptionController.destroy();
-
+    if (mBookmarksAllSubscriptionController != null)
+      mBookmarksAllSubscriptionController.destroy();
+    if (mBookmarksSightsSubscriptionController != null)
+      mBookmarksSightsSubscriptionController.destroy();
     mNavigationController.destroy();
     mToggleMapLayerController.detachCore();
     TrafficManager.INSTANCE.detachAll();