Skip to content

Commit af44985

Browse files
alex-signalgreyson-signal
authored andcommitted
Fix bad active state check for subscriptions.
1 parent 49eb80b commit af44985

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ public boolean isPendingBankTransfer() {
137137
}
138138

139139
public boolean isInProgress() {
140-
return !isActive() && (!isFailedPayment() || isPastDue()) && !isCanceled();
140+
return activeSubscription != null && !isActive() && (!isFailedPayment() || isPastDue()) && !isCanceled();
141141
}
142142

143143
public boolean isPastDue() {

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,11 @@ public void givenActiveSubscription_whenIIsPaymentFailure_thenIExpectFalse() thr
1515
assertTrue(activeSubscription.isActive());
1616
assertFalse(activeSubscription.isFailedPayment());
1717
}
18+
19+
@Test
20+
public void givenNoActiveSubscription_whenIIsInProgress_thenIExpectFalse() throws Exception {
21+
ActiveSubscription activeSubscription = new ActiveSubscription(null, null);
22+
23+
assertFalse(activeSubscription.isInProgress());
24+
}
1825
}

0 commit comments

Comments
 (0)