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

[android] Soft 'ads removal' validation strategy

Browse source
This commit is contained in:
Alexander Zatsepin 2018-09-20 22:56:35 +03:00 • committed by yoksnod
parent e353183b68
commit c11f922ad1
3 changed files with 3 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
android/src/com/mapswithme/maps/purchase/AdsRemovalPaymentState.java
View file

@ -98,16 +98,6 @@ enum AdsRemovalPaymentState
dialog, AdsRemovalPurchaseDialog.REQ_CODE_PRODUCT_DETAILS_FAILURE);
}
},
VALIDATION_SERVER_ERROR
{
@Override
void activate(@NonNull AdsRemovalPurchaseDialog dialog)
{
AlertDialog.show(R.string.server_unavailable_title, R.string.server_unavailable_message,
R.string.ok, dialog,
AdsRemovalPurchaseDialog.REQ_CODE_VALIDATION_SERVER_ERROR);
}
},
VALIDATION_FINISH
{
@Override

6
android/src/com/mapswithme/maps/purchase/AdsRemovalPurchaseController.java
View file

@ -64,10 +64,8 @@ class AdsRemovalPurchaseController extends AbstractPurchaseController<AdsRemoval
public void onValidate(@NonNull AdsRemovalValidationStatus status)
{
LOGGER.i(TAG, "Validation status of 'ads removal': " + status);
if (status == AdsRemovalValidationStatus.VERIFIED)
Framework.nativeSetActiveRemoveAdsSubscription(true);
else if (status == AdsRemovalValidationStatus.NOT_VERIFIED)
Framework.nativeSetActiveRemoveAdsSubscription(false);
boolean activateSubscription = status != AdsRemovalValidationStatus.NOT_VERIFIED;
Framework.nativeSetActiveRemoveAdsSubscription(activateSubscription);
if (getUiCallback() != null)
getUiCallback().onValidationStatusObtained(status);

8
android/src/com/mapswithme/maps/purchase/AdsRemovalPurchaseDialog.java
View file

@ -267,13 +267,7 @@ public class AdsRemovalPurchaseDialog extends BaseMwmDialogFragment implements A
@Override
public void onValidationStatusObtained(@NonNull AdsRemovalValidationStatus status)
{
if (status == AdsRemovalValidationStatus.SERVER_ERROR)
{
activateStateSafely(AdsRemovalPaymentState.VALIDATION_SERVER_ERROR);
return;
}
activateStateSafely(AdsRemovalPaymentState.VALIDATION);
activateStateSafely(AdsRemovalPaymentState.VALIDATION_FINISH);
}
void activateStateSafely(@NonNull AdsRemovalPaymentState state)