Skip to content

Commit

Permalink
Update billing library
Browse files Browse the repository at this point in the history
  • Loading branch information
@Gedsh
Gedsh committed May 25, 2021
1 parent 03acd54 commit ee48211
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 28 deletions.
4 changes: 2 additions & 2 deletions tordnscrypt/owner.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -176,14 +176,14 @@ dependencies {
implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
implementation 'androidx.recyclerview:recyclerview:1.2.0'
implementation 'androidx.preference:preference-ktx:1.1.1'
google_playImplementation 'com.android.billingclient:billing:3.0.3'
google_playImplementation 'com.android.billingclient:billing:4.0.0'
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.1.2'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
//noinspection GradleDynamicVersion
implementation 'eu.chainfire:libsuperuser:1.1.0.+'
implementation 'com.jrummyapps:android-shell:1.0.1'
implementation "androidx.core:core-ktx:1.3.2"
implementation "androidx.core:core-ktx:1.5.0"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
implementation project(':filepicker')
}
57 changes: 31 additions & 26 deletions tordnscrypt/src/google_play/java/pan/alexander/tordnscrypt/assistance/AccelerateDevelop.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,14 @@
import com.android.billingclient.api.BillingFlowParams;
import com.android.billingclient.api.BillingResult;
import com.android.billingclient.api.Purchase;
import com.android.billingclient.api.PurchasesResponseListener;
import com.android.billingclient.api.PurchasesUpdatedListener;
import com.android.billingclient.api.SkuDetails;
import com.android.billingclient.api.SkuDetailsParams;
import com.android.billingclient.api.SkuDetailsResponseListener;

import org.jetbrains.annotations.NotNull;

import java.security.Key;
import java.security.KeyFactory;
import java.security.PublicKey;
Expand Down Expand Up @@ -137,18 +140,7 @@ public void onBillingSetupFinished(BillingResult billingResult) {
Log.i(LOG_TAG, "Billing setup is finished");
//below you can query information about products and purchase
querySkuDetails(); //query for products
List<Purchase> purchasesList = queryPurchases(); //query for purchases

//if the purchase has already been made to give the goods
if (purchasesList != null) {
handlePurchases(purchasesList);
} else if (!signedData.isEmpty() && !signature.isEmpty() && verifyValidSignature(signedData, signature)) {
Log.w(LOG_TAG, "Purchases list is null but saved signature is correct. Allowing...");
payComplete();
} else {
Log.w(LOG_TAG, "Purchases list is null. Skipping...");
noPayment();
}
queryPurchases(); //query for purchases
}
}

Expand Down Expand Up @@ -200,9 +192,22 @@ public void onSkuDetailsResponse(@NonNull BillingResult billingResult, List<SkuD
});
}

private List<Purchase> queryPurchases() {
Purchase.PurchasesResult purchasesResult = mBillingClient.queryPurchases(BillingClient.SkuType.INAPP);
return purchasesResult.getPurchasesList();
private void queryPurchases() {
mBillingClient.queryPurchasesAsync(BillingClient.SkuType.INAPP, new PurchasesResponseListener() {
@Override
public void onQueryPurchasesResponse(@NonNull @NotNull BillingResult billingResult, @NonNull @NotNull List<Purchase> purchasesList) {
//if the purchase has already been made to give the goods
if (billingResult.getResponseCode() == BillingClient.BillingResponseCode.OK) {
handlePurchases(purchasesList);
} else if (!signedData.isEmpty() && !signature.isEmpty() && verifyValidSignature(signedData, signature)) {
Log.w(LOG_TAG, "Query purchases fault: "+ billingResult.getDebugMessage() + " But saved signature is correct. Allowing...");
payComplete();
} else {
Log.w(LOG_TAG, "Query purchases fault: " + billingResult.getDebugMessage() + " Skipping...");
noPayment();
}
}
});
}

private void handlePurchases(@NonNull List<Purchase> purchasesList) {
Expand Down Expand Up @@ -235,11 +240,11 @@ private void handlePurchases(@NonNull List<Purchase> purchasesList) {
continue;
}

String purchaseId = purchase.getSku();
List<String> purchaseIds = purchase.getSkus();
int purchaseState = purchase.getPurchaseState();
boolean acknowledged = purchase.isAcknowledged();

if(TextUtils.equals(mSkuId, purchaseId) && purchaseState == Purchase.PurchaseState.PURCHASED) {
if (purchaseIds.contains(mSkuId) && purchaseState == Purchase.PurchaseState.PURCHASED) {

if (!verifyValidSignature(purchase.getOriginalJson(), purchase.getSignature())) {
if (!acknowledged && activity != null) {
Expand All @@ -265,7 +270,7 @@ private void handlePurchases(@NonNull List<Purchase> purchasesList) {
@Override
public void onAcknowledgePurchaseResponse(@NonNull BillingResult billingResult) {
if (billingResult.getResponseCode() == BillingClient.BillingResponseCode.OK) {
Log.i(LOG_TAG, "Purchase is acknowledged " + purchase.getSku());
Log.i(LOG_TAG, "Purchase is acknowledged " + purchase.getSkus());

if (activity != null) {
activity.runOnUiThread(() -> {
Expand All @@ -283,21 +288,21 @@ public void onAcknowledgePurchaseResponse(@NonNull BillingResult billingResult)
});
}
} else {
Log.i(LOG_TAG, "Purchase is not acknowledged " + purchase.getSku() + " " + billingResult.getDebugMessage());
Log.i(LOG_TAG, "Purchase is not acknowledged " + purchase.getSkus() + " " + billingResult.getDebugMessage());
}
}
});
}

payComplete();
return;
} else if (TextUtils.equals(mSkuId, purchaseId) && purchaseState == Purchase.PurchaseState.PENDING) {
Log.i(LOG_TAG, "Purchase is pending " + purchase.getSku());
} else if (purchaseIds.contains(mSkuId) && purchaseState == Purchase.PurchaseState.PENDING) {
Log.i(LOG_TAG, "Purchase is pending " + purchase.getSkus());

if (activity != null) {
NotificationHelper notificationHelper = NotificationHelper.setHelperMessage(
context, activity.getString(R.string.pending_purchase)
+ " " + purchase.getSku()
+ " " + TextUtils.join(", ", purchase.getSkus())
+ " " + purchase.getOrderId(), "pending_purchase");
if (notificationHelper != null && !activity.isDestroyed()) {
notificationHelper.show(activity.getSupportFragmentManager(), NotificationHelper.TAG_HELPER);
Expand Down Expand Up @@ -330,12 +335,12 @@ && verifyValidSignature(signedData, signature)) {
Log.w(LOG_TAG, "BillingService connection failed. Skipping...");
noPayment();
}

lock.unlock();
}
} catch (Exception e) {
Log.e(LOG_TAG, "AccelerateDevelop startBillingConnection Exception "
+ e.getMessage() + " " + e.getCause() + " " + Arrays.toString(e.getStackTrace()));
} finally {
lock.unlock();
}
});
}
Expand All @@ -350,7 +355,7 @@ private boolean verifyValidSignature(String signedData, String signature) {
sig.initVerify(pkey);
sig.update(signedData.getBytes());

if(sig.verify(Base64.decode(signature, Base64.DEFAULT))) {
if (sig.verify(Base64.decode(signature, Base64.DEFAULT))) {
result = true;
} else {
Log.e(LOG_TAG, "AccelerateDevelop signature is wrong " + signature);
Expand Down Expand Up @@ -382,7 +387,7 @@ private byte[] RSADecrypt(final String encryptedText, final Key key) {
return result;
}

private PublicKey getAPKKey() throws Exception{
private PublicKey getAPKKey() throws Exception {
byte[] decodedKey = Base64.decode(context.getString(R.string.gp_property), Base64.DEFAULT);
KeyFactory keyFactory = KeyFactory.getInstance("RSA");
return keyFactory.generatePublic(new X509EncodedKeySpec(decodedKey));
Expand Down

0 comments on commit ee48211

Please sign in to comment.