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

[android] Renamed ads removal controller to subscription controller to make it general for all types of subscription

Browse source
This commit is contained in:
Александр Зацепин 2019-06-26 18:43:17 +03:00 • committed by yoksnod
parent 022d6aeae7
commit dce2ce87f2
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
android/src/com/mapswithme/maps/purchase/PurchaseFactory.java
View file

@ -29,8 +29,8 @@ public class PurchaseFactory
String weeklyProduct = PrivateVariables.adsRemovalWeeklyProductId();
String[] productIds = Utils.concatArrays(PrivateVariables.adsRemovalNotUsedList(),
yearlyProduct, monthlyProduct, weeklyProduct);
return new AdsRemovalPurchaseController(validator, billingManager,
SubscriptionType.ADS_REMOVAL, productIds);
return new SubscriptionPurchaseController(validator, billingManager,
SubscriptionType.ADS_REMOVAL, productIds);
}
@NonNull

12
android/src/com/mapswithme/maps/purchase/AdsRemovalPurchaseController.java → android/src/com/mapswithme/maps/purchase/SubscriptionPurchaseController.java
View file

@ -13,11 +13,11 @@ import com.mapswithme.util.statistics.Statistics;
import java.util.List;
class AdsRemovalPurchaseController extends AbstractPurchaseController<ValidationCallback,
class SubscriptionPurchaseController extends AbstractPurchaseController<ValidationCallback,
PlayStoreBillingCallback, PurchaseCallback>
{
private static final Logger LOGGER = LoggerFactory.INSTANCE.getLogger(LoggerFactory.Type.BILLING);
private static final String TAG = AdsRemovalPurchaseController.class.getSimpleName();
private static final String TAG = SubscriptionPurchaseController.class.getSimpleName();
@NonNull
private final ValidationCallback mValidationCallback = new AdValidationCallbackImpl();
@NonNull
@ -25,10 +25,10 @@ class AdsRemovalPurchaseController extends AbstractPurchaseController<Validation
@NonNull
private final SubscriptionType mType;
AdsRemovalPurchaseController(@NonNull PurchaseValidator<ValidationCallback> validator,
@NonNull BillingManager<PlayStoreBillingCallback> billingManager,
@NonNull SubscriptionType subscriptionType,
@NonNull String... productIds)
SubscriptionPurchaseController(@NonNull PurchaseValidator<ValidationCallback> validator,
@NonNull BillingManager<PlayStoreBillingCallback> billingManager,
@NonNull SubscriptionType subscriptionType,
@NonNull String... productIds)
{
super(validator, billingManager, productIds);
mType = subscriptionType;