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

[android] Added migration scheme from old product ids to new data, supported additional pre-validation for existing purchases

Browse source
This commit is contained in:
Dmitry Donskoy 2018-12-04 15:15:04 +03:00 • committed by Roman Kuznetsov
parent c39ac227d1
commit e1f2ebb6b8
8 changed files with 184 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
android/jni/com/mapswithme/maps/PrivateVariables.cpp
View file

@ -1,6 +1,8 @@
#include "private.h"
#include <jni.h>
#include <string>
#include <android/jni/com/mapswithme/core/jni_helper.hpp>
extern "C"
{
@ -88,6 +90,13 @@ extern "C"
return env->NewStringUTF(ADS_REMOVAL_WEEKLY_PRODUCT_ID);
}
JNIEXPORT jobjectArray JNICALL
Java_com_mapswithme_maps_PrivateVariables_adsRemovalNotUsedList(JNIEnv * env, jclass clazz)
{
std::vector<std::string> items = ADS_REMOVAL_NOT_USED_LIST;
return jni::ToJavaStringArray(env, items);
}
JNIEXPORT jstring JNICALL
Java_com_mapswithme_maps_PrivateVariables_bookmarksVendor(JNIEnv * env, jclass clazz)
{

2
android/src/com/mapswithme/maps/PrivateVariables.java
View file

@ -32,6 +32,8 @@ public class PrivateVariables
@NonNull
public static native String adsRemovalWeeklyProductId();
@NonNull
public static native String[] adsRemovalNotUsedList();
@NonNull
public static native String bookmarksVendor();
/**
* @return interval in seconds

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

@ -52,28 +52,30 @@ class AdsRemovalPurchaseController extends AbstractPurchaseController<Validation
{
LOGGER.i(TAG, "Validation status of 'ads removal': " + status);
if (status == ValidationStatus.VERIFIED)
Statistics.INSTANCE.trackPurchaseEvent(Statistics.EventName.INAPP_PURCHASE_VALIDATION_SUCCESS,
Statistics.INSTANCE.trackPurchaseEvent(Statistics.EventName
.INAPP_PURCHASE_VALIDATION_SUCCESS,
PrivateVariables.adsRemovalServerId());
else
Statistics.INSTANCE.trackPurchaseValidationError(PrivateVariables.adsRemovalServerId(), status);
Statistics.INSTANCE.trackPurchaseValidationError(PrivateVariables.adsRemovalServerId(),
status);
final boolean activateSubscription = status != ValidationStatus.NOT_VERIFIED;
final boolean shouldActivateSubscription = status != ValidationStatus.NOT_VERIFIED;
final boolean hasActiveSubscription = Framework.nativeHasActiveRemoveAdsSubscription();
if (!hasActiveSubscription && activateSubscription)
if (!hasActiveSubscription && shouldActivateSubscription)
{
LOGGER.i(TAG, "Ads removal subscription activated");
Statistics.INSTANCE.trackPurchaseProductDelivered(PrivateVariables.adsRemovalServerId(),
PrivateVariables.adsRemovalVendor());
}
else if (hasActiveSubscription && !activateSubscription)
else if (hasActiveSubscription && !shouldActivateSubscription)
{
LOGGER.i(TAG, "Ads removal subscription deactivated");
}
Framework.nativeSetActiveRemoveAdsSubscription(activateSubscription);
Framework.nativeSetActiveRemoveAdsSubscription(shouldActivateSubscription);
if (getUiCallback() != null)
getUiCallback().onValidationFinish(activateSubscription);
getUiCallback().onValidationFinish(shouldActivateSubscription);
}
}

28
android/src/com/mapswithme/maps/purchase/PlayStoreBillingManager.java
View file

@ -40,6 +40,18 @@ class PlayStoreBillingManager implements BillingManager<PlayStoreBillingCallback
mProductType = productType;
}
@NonNull
protected String getProductType()
{
return mProductType;
}
@Nullable
protected PlayStoreBillingCallback getCallback()
{
return mCallback;
}
@Override
public void initialize(@NonNull Activity context)
{
@ -65,6 +77,12 @@ class PlayStoreBillingManager implements BillingManager<PlayStoreBillingCallback
mCallback, productIds));
}
@Override
public void queryExistingPurchases()
{
executeBillingRequest(new QueryExistingPurchases(getClientOrThrow(), mProductType, mCallback));
}
@Override
public void consumePurchase(@NonNull String purchaseToken)
{
@ -72,7 +90,7 @@ class PlayStoreBillingManager implements BillingManager<PlayStoreBillingCallback
purchaseToken));
}
private void executeBillingRequest(@NonNull BillingRequest request)
protected void executeBillingRequest(@NonNull BillingRequest request)
{
switch (mConnection.getState())
{
@ -118,12 +136,6 @@ class PlayStoreBillingManager implements BillingManager<PlayStoreBillingCallback
return true;
}
@Override
public void queryExistingPurchases()
{
executeBillingRequest(new QueryExistingPurchases(getClientOrThrow(), mProductType, mCallback));
}
@Override
public void addCallback(@NonNull PlayStoreBillingCallback callback)
{
@ -165,7 +177,7 @@ class PlayStoreBillingManager implements BillingManager<PlayStoreBillingCallback
}
@NonNull
private BillingClient getClientOrThrow()
protected BillingClient getClientOrThrow()
{
if (mBillingClient == null)
throw new IllegalStateException("Manager must be initialized! Call 'initialize' method first.");

5
android/src/com/mapswithme/maps/purchase/PurchaseCallback.java
View file

@ -10,9 +10,14 @@ import java.util.List;
public interface PurchaseCallback
{
void onProductDetailsLoaded(@NonNull List<SkuDetails> details);
/* all GP */
void onPaymentFailure(@BillingClient.BillingResponse int error);
/* all GP */
void onProductDetailsFailure();
/* all GP */
void onStoreConnectionFailed();
/* single */
void onValidationStarted();
void onValidationFinish(boolean success);
}

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

@ -7,6 +7,7 @@ import android.support.annotation.Nullable;
import com.android.billingclient.api.BillingClient;
import com.mapswithme.maps.PrivateVariables;
import com.mapswithme.maps.PurchaseValidationObservable;
import com.mapswithme.util.Utils;
public class PurchaseFactory
{
@ -20,14 +21,15 @@ public class PurchaseFactory
@NonNull Context context)
{
BillingManager<PlayStoreBillingCallback> billingManager
= new PlayStoreBillingManager(BillingClient.SkuType.SUBS);
= new SubscriptionPlayStoreBillingManager(BillingClient.SkuType.SUBS);
PurchaseValidationObservable observable = PurchaseValidationObservable.from(context);
PurchaseValidator<ValidationCallback> validator = new DefaultPurchaseValidator(observable);
String yearlyProduct = PrivateVariables.adsRemovalYearlyProductId();
String monthlyProduct = PrivateVariables.adsRemovalMonthlyProductId();
String weeklyProduct = PrivateVariables.adsRemovalWeeklyProductId();
return new AdsRemovalPurchaseController(validator, billingManager, yearlyProduct,
monthlyProduct, weeklyProduct);
String[] productIds = Utils.concatArrays(PrivateVariables.adsRemovalNotUsedList(),
yearlyProduct, monthlyProduct, weeklyProduct);
return new AdsRemovalPurchaseController(validator, billingManager, productIds);
}
@NonNull

104
android/src/com/mapswithme/maps/purchase/SubscriptionPlayStoreBillingManager.java Normal file
View file

@ -0,0 +1,104 @@
package com.mapswithme.maps.purchase;
import android.support.annotation.NonNull;
import com.android.billingclient.api.Purchase;
import com.android.billingclient.api.SkuDetails;
import java.util.List;
class SubscriptionPlayStoreBillingManager extends PlayStoreBillingManager
{
SubscriptionPlayStoreBillingManager(@NonNull String productType)
{
super(productType);
}
@Override
public void queryProductDetails(@NonNull List<String> productIds)
{
executeBillingRequest(new QueryExistingPurchases(getClientOrThrow(), getProductType(),
new QueryExistingPurchaseCallback(productIds)));
}
private class QueryExistingPurchaseCallback implements PlayStoreBillingCallback
{
@NonNull
private final List<String> mProductIds;
public QueryExistingPurchaseCallback(@NonNull List<String> productIds)
{
mProductIds = productIds;
}
@Override
public void onPurchaseDetailsLoaded(@NonNull List<SkuDetails> details)
{
if (getCallback() != null)
getCallback().onPurchaseDetailsLoaded(details);
}
@Override
public void onPurchaseSuccessful(@NonNull List<Purchase> purchases)
{
if (getCallback() != null)
getCallback().onPurchaseSuccessful(purchases);
}
@Override
public void onPurchaseFailure(int error)
{
if (getCallback() != null)
getCallback().onPurchaseFailure(error);
}
@Override
public void onPurchaseDetailsFailure()
{
if (getCallback() != null)
getCallback().onPurchaseDetailsFailure();
}
@Override
public void onStoreConnectionFailed()
{
if (getCallback() != null)
getCallback().onStoreConnectionFailed();
}
@Override
public void onPurchasesLoaded(@NonNull List<Purchase> purchases)
{
if (purchases.isEmpty())
launchDefaultFlow();
else
validateExistingPurchases(purchases);
}
private void validateExistingPurchases(@NonNull List<Purchase> purchases)
{
if (getCallback() != null)
getCallback().onPurchasesLoaded(purchases);
}
private void launchDefaultFlow()
{
executeBillingRequest(new QueryProductDetailsRequest(getClientOrThrow(), getProductType(),
getCallback(), mProductIds));
}
@Override
public void onConsumptionSuccess()
{
if (getCallback() != null)
getCallback().onConsumptionSuccess();
}
@Override
public void onConsumptionFailure()
{
if (getCallback() != null)
getCallback().onConsumptionFailure();
}
}
}

30
android/src/com/mapswithme/util/Utils.java
View file

@ -683,6 +683,36 @@ public class Utils
}
}
public static <T> T[] concatArrays(T[] a, T... b)
{
if (a == null && b == null)
return null;
else if (a == null)
return b;
else if (b == null)
return a;
else
{
final int alen = a.length;
final int blen = b.length;
if (alen == 0)
{
return b;
}
if (blen == 0)
{
return a;
}
final T[] result = (T[]) java.lang.reflect.Array.newInstance(a.getClass()
.getComponentType(), alen +
blen);
System.arraycopy(a, 0, result, 0, alen);
System.arraycopy(b, 0, result, alen, blen);
return result;
}
}
public static void detachFragmentIfCoreNotInitialized(@NonNull Context context,
@NonNull Fragment fragment)
{