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 mBookmarkInappPurchaseController; @Nullable - private PurchaseController mBookmarksSubscriptionController; + private PurchaseController mBookmarksAllSubscriptionController; + @Nullable + private PurchaseController 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();