kirylkaveryn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps-tmp
Code Pull requests Activity

[android] Added bookmark subscription validation on application start

Browse source
This commit is contained in:
Александр Зацепин 2019-07-09 18:27:31 +03:00 • committed by yoksnod
parent 9c7dfb9cc3
commit d9b0ce759d
1 changed files with 29 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -243,7 +243,9 @@ public class MwmActivity extends BaseMwmFragmentActivity
@Nullable
private PurchaseController<PurchaseCallback> mAdsRemovalPurchaseController;
@Nullable
private PurchaseController<FailedPurchaseChecker> mBookmarkPurchaseController;
private PurchaseController<FailedPurchaseChecker> mBookmarkInappPurchaseController;
@Nullable
private PurchaseController<PurchaseCallback> mBookmarksSubscriptionController;
@NonNull
private final OnClickListener mOnMyPositionClickListener = new CurrentPositionClickListener();
@SuppressWarnings("NullableProblems")
@ -508,13 +510,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
SharingHelper.INSTANCE.initialize();
mAdsRemovalPurchaseController = PurchaseFactory.createAdsRemovalPurchaseController(this);
mAdsRemovalPurchaseController.initialize(this);
mAdsRemovalPurchaseController.validateExistingPurchases();
mBookmarkPurchaseController = PurchaseFactory.createFailedBookmarkPurchaseController(this);
mBookmarkPurchaseController.initialize(this);
mBookmarkPurchaseController.validateExistingPurchases();
initControllersAndValidatePurchases(savedInstanceState);
boolean isConsumed = savedInstanceState == null && processIntent(getIntent());
// If the map activity is launched by any incoming intent (deeplink, update maps event, etc)
@ -533,6 +529,27 @@ public class MwmActivity extends BaseMwmFragmentActivity
tryToShowAdditionalViewOnTop();
}
private void initControllersAndValidatePurchases(@Nullable Bundle savedInstanceState)
{
mAdsRemovalPurchaseController = PurchaseFactory.createAdsRemovalPurchaseController(this);
mAdsRemovalPurchaseController.initialize(this);
mBookmarkInappPurchaseController = PurchaseFactory.createFailedBookmarkPurchaseController(this);
mBookmarkInappPurchaseController.initialize(this);
mBookmarksSubscriptionController
= PurchaseFactory.createBookmarksSubscriptionPurchaseController(this);
mBookmarksSubscriptionController.initialize(this);
// To reduce number of parasite validation requests during orientation change.
if (savedInstanceState == null)
{
mAdsRemovalPurchaseController.validateExistingPurchases();
mBookmarkInappPurchaseController.validateExistingPurchases();
mBookmarksSubscriptionController.validateExistingPurchases();
}
}
private void initViews(boolean isLaunchByDeeplink)
{
initMap(isLaunchByDeeplink);
@ -1298,8 +1315,10 @@ public class MwmActivity extends BaseMwmFragmentActivity
super.onSafeDestroy();
if (mAdsRemovalPurchaseController != null)
mAdsRemovalPurchaseController.destroy();
if (mBookmarkPurchaseController != null)
mBookmarkPurchaseController.destroy();
if (mBookmarkInappPurchaseController != null)
mBookmarkInappPurchaseController.destroy();
if (mBookmarksSubscriptionController != null)
mBookmarksSubscriptionController.destroy();
mNavigationController.destroy();
mToggleMapLayerController.detachCore();