Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2025-12-23 20:48:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve error code handling in recurring context job.

Browse Source
This commit is contained in:
Alex Hart
2025-03-17 15:05:11 -03:00
committed by GitHub
parent 0d133b8d1e
commit a7fb84e7e6
1 changed files with 29 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
app/src/main/java/org/thoughtcrime/securesms/jobs/InAppPaymentRecurringContextJob.kt
View File

@@ -26,6 +26,7 @@ import org.thoughtcrime.securesms.jobmanager.Job
import org.thoughtcrime.securesms.jobmanager.JobManager.Chain
import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint
import org.thoughtcrime.securesms.keyvalue.SignalStore
import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException
import org.whispersystems.signalservice.api.subscriptions.ActiveSubscription
import org.whispersystems.signalservice.api.subscriptions.ActiveSubscription.ChargeFailure
import org.whispersystems.signalservice.api.subscriptions.ActiveSubscription.Subscription
@@ -117,6 +118,10 @@ class InAppPaymentRecurringContextJob private constructor(
}
override fun getNextRunAttemptBackoff(pastAttemptCount: Int, exception: java.lang.Exception): Long {
if (exception is InAppPaymentRetryException && exception.cause is NonSuccessfulResponseCodeException) {
return super.getNextRunAttemptBackoff(pastAttemptCount, exception)
}
val inAppPayment = SignalDatabase.inAppPayments.getById(inAppPaymentId)
return if (inAppPayment != null) {
when (inAppPayment.data.paymentMethodType) {
@@ -186,7 +191,20 @@ class InAppPaymentRecurringContextJob private constructor(
endOfCurrentSubscriptionPeriod: Long
): Boolean {
@Suppress("UsePropertyAccessSyntax")
val whoAmIResponse = AppDependencies.signalServiceAccountManager.getWhoAmI()
val whoAmIResponse = try {
AppDependencies.signalServiceAccountManager.getWhoAmI()
} catch (e: NonSuccessfulResponseCodeException) {
warning("Failed to download whoAmI information for user: HTTP ${e.code}", e)
if (isRetryableErrorCode(e.code)) {
info("Retrying later for code ${e.code}")
throw InAppPaymentRetryException(e)
} else {
throw e
}
} catch (e: IOException) {
info("Retrying for network exception.")
throw InAppPaymentRetryException(e)
}
return when (inAppPayment.type) {
InAppPaymentType.RECURRING_BACKUP -> {
@@ -205,6 +223,10 @@ class InAppPaymentRecurringContextJob private constructor(
}
}
private fun isRetryableErrorCode(code: Int): Boolean {
return (code >= 500 || code == 429) && code != 508
}
private fun markInAppPaymentCompleted(inAppPayment: InAppPaymentTable.InAppPayment) {
SignalDatabase.inAppPayments.update(
inAppPayment = inAppPayment.copy(
@@ -484,6 +506,12 @@ class InAppPaymentRecurringContextJob private constructor(
throw Exception(applicationError)
}
508 -> {
warning("Loop detected on server. Failing.", applicationError)
updateInAppPaymentWithGenericRedemptionError(inAppPayment)
throw Exception(applicationError)
}
else -> {
warning("Encountered a server error.", applicationError)