From 2a70423a2247e4898183d281c5b19ca60ec18836 Mon Sep 17 00:00:00 2001 From: Alex Hart Date: Fri, 5 Nov 2021 10:19:09 -0300 Subject: [PATCH] Fix boolean logic for isExpirationWithinAMonth --- .../securesms/jobs/BoostReceiptRequestResponseJob.java | 7 ++++++- .../jobs/SubscriptionReceiptRequestResponseJob.java | 9 ++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/BoostReceiptRequestResponseJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/BoostReceiptRequestResponseJob.java index 213190ba1e..1c2f336c85 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/BoostReceiptRequestResponseJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/BoostReceiptRequestResponseJob.java @@ -182,7 +182,12 @@ public class BoostReceiptRequestResponseJob extends BaseJob { boolean isCorrectLevel = receiptCredential.getReceiptLevel() == 1; boolean isExpiration86400 = receiptCredential.getReceiptExpirationTime() % 86400 == 0; boolean isExpirationInTheFuture = receiptCredential.getReceiptExpirationTime() > now; - boolean isExpirationWithinAMonth = receiptCredential.getReceiptExpirationTime() < monthFromNow; + boolean isExpirationWithinAMonth = receiptCredential.getReceiptExpirationTime() <= monthFromNow; + + Log.d(TAG, "Credential validation: isCorrectLevel(" + isCorrectLevel + + ") isExpiration86400(" + isExpiration86400 + + ") isExpirationInTheFuture(" + isExpirationInTheFuture + + ") isExpirationWithinAMonth(" + isExpirationWithinAMonth + ")", true); return isCorrectLevel && isExpiration86400 && isExpirationInTheFuture && isExpirationWithinAMonth; } diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/SubscriptionReceiptRequestResponseJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/SubscriptionReceiptRequestResponseJob.java index 154d4e72b7..1b48e681b6 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/SubscriptionReceiptRequestResponseJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/SubscriptionReceiptRequestResponseJob.java @@ -20,17 +20,12 @@ import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint; import org.thoughtcrime.securesms.keyvalue.SignalStore; import org.thoughtcrime.securesms.subscription.Subscriber; import org.thoughtcrime.securesms.subscription.SubscriptionNotification; -import org.whispersystems.libsignal.util.Pair; import org.whispersystems.signalservice.api.subscriptions.ActiveSubscription; -import org.whispersystems.signalservice.api.subscriptions.IdempotencyKey; import org.whispersystems.signalservice.api.subscriptions.SubscriberId; import org.whispersystems.signalservice.internal.ServiceResponse; import java.io.IOException; import java.security.SecureRandom; -import java.util.Arrays; -import java.util.List; -import java.util.UUID; import java.util.concurrent.TimeUnit; /** @@ -214,13 +209,13 @@ public class SubscriptionReceiptRequestResponseJob extends BaseJob { boolean isExpirationAfterSub = subscription.getEndOfCurrentPeriod() < receiptCredential.getReceiptExpirationTime(); boolean isExpiration86400 = receiptCredential.getReceiptExpirationTime() % 86400 == 0; boolean isExpirationInTheFuture = receiptCredential.getReceiptExpirationTime() > now; - boolean isExpirationWithinAMonth = receiptCredential.getReceiptExpirationTime() < monthFromNow; + boolean isExpirationWithinAMonth = receiptCredential.getReceiptExpirationTime() <= monthFromNow; Log.d(TAG, "Credential validation: isSameLevel(" + isSameLevel + ") isExpirationAfterSub(" + isExpirationAfterSub + ") isExpiration86400(" + isExpiration86400 + ") isExpirationInTheFuture(" + isExpirationInTheFuture + - ") isExpirationWithinAMonth(" + isExpirationWithinAMonth + ")"); + ") isExpirationWithinAMonth(" + isExpirationWithinAMonth + ")", true); return isSameLevel && isExpirationAfterSub && isExpiration86400 && isExpirationInTheFuture && isExpirationWithinAMonth; }