LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

rework an ugly hack in processPaymentRequest()

Browse source 
- use a QStringList to store valid addresses and format them for GUI and
  debug.log usage via .join()
This commit is contained in:
Philip Kaufmann 2013-10-30 11:26:44 +01:00
parent 952d2cdb56
commit 395d0d5af0
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/qt/paymentserver.cpp
View file

@ -453,16 +453,14 @@ bool PaymentServer::processPaymentRequest(PaymentRequestPlus& request, SendCoins
request.getMerchant(PaymentServer::certStore, recipient.authenticatedMerchant); request.getMerchant(PaymentServer::certStore, recipient.authenticatedMerchant);
QList<std::pair<CScript, qint64> > sendingTos = request.getPayTo(); QList<std::pair<CScript, qint64> > sendingTos = request.getPayTo();
QStringList addresses;
int i = 0;
foreach(const PAIRTYPE(CScript, qint64)& sendingTo, sendingTos) { foreach(const PAIRTYPE(CScript, qint64)& sendingTo, sendingTos) {
// Extract and check destination addresses // Extract and check destination addresses
CTxDestination dest; CTxDestination dest;
if (ExtractDestination(sendingTo.first, dest)) { if (ExtractDestination(sendingTo.first, dest)) {
// Append destination address (for payment requests .address is used ONLY for GUI display) // Append destination address
recipient.address.append(QString::fromStdString(CBitcoinAddress(dest).ToString())); addresses.append(QString::fromStdString(CBitcoinAddress(dest).ToString()));
if (i < sendingTos.size() - 1) // prevent new-line for last entry
recipient.address.append("<br />");
} }
else if (!recipient.authenticatedMerchant.isEmpty()){ else if (!recipient.authenticatedMerchant.isEmpty()){
// Insecure payments to custom bitcoin addresses are not supported // Insecure payments to custom bitcoin addresses are not supported
@ -486,7 +484,6 @@ bool PaymentServer::processPaymentRequest(PaymentRequestPlus& request, SendCoins
} }
recipient.amount += sendingTo.second; recipient.amount += sendingTo.second;
i++;
} }
// Store addresses and format them to fit nicely into the GUI // Store addresses and format them to fit nicely into the GUI
recipient.address = addresses.join("<br />"); recipient.address = addresses.join("<br />");