Check addresses in address book for validity

This commit is contained in:
Wladimir J. van der Laan
2011-07-02 15:09:53 +02:00
parent ebff5c40a2
commit 669b0a5835
5 changed files with 42 additions and 16 deletions

View File

@@ -65,12 +65,6 @@ QString EditAddressDialog::saveCurrentRow()
mode == NewSendingAddress ? AddressTableModel::Send : AddressTableModel::Receive,
ui->labelEdit->text(),
ui->addressEdit->text());
if(address.isEmpty())
{
QMessageBox::warning(this, windowTitle(),
tr("The address %1 is already in the address book.").arg(ui->addressEdit->text()),
QMessageBox::Ok, QMessageBox::Ok);
}
break;
case EditReceivingAddress:
case EditSendingAddress:
@@ -82,3 +76,28 @@ QString EditAddressDialog::saveCurrentRow()
}
return address;
}
void EditAddressDialog::accept()
{
if(mode == NewSendingAddress || mode == EditSendingAddress)
{
// For sending addresses, check validity
// Not needed for receiving addresses, as those are generated
if(!model->validateAddress(ui->addressEdit->text()))
{
QMessageBox::warning(this, windowTitle(),
tr("The entered address \"%1\" is not a valid bitcoin address.").arg(ui->addressEdit->text()),
QMessageBox::Ok, QMessageBox::Ok);
return;
}
}
if(saveCurrentRow().isEmpty())
{
QMessageBox::warning(this, windowTitle(),
tr("The entered address \"%1\" is already in the address book.").arg(ui->addressEdit->text()),
QMessageBox::Ok, QMessageBox::Ok);
return;
}
QDialog::accept();
}