RedAuburn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[android] Added start validation for bookmark sights subscription

Browse source
This commit is contained in:
Александр Зацепин 2019-11-14 18:51:43 +03:00 • committed by yoksnod
parent 1a4892191d
commit a8baf7bc2d
1 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
android/src/com/mapswithme/maps/MwmActivity.java
View file

@ -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();