Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-05-02 14:43:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Replace monthly badge expires with cancellation dialogs.

Browse Source
This commit is contained in:
Cody Henthorne
2023-11-16 10:22:01 -05:00
committed by GitHub
parent 62bf5abd8d
commit df4bd1fa4a
16 changed files with 384 additions and 301 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libsignal-service/src/main/java/org/whispersystems/signalservice/api/subscriptions/ActiveSubscription.java
View File

@@ -136,7 +136,11 @@ public final class ActiveSubscription {
}
public boolean isInProgress() {
return activeSubscription != null && !isActive() && !activeSubscription.isFailedPayment();
return activeSubscription != null && !isActive() && (!activeSubscription.isFailedPayment() || activeSubscription.isPastDue());
}
public boolean isPastDue() {
return activeSubscription != null && activeSubscription.isPastDue();
}
public boolean isFailedPayment() {
@@ -249,6 +253,10 @@ public final class ActiveSubscription {
return Status.isPaymentFailed(getStatus());
}
public boolean isPastDue() {
return Status.getStatus(getStatus()) == Status.PAST_DUE;
}
public boolean isCanceled() {
return Status.getStatus(getStatus()) == Status.CANCELED;
}