twisterarmy
/
twister-core
mirror of https://github.com/twisterarmy/twister-core.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge pull request #2157 from Diapolo/Qt_addrlist 

Bitcoin-Qt: fix known addressbook bugs
miguelfreitas
Wladimir J. van der Laan 12 years ago
parent
0c16cc73ef e6d2300562
commit
bd85cf3df7
4 changed files with 64 additions and 33 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 36
      src/qt/addresstablemodel.cpp
  2. 11
      src/qt/addresstablemodel.h
  3. 30
      src/qt/editaddressdialog.cpp
  4. 6
      src/qt/editaddressdialog.h

36
src/qt/addresstablemodel.cpp
Unescape View File

@ -69,6 +69,8 @@ public:
QString::fromStdString(address.ToString()))); QString::fromStdString(address.ToString())));
} }
} }
// qLowerBound() and qUpperBound() require our cachedAddressTable list to be sorted in asc order
qSort(cachedAddressTable.begin(), cachedAddressTable.end(), AddressTableEntryLessThan());
} }
void updateEntry(const QString &address, const QString &label, bool isMine, int status) void updateEntry(const QString &address, const QString &label, bool isMine, int status)
@ -208,7 +210,7 @@ QVariant AddressTableModel::data(const QModelIndex &index, int role) const
return QVariant(); return QVariant();
} }
bool AddressTableModel::setData(const QModelIndex & index, const QVariant & value, int role) bool AddressTableModel::setData(const QModelIndex &index, const QVariant &value, int role)
{ {
if(!index.isValid()) if(!index.isValid())
return false; return false;
@ -221,18 +223,36 @@ bool AddressTableModel::setData(const QModelIndex & index, const QVariant & valu
switch(index.column()) switch(index.column())
{ {
case Label: case Label:
// Do nothing, if old label == new label
if(rec->label == value.toString())
{
editStatus = NO_CHANGES;
return false;
}
wallet->SetAddressBookName(CBitcoinAddress(rec->address.toStdString()).Get(), value.toString().toStdString()); wallet->SetAddressBookName(CBitcoinAddress(rec->address.toStdString()).Get(), value.toString().toStdString());
rec->label = value.toString();
break; break;
case Address: case Address:
// Do nothing, if old address == new address
if(CBitcoinAddress(rec->address.toStdString()) == CBitcoinAddress(value.toString().toStdString()))
{
editStatus = NO_CHANGES;
return false;
}
// Refuse to set invalid address, set error status and return false // Refuse to set invalid address, set error status and return false
if(!walletModel->validateAddress(value.toString())) else if(!walletModel->validateAddress(value.toString()))
{ {
editStatus = INVALID_ADDRESS; editStatus = INVALID_ADDRESS;
return false; return false;
} }
// Check for duplicate addresses to prevent accidental deletion of addresses, if you try
// to paste an existing address over another address (with a different label)
else if(wallet->mapAddressBook.count(CBitcoinAddress(value.toString().toStdString()).Get()))
{
editStatus = DUPLICATE_ADDRESS;
return false;
}
// Double-check that we're not overwriting a receiving address // Double-check that we're not overwriting a receiving address
if(rec->type == AddressTableEntry::Sending) else if(rec->type == AddressTableEntry::Sending)
{ {
{ {
LOCK(wallet->cs_wallet); LOCK(wallet->cs_wallet);
@ -244,7 +264,6 @@ bool AddressTableModel::setData(const QModelIndex & index, const QVariant & valu
} }
break; break;
} }
return true; return true;
} }
return false; return false;
@ -262,7 +281,7 @@ QVariant AddressTableModel::headerData(int section, Qt::Orientation orientation,
return QVariant(); return QVariant();
} }
Qt::ItemFlags AddressTableModel::flags(const QModelIndex & index) const Qt::ItemFlags AddressTableModel::flags(const QModelIndex &index) const
{ {
if(!index.isValid()) if(!index.isValid())
return 0; return 0;
@ -279,7 +298,7 @@ Qt::ItemFlags AddressTableModel::flags(const QModelIndex & index) const
return retval; return retval;
} }
QModelIndex AddressTableModel::index(int row, int column, const QModelIndex & parent) const QModelIndex AddressTableModel::index(int row, int column, const QModelIndex &parent) const
{ {
Q_UNUSED(parent); Q_UNUSED(parent);
AddressTableEntry *data = priv->index(row); AddressTableEntry *data = priv->index(row);
@ -345,6 +364,7 @@ QString AddressTableModel::addRow(const QString &type, const QString &label, con
{ {
return QString(); return QString();
} }
// Add entry // Add entry
{ {
LOCK(wallet->cs_wallet); LOCK(wallet->cs_wallet);
@ -353,7 +373,7 @@ QString AddressTableModel::addRow(const QString &type, const QString &label, con
return QString::fromStdString(strAddress); return QString::fromStdString(strAddress);
} }
bool AddressTableModel::removeRows(int row, int count, const QModelIndex & parent) bool AddressTableModel::removeRows(int row, int count, const QModelIndex &parent)
{ {
Q_UNUSED(parent); Q_UNUSED(parent);
AddressTableEntry *rec = priv->index(row); AddressTableEntry *rec = priv->index(row);

11
src/qt/addresstablemodel.h
Unescape View File

@ -29,7 +29,8 @@ public:
/** Return status of edit/insert operation */ /** Return status of edit/insert operation */
enum EditStatus { enum EditStatus {
OK, OK, /**< Everything ok */
NO_CHANGES, /**< No changes were made during edit operation */
INVALID_ADDRESS, /**< Unparseable address */ INVALID_ADDRESS, /**< Unparseable address */
DUPLICATE_ADDRESS, /**< Address already in address book */ DUPLICATE_ADDRESS, /**< Address already in address book */
WALLET_UNLOCK_FAILURE, /**< Wallet could not be unlocked to create new receiving address */ WALLET_UNLOCK_FAILURE, /**< Wallet could not be unlocked to create new receiving address */
@ -44,11 +45,11 @@ public:
int rowCount(const QModelIndex &parent) const; int rowCount(const QModelIndex &parent) const;
int columnCount(const QModelIndex &parent) const; int columnCount(const QModelIndex &parent) const;
QVariant data(const QModelIndex &index, int role) const; QVariant data(const QModelIndex &index, int role) const;
bool setData(const QModelIndex & index, const QVariant & value, int role); bool setData(const QModelIndex &index, const QVariant &value, int role);
QVariant headerData(int section, Qt::Orientation orientation, int role) const; QVariant headerData(int section, Qt::Orientation orientation, int role) const;
QModelIndex index(int row, int column, const QModelIndex & parent) const; QModelIndex index(int row, int column, const QModelIndex &parent) const;
bool removeRows(int row, int count, const QModelIndex & parent = QModelIndex()); bool removeRows(int row, int count, const QModelIndex &parent = QModelIndex());
Qt::ItemFlags flags(const QModelIndex & index) const; Qt::ItemFlags flags(const QModelIndex &index) const;
/*@}*/ /*@}*/
/* Add an address to the model. /* Add an address to the model.

30
src/qt/editaddressdialog.cpp
Unescape View File

@ -25,7 +25,7 @@ EditAddressDialog::EditAddressDialog(Mode mode, QWidget *parent) :
break; break;
case EditReceivingAddress: case EditReceivingAddress:
setWindowTitle(tr("Edit receiving address")); setWindowTitle(tr("Edit receiving address"));
ui->addressEdit->setDisabled(true); ui->addressEdit->setEnabled(false);
break; break;
case EditSendingAddress: case EditSendingAddress:
setWindowTitle(tr("Edit sending address")); setWindowTitle(tr("Edit sending address"));
@ -44,6 +44,9 @@ EditAddressDialog::~EditAddressDialog()
void EditAddressDialog::setModel(AddressTableModel *model) void EditAddressDialog::setModel(AddressTableModel *model)
{ {
this->model = model; this->model = model;
if(!model)
return;
mapper->setModel(model); mapper->setModel(model);
mapper->addMapping(ui->labelEdit, AddressTableModel::Label); mapper->addMapping(ui->labelEdit, AddressTableModel::Label);
mapper->addMapping(ui->addressEdit, AddressTableModel::Address); mapper->addMapping(ui->addressEdit, AddressTableModel::Address);
@ -58,6 +61,7 @@ bool EditAddressDialog::saveCurrentRow()
{ {
if(!model) if(!model)
return false; return false;
switch(mode) switch(mode)
{ {
case NewReceivingAddress: case NewReceivingAddress:
@ -82,35 +86,39 @@ void EditAddressDialog::accept()
{ {
if(!model) if(!model)
return; return;
if(!saveCurrentRow()) if(!saveCurrentRow())
{ {
switch(model->getEditStatus()) switch(model->getEditStatus())
{ {
case AddressTableModel::DUPLICATE_ADDRESS: case AddressTableModel::OK:
QMessageBox::warning(this, windowTitle(), // Failed with unknown reason. Just reject.
tr("The entered address \"%1\" is already in the address book.").arg(ui->addressEdit->text()), break;
QMessageBox::Ok, QMessageBox::Ok); case AddressTableModel::NO_CHANGES:
// No changes were made during edit operation. Just reject.
break; break;
case AddressTableModel::INVALID_ADDRESS: case AddressTableModel::INVALID_ADDRESS:
QMessageBox::warning(this, windowTitle(), QMessageBox::warning(this, windowTitle(),
tr("The entered address \"%1\" is not a valid Bitcoin address.").arg(ui->addressEdit->text()), tr("The entered address \"%1\" is not a valid Bitcoin address.").arg(ui->addressEdit->text()),
QMessageBox::Ok, QMessageBox::Ok); QMessageBox::Ok, QMessageBox::Ok);
return; break;
case AddressTableModel::DUPLICATE_ADDRESS:
QMessageBox::warning(this, windowTitle(),
tr("The entered address \"%1\" is already in the address book.").arg(ui->addressEdit->text()),
QMessageBox::Ok, QMessageBox::Ok);
break;
case AddressTableModel::WALLET_UNLOCK_FAILURE: case AddressTableModel::WALLET_UNLOCK_FAILURE:
QMessageBox::critical(this, windowTitle(), QMessageBox::critical(this, windowTitle(),
tr("Could not unlock wallet."), tr("Could not unlock wallet."),
QMessageBox::Ok, QMessageBox::Ok); QMessageBox::Ok, QMessageBox::Ok);
return; break;
case AddressTableModel::KEY_GENERATION_FAILURE: case AddressTableModel::KEY_GENERATION_FAILURE:
QMessageBox::critical(this, windowTitle(), QMessageBox::critical(this, windowTitle(),
tr("New key generation failed."), tr("New key generation failed."),
QMessageBox::Ok, QMessageBox::Ok); QMessageBox::Ok, QMessageBox::Ok);
return;
case AddressTableModel::OK:
// Failed with unknown reason. Just reject.
break; break;
}
}
return; return;
} }
QDialog::accept(); QDialog::accept();

6
src/qt/editaddressdialog.h
Unescape View File

@ -32,10 +32,12 @@ public:
void setModel(AddressTableModel *model); void setModel(AddressTableModel *model);
void loadRow(int row); void loadRow(int row);
void accept();
QString getAddress() const; QString getAddress() const;
void setAddress(const QString &address); void setAddress(const QString &address);
public slots:
void accept();
private: private:
bool saveCurrentRow(); bool saveCurrentRow();

Write Preview
Loading…
Cancel
Save