msb-public
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Code Issues Projects Releases Wiki Activity

IAB 9.1.0

Browse Source
master
M66B 2 months ago
parent c10a3b9bbe
commit 891e828a8d
2 changed files with 70 additions and 31 deletions
Show Stats Download Patch File Download Diff File

2
app/build.gradle
Unescape View File

@ -545,7 +545,7 @@ dependencies {
def work_version = "2.10.5" // 2.11.2/2.12.0-alpha01 (requires ROOM update) def work_version = "2.10.5" // 2.11.2/2.12.0-alpha01 (requires ROOM update)
def exif_version = "1.4.2" def exif_version = "1.4.2"
def biometric_version = "1.2.0-alpha05" // 1.4.0-alpha07 def biometric_version = "1.2.0-alpha05" // 1.4.0-alpha07
def billingclient_version = "7.1.1" // 8.0.0 def billingclient_version = "9.1.0"
def playservicesbasement_version = "18.10.0"; def playservicesbasement_version = "18.10.0";
def transparency_version = "2.8.20" def transparency_version = "2.8.20"
def javamail_version = "1.6.7" def javamail_version = "1.6.7"

99
app/src/play/java/eu/faircode/email/ActivityBilling.java
Unescape View File

@ -52,12 +52,14 @@ import com.android.billingclient.api.BillingResult;
import com.android.billingclient.api.ConsumeParams; import com.android.billingclient.api.ConsumeParams;
import com.android.billingclient.api.ConsumeResponseListener; import com.android.billingclient.api.ConsumeResponseListener;
import com.android.billingclient.api.PendingPurchasesParams; import com.android.billingclient.api.PendingPurchasesParams;
import com.android.billingclient.api.ProductDetails;
import com.android.billingclient.api.ProductDetailsResponseListener;
import com.android.billingclient.api.Purchase; import com.android.billingclient.api.Purchase;
import com.android.billingclient.api.PurchasesResponseListener; import com.android.billingclient.api.PurchasesResponseListener;
import com.android.billingclient.api.PurchasesUpdatedListener; import com.android.billingclient.api.PurchasesUpdatedListener;
import com.android.billingclient.api.SkuDetails; import com.android.billingclient.api.QueryProductDetailsParams;
import com.android.billingclient.api.SkuDetailsParams; import com.android.billingclient.api.QueryProductDetailsResult;
import com.android.billingclient.api.SkuDetailsResponseListener; import com.android.billingclient.api.QueryPurchasesParams;
import java.security.KeyFactory; import java.security.KeyFactory;
import java.security.NoSuchAlgorithmException; import java.security.NoSuchAlgorithmException;
@ -70,7 +72,7 @@ import java.util.Date;
import java.util.List; import java.util.List;
public class ActivityBilling extends ActivityBase implements public class ActivityBilling extends ActivityBase implements
BillingClientStateListener, SkuDetailsResponseListener, PurchasesResponseListener, PurchasesUpdatedListener, BillingClientStateListener, ProductDetailsResponseListener, PurchasesResponseListener, PurchasesUpdatedListener,
FragmentManager.OnBackStackChangedListener { FragmentManager.OnBackStackChangedListener {
private boolean standalone = false; private boolean standalone = false;
private int backoff = 4; // seconds private int backoff = 4; // seconds
@ -116,6 +118,7 @@ public class ActivityBilling extends ActivityBase implements
Log.i("IAB start"); Log.i("IAB start");
billingClient = BillingClient.newBuilder(getApplicationContext()) billingClient = BillingClient.newBuilder(getApplicationContext())
.enablePendingPurchases(PendingPurchasesParams.newBuilder().enableOneTimeProducts().build()) .enablePendingPurchases(PendingPurchasesParams.newBuilder().enableOneTimeProducts().build())
//.enableAutoServiceReconnection()
.setListener(this) .setListener(this)
.build(); .build();
billingClient.startConnection(this); billingClient.startConnection(this);
@ -282,29 +285,36 @@ public class ActivityBilling extends ActivityBase implements
String skuPro = getSkuPro(this); String skuPro = getSkuPro(this);
Log.i("IAB purchase SKU=" + skuPro); Log.i("IAB purchase SKU=" + skuPro);
SkuDetailsParams.Builder builder = SkuDetailsParams.newBuilder(); QueryProductDetailsParams.Product.Builder pBuilder = QueryProductDetailsParams.Product.newBuilder();
builder.setSkusList(Arrays.asList(skuPro)); pBuilder.setProductId(skuPro);
builder.setType(BillingClient.SkuType.INAPP); pBuilder.setProductType(BillingClient.ProductType.INAPP);
billingClient.querySkuDetailsAsync(builder.build(),
new SkuDetailsResponseListener() { QueryProductDetailsParams.Builder builder = QueryProductDetailsParams.newBuilder();
builder.setProductList(Arrays.asList(pBuilder.build()));
billingClient.queryProductDetailsAsync(builder.build(),
new ProductDetailsResponseListener() {
@Override @Override
public void onSkuDetailsResponse(@NonNull BillingResult r, List<SkuDetails> skuDetailsList) { public void onProductDetailsResponse(@NonNull BillingResult r, @NonNull QueryProductDetailsResult productDetailsResult) {
if (r.getResponseCode() == BillingClient.BillingResponseCode.OK) { if (r.getResponseCode() == BillingClient.BillingResponseCode.OK) {
if (skuDetailsList.size() == 0) if (productDetailsResult.getProductDetailsList().size() == 0)
reportError(null, "Unknown SKU=" + skuPro); reportError(null, "Unknown product=" + skuPro);
else { else {
SkuDetails skuDetails = skuDetailsList.get(0); ProductDetails productDetails = productDetailsResult.getProductDetailsList().get(0);
Log.i("IAB purchase details=" + skuDetails); Log.i("IAB product details=" + productDetails);
BillingFlowParams.ProductDetailsParams.Builder pdBuilder = BillingFlowParams.ProductDetailsParams.newBuilder();
pdBuilder.setProductDetails(productDetails);
BillingFlowParams.Builder flowParams = BillingFlowParams.newBuilder(); BillingFlowParams.Builder flowParams = BillingFlowParams.newBuilder();
flowParams.setSkuDetails(skuDetails); flowParams.setProductDetailsParamsList(Arrays.asList(pdBuilder.build()));
BillingResult result = billingClient.launchBillingFlow(ActivityBilling.this, flowParams.build()); BillingResult result = billingClient.launchBillingFlow(ActivityBilling.this, flowParams.build());
if (result.getResponseCode() != BillingClient.BillingResponseCode.OK) if (result.getResponseCode() != BillingClient.BillingResponseCode.OK)
reportError(result, "IAB launch billing flow"); reportError(result, "IAB launch billing flow");
} }
} else } else
reportError(r, "IAB query SKUs"); reportError(r, "IAB query product details");
} }
}); });
} else } else
@ -319,7 +329,9 @@ public class ActivityBilling extends ActivityBase implements
} }
private void onPurchaseConsume(Intent intent) { private void onPurchaseConsume(Intent intent) {
billingClient.queryPurchasesAsync(BillingClient.SkuType.INAPP, new PurchasesResponseListener() { QueryPurchasesParams.Builder builder = QueryPurchasesParams.newBuilder();
builder.setProductType(BillingClient.ProductType.INAPP);
billingClient.queryPurchasesAsync(builder.build(), new PurchasesResponseListener() {
@Override @Override
public void onQueryPurchasesResponse(@NonNull BillingResult result, @NonNull List<Purchase> list) { public void onQueryPurchasesResponse(@NonNull BillingResult result, @NonNull List<Purchase> list) {
if (result.getResponseCode() == BillingClient.BillingResponseCode.OK) { if (result.getResponseCode() == BillingClient.BillingResponseCode.OK) {
@ -396,7 +408,9 @@ public class ActivityBilling extends ActivityBase implements
} }
private void queryPurchases() { private void queryPurchases() {
billingClient.queryPurchasesAsync(BillingClient.SkuType.INAPP, this); QueryPurchasesParams.Builder builder = QueryPurchasesParams.newBuilder();
builder.setProductType(BillingClient.ProductType.INAPP);
billingClient.queryPurchasesAsync(builder.build(), this);
} }
@Override @Override
@ -518,23 +532,35 @@ public class ActivityBilling extends ActivityBase implements
} }
private void querySkus(List<String> query) { private void querySkus(List<String> query) {
Log.i("IAB query SKUs"); Log.i("IAB query product details");
SkuDetailsParams.Builder builder = SkuDetailsParams.newBuilder();
builder.setSkusList(query); List<QueryProductDetailsParams.Product> products = new ArrayList<>();
builder.setType(BillingClient.SkuType.INAPP); for (String product : query) {
billingClient.querySkuDetailsAsync(builder.build(), this); QueryProductDetailsParams.Product.Builder pBuilder = QueryProductDetailsParams.Product.newBuilder();
pBuilder.setProductId(product);
pBuilder.setProductType(BillingClient.ProductType.INAPP);
products.add(pBuilder.build());
} }
@Override QueryProductDetailsParams.Builder builder = QueryProductDetailsParams.newBuilder();
public void onSkuDetailsResponse(@NonNull BillingResult result, List<SkuDetails> skuDetailsList) { builder.setProductList(products);
billingClient.queryProductDetailsAsync(builder.build(), this);
}
public void onProductDetailsResponse(@NonNull BillingResult result, @NonNull QueryProductDetailsResult productDetailsResult) {
if (result.getResponseCode() == BillingClient.BillingResponseCode.OK) { if (result.getResponseCode() == BillingClient.BillingResponseCode.OK) {
for (SkuDetails skuDetail : skuDetailsList) { for (ProductDetails productDetail : productDetailsResult.getProductDetailsList()) {
Log.i("IAB SKU detail=" + skuDetail); Log.i("IAB product detail=" + productDetail);
for (IBillingListener listener : listeners) for (IBillingListener listener : listeners) {
listener.onSkuDetails(skuDetail.getSku(), skuDetail.getPrice()); String product = productDetail.getProductId();
String price = productDetail.getOneTimePurchaseOfferDetails().getFormattedPrice();
Log.i("IAB product=" + product + " price=" + price);
listener.onSkuDetails(product, price);
}
} }
} else } else
reportError(result, "IAB query SKUs"); reportError(result, "IAB query product details");
} }
private void consumePurchase(final Purchase purchase) { private void consumePurchase(final Purchase purchase) {
@ -573,6 +599,8 @@ public class ActivityBilling extends ActivityBase implements
editor.putLong(sku + ".cached", new Date().getTime()); editor.putLong(sku + ".cached", new Date().getTime());
editor.apply(); editor.apply();
Log.i("IAB ackknowledged purchase SKU=" + sku);
for (IBillingListener listener : listeners) for (IBillingListener listener : listeners)
listener.onPurchased(sku, true); listener.onPurchased(sku, true);
@ -640,6 +668,17 @@ public class ActivityBilling extends ActivityBase implements
} }
private static String getBillingResponseText(BillingResult result) { private static String getBillingResponseText(BillingResult result) {
switch (result.getOnPurchasesUpdatedSubResponseCode()) {
case BillingClient.OnPurchasesUpdatedSubResponseCode.PAYMENT_DECLINED_DUE_TO_INSUFFICIENT_FUNDS:
return _getBillingResponseText(result) + " - PAYMENT_DECLINED_DUE_TO_INSUFFICIENT_FUNDS";
case BillingClient.OnPurchasesUpdatedSubResponseCode.USER_INELIGIBLE:
return _getBillingResponseText(result) + " - USER_INELIGIBLE";
default:
return _getBillingResponseText(result);
}
}
private static String _getBillingResponseText(BillingResult result) {
switch (result.getResponseCode()) { switch (result.getResponseCode()) {
case BillingClient.BillingResponseCode.BILLING_UNAVAILABLE: case BillingClient.BillingResponseCode.BILLING_UNAVAILABLE:
// Billing API version is not supported for the type requested // Billing API version is not supported for the type requested

Write Preview
Loading…
Cancel
Save