diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/SubscriptionKeepAliveJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/SubscriptionKeepAliveJob.java index 0f039a5076..03612b8e89 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/SubscriptionKeepAliveJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/SubscriptionKeepAliveJob.java @@ -90,11 +90,16 @@ public class SubscriptionKeepAliveJob extends BaseJob { Log.i(TAG, "Successful call to GET active subscription", true); ActiveSubscription activeSubscription = activeSubscriptionResponse.getResult().get(); - if (activeSubscription.getActiveSubscription() == null || !activeSubscription.getActiveSubscription().isActive()) { + if (activeSubscription.getActiveSubscription() == null) { Log.i(TAG, "User does not have an active subscription. Exiting.", true); return; } + if (!activeSubscription.getActiveSubscription().isActive()) { + Log.i(TAG, "User has an inactive subscription. Status message: " + activeSubscription.getActiveSubscription().getStatus() + " Exiting.", true); + return; + } + if (activeSubscription.getActiveSubscription().getEndOfCurrentPeriod() > SignalStore.donationsValues().getLastEndOfPeriod()) { Log.i(TAG, String.format(Locale.US,