mirrors/bitcoinj
1
0
Fork 0
mirror of https://github.com/bitcoinj/bitcoinj.git synced 2025-01-19 05:33:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

PaymentSession: rename expires() method from getExpiresInstant()

Browse Source
This commit is contained in:
Andreas Schildbach 2023-03-18 11:03:17 +01:00
parent f583cea035
commit 5ae145e6b4
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/src/main/java/org/bitcoinj/protocols/payments/PaymentSession.java
View File

@ -270,18 +270,18 @@ public class PaymentSession {
/**
* Returns the expires time of the payment request, or empty if none.
*/
public Optional<Instant> getExpiresInstant() {
public Optional<Instant> expires() {
if (paymentDetails.hasExpires())
return Optional.of(Instant.ofEpochSecond(paymentDetails.getExpires()));
else
return Optional.empty();
}
/** @deprecated use {@link #getExpiresInstant()} */
/** @deprecated use {@link #expires()} */
@Nullable
@Deprecated
public Date getExpires() {
return getExpiresInstant()
return expires()
.map(Date::from)
.orElse(null);
}
@ -290,7 +290,7 @@ public class PaymentSession {
* This should always be called before attempting to call sendPayment.
*/
public boolean isExpired() {
return getExpiresInstant()
return expires()
.map(time -> TimeUtils.currentTime().isAfter(time))
.orElse(false);
}