Qortal/altcoinj
3
0
Fork 0
mirror of https://github.com/Qortal/altcoinj.git synced 2025-02-07 23:03:04 +00:00
Code Issues Projects Releases Wiki Activity

Re-add verifyPki method to PaymentSession to avoid needless API churn.

Browse Source
This commit is contained in:
Mike Hearn 2014-04-14 17:05:29 +02:00
parent 81f62db0e9
commit 843fa633f3
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
core/src/main/java/com/google/bitcoin/protocols/payments/PaymentSession.java
View File

@ -1,7 +1,4 @@
/** /**
* Copyright 2013 Google Inc.
* Copyright 2014 Andreas Schildbach
*
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
* You may obtain a copy of the License at * You may obtain a copy of the License at
@ -65,8 +62,6 @@ import java.util.concurrent.Callable;
* as a confirmation message that the payment is now "processing" or that an error occurred, and then broadcast the * as a confirmation message that the payment is now "processing" or that an error occurred, and then broadcast the
* tx itself later if needed.</p> * tx itself later if needed.</p>
* *
* @author Kevin Greene
* @author Andreas Schildbach
* @see <a href="https://github.com/bitcoin/bips/blob/master/bip-0070.mediawiki">BIP 0070</a> * @see <a href="https://github.com/bitcoin/bips/blob/master/bip-0070.mediawiki">BIP 0070</a>
*/ */
public class PaymentSession { public class PaymentSession {
@ -79,9 +74,9 @@ public class PaymentSession {
/** /**
* Stores the calculated PKI verification data, or null if none is available. * Stores the calculated PKI verification data, or null if none is available.
* Only valid after the session is created with verifyPki set to true, or verifyPki() is manually called. * Only valid after the session is created with the verifyPki parameter set to true.
*/ */
public final PkiVerificationData pkiVerificationData; @Nullable public final PkiVerificationData pkiVerificationData;
/** /**
* Returns a future that will be notified with a PaymentSession object after it is fetched using the provided uri. * Returns a future that will be notified with a PaymentSession object after it is fetched using the provided uri.
@ -417,6 +412,11 @@ public class PaymentSession {
} }
} }
/** Returns the value of pkiVerificationData or null if it wasn't verified at construction time. */
@Nullable public PkiVerificationData verifyPki() {
return pkiVerificationData;
}
/** Gets the params as read from the PaymentRequest.network field: main is the default if missing. */ /** Gets the params as read from the PaymentRequest.network field: main is the default if missing. */
public NetworkParameters getNetworkParameters() { public NetworkParameters getNetworkParameters() {
return params; return params;