empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Expand donation job logging.

Browse source
This commit is contained in:
Alex Hart 2021-11-19 10:19:06 -04:00 • committed by Cody Henthorne
parent db4a0deccc
commit 73d8c74718
4 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/DonationPaymentRepository.kt
View file

@ -160,9 +160,11 @@ class DonationPaymentRepository(activity: Activity) : StripeApi.PaymentIntentFet
} }
} }
} else { } else {
Log.d(TAG, "Boost redemption timed out waiting for job completion.", true)
it.onError(DonationExceptions.TimedOutWaitingForTokenRedemption) it.onError(DonationExceptions.TimedOutWaitingForTokenRedemption)
} }
} catch (e: InterruptedException) { } catch (e: InterruptedException) {
Log.d(TAG, "Boost redemption job interrupted", e, true)
it.onError(DonationExceptions.TimedOutWaitingForTokenRedemption) it.onError(DonationExceptions.TimedOutWaitingForTokenRedemption)
} }
} }

10
app/src/main/java/org/thoughtcrime/securesms/jobs/BoostReceiptRequestResponseJob.java
View file

@ -1,7 +1,5 @@
package org.thoughtcrime.securesms.jobs; package org.thoughtcrime.securesms.jobs;
import android.content.Context;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting; import androidx.annotation.VisibleForTesting;
@ -45,8 +43,6 @@ public class BoostReceiptRequestResponseJob extends BaseJob {
private final String paymentIntentId; private final String paymentIntentId;
private boolean isPaymentFailure;
static BoostReceiptRequestResponseJob createJob(StripeApi.PaymentIntent paymentIntent) { static BoostReceiptRequestResponseJob createJob(StripeApi.PaymentIntent paymentIntent) {
return new BoostReceiptRequestResponseJob( return new BoostReceiptRequestResponseJob(
new Parameters new Parameters
@ -105,6 +101,8 @@ public class BoostReceiptRequestResponseJob extends BaseJob {
@Override @Override
protected void onRun() throws Exception { protected void onRun() throws Exception {
if (requestContext == null) { if (requestContext == null) {
Log.d(TAG, "Creating request context..");
SecureRandom secureRandom = new SecureRandom(); SecureRandom secureRandom = new SecureRandom();
byte[] randomBytes = new byte[ReceiptSerial.SIZE]; byte[] randomBytes = new byte[ReceiptSerial.SIZE];
@ -114,8 +112,11 @@ public class BoostReceiptRequestResponseJob extends BaseJob {
ClientZkReceiptOperations operations = ApplicationDependencies.getClientZkReceiptOperations(); ClientZkReceiptOperations operations = ApplicationDependencies.getClientZkReceiptOperations();
requestContext = operations.createReceiptCredentialRequestContext(secureRandom, receiptSerial); requestContext = operations.createReceiptCredentialRequestContext(secureRandom, receiptSerial);
} else {
Log.d(TAG, "Reusing request context from previous run", true);
} }
Log.d(TAG, "Submitting credential to server", true);
ServiceResponse<ReceiptCredentialResponse> response = ApplicationDependencies.getDonationsService() ServiceResponse<ReceiptCredentialResponse> response = ApplicationDependencies.getDonationsService()
.submitBoostReceiptCredentialRequest(paymentIntentId, requestContext.getRequest()) .submitBoostReceiptCredentialRequest(paymentIntentId, requestContext.getRequest())
.blockingGet(); .blockingGet();
@ -130,6 +131,7 @@ public class BoostReceiptRequestResponseJob extends BaseJob {
throw new IOException("Could not validate receipt credential"); throw new IOException("Could not validate receipt credential");
} }
Log.d(TAG, "Validated credential. Handing off to redemption job.", true);
ReceiptCredentialPresentation receiptCredentialPresentation = getReceiptCredentialPresentation(receiptCredential); ReceiptCredentialPresentation receiptCredentialPresentation = getReceiptCredentialPresentation(receiptCredential);
setOutputData(new Data.Builder().putBlobAsString(DonationReceiptRedemptionJob.INPUT_RECEIPT_CREDENTIAL_PRESENTATION, setOutputData(new Data.Builder().putBlobAsString(DonationReceiptRedemptionJob.INPUT_RECEIPT_CREDENTIAL_PRESENTATION,
receiptCredentialPresentation.serialize()) receiptCredentialPresentation.serialize())

3
app/src/main/java/org/thoughtcrime/securesms/jobs/DonationReceiptRedemptionJob.java
View file

@ -77,6 +77,7 @@ public class DonationReceiptRedemptionJob extends BaseJob {
} }
if (isForSubscription()) { if (isForSubscription()) {
Log.d(TAG, "Marking subscription failure", true);
SignalStore.donationsValues().markSubscriptionRedemptionFailed(); SignalStore.donationsValues().markSubscriptionRedemptionFailed();
} }
} }
@ -102,6 +103,7 @@ public class DonationReceiptRedemptionJob extends BaseJob {
ReceiptCredentialPresentation presentation = new ReceiptCredentialPresentation(presentationBytes); ReceiptCredentialPresentation presentation = new ReceiptCredentialPresentation(presentationBytes);
Log.d(TAG, "Attempting to redeem token... isForSubscription: " + isForSubscription(), true);
ServiceResponse<EmptyResponse> response = ApplicationDependencies.getDonationsService() ServiceResponse<EmptyResponse> response = ApplicationDependencies.getDonationsService()
.redeemReceipt(presentation, .redeemReceipt(presentation,
SignalStore.donationsValues().getDisplayBadgesOnProfile(), SignalStore.donationsValues().getDisplayBadgesOnProfile(),
@ -122,6 +124,7 @@ public class DonationReceiptRedemptionJob extends BaseJob {
} }
if (isForSubscription()) { if (isForSubscription()) {
Log.d(TAG, "Clearing subscription failure", true);
SignalStore.donationsValues().clearSubscriptionRedemptionFailed(); SignalStore.donationsValues().clearSubscriptionRedemptionFailed();
} }
} }

5
app/src/main/java/org/thoughtcrime/securesms/jobs/SubscriptionReceiptRequestResponseJob.java
View file

@ -124,6 +124,7 @@ public class SubscriptionReceiptRequestResponseJob extends BaseJob {
} }
if (requestContext == null) { if (requestContext == null) {
Log.d(TAG, "Generating request credentials context for token redemption...", true);
SecureRandom secureRandom = new SecureRandom(); SecureRandom secureRandom = new SecureRandom();
byte[] randomBytes = new byte[ReceiptSerial.SIZE]; byte[] randomBytes = new byte[ReceiptSerial.SIZE];
@ -133,8 +134,11 @@ public class SubscriptionReceiptRequestResponseJob extends BaseJob {
ClientZkReceiptOperations operations = ApplicationDependencies.getClientZkReceiptOperations(); ClientZkReceiptOperations operations = ApplicationDependencies.getClientZkReceiptOperations();
requestContext = operations.createReceiptCredentialRequestContext(secureRandom, receiptSerial); requestContext = operations.createReceiptCredentialRequestContext(secureRandom, receiptSerial);
} else {
Log.d(TAG, "Already have credentials generated for this request. Retrying web service call...", true);
} }
Log.d(TAG, "Submitting receipt credential request.");
ServiceResponse<ReceiptCredentialResponse> response = ApplicationDependencies.getDonationsService() ServiceResponse<ReceiptCredentialResponse> response = ApplicationDependencies.getDonationsService()
.submitReceiptCredentialRequest(subscriberId, requestContext.getRequest()) .submitReceiptCredentialRequest(subscriberId, requestContext.getRequest())
.blockingGet(); .blockingGet();
@ -152,6 +156,7 @@ public class SubscriptionReceiptRequestResponseJob extends BaseJob {
throw new IOException("Could not validate receipt credential"); throw new IOException("Could not validate receipt credential");
} }
Log.d(TAG, "Validated credential. Handing off to redemption job.", true);
ReceiptCredentialPresentation receiptCredentialPresentation = getReceiptCredentialPresentation(receiptCredential); ReceiptCredentialPresentation receiptCredentialPresentation = getReceiptCredentialPresentation(receiptCredential);
setOutputData(new Data.Builder().putBlobAsString(DonationReceiptRedemptionJob.INPUT_RECEIPT_CREDENTIAL_PRESENTATION, setOutputData(new Data.Builder().putBlobAsString(DonationReceiptRedemptionJob.INPUT_RECEIPT_CREDENTIAL_PRESENTATION,
receiptCredentialPresentation.serialize()) receiptCredentialPresentation.serialize())