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

Fix bad active state check for subscriptions.

Browse source
This commit is contained in:
Alex Hart 2024-11-21 11:04:28 -04:00 • committed by Greyson Parrelli
parent 49eb80b440
commit af44985071
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libsignal-service/src/main/java/org/whispersystems/signalservice/api/subscriptions/ActiveSubscription.java
View file

@ -137,7 +137,7 @@ public final class ActiveSubscription {
}
public boolean isInProgress() {
return !isActive() && (!isFailedPayment() || isPastDue()) && !isCanceled();
return activeSubscription != null && !isActive() && (!isFailedPayment() || isPastDue()) && !isCanceled();
}
public boolean isPastDue() {

7
libsignal-service/src/test/java/org/whispersystems/signalservice/api/subscriptions/ActiveSubscriptionTest.java
View file

@ -15,4 +15,11 @@ public class ActiveSubscriptionTest {
assertTrue(activeSubscription.isActive());
assertFalse(activeSubscription.isFailedPayment());
}
@Test
public void givenNoActiveSubscription_whenIIsInProgress_thenIExpectFalse() throws Exception {
ActiveSubscription activeSubscription = new ActiveSubscription(null, null);
assertFalse(activeSubscription.isInProgress());
}
}