addressbook updates

This commit is contained in:
Jaquee
2016-12-12 21:39:29 +01:00
parent 5b7f1fc8e4
commit 3b4539ee7e
5 changed files with 40 additions and 25 deletions

View File

@@ -79,16 +79,16 @@ void AddressBookImpl::refresh()
LOG_PRINT_L2("Refreshing addressbook");
clearRows();
// Fetch from Wallet2 and create vector of AddressBookRow objects
std::vector<tools::wallet2::address_book_row> rows = m_wallet->m_wallet->get_address_book();
for (size_t i = 0; i < rows.size(); ++i) {
tools::wallet2::address_book_row * row = &rows.at(i);
std::string payment_id = (row->m_payment_id == cryptonote::null_hash)? "" : epee::string_tools::pod_to_hex(row->m_payment_id);
std::string address = cryptonote::get_account_address_as_str(m_wallet->m_wallet->testnet(),row->m_address);
// Fetch from Wallet2 and create vector
for (auto const &a : m_wallet->m_wallet->get_address_book() ) {
auto row = a.second;
int rowId = a.first;
std::string payment_id = (row.m_payment_id == cryptonote::null_hash)? "" : epee::string_tools::pod_to_hex(row.m_payment_id);
std::string address = cryptonote::get_account_address_as_str(m_wallet->m_wallet->testnet(),row.m_address);
AddressBookRow * abr = new AddressBookRow(rowId, address, payment_id, row.m_description);
AddressBookRow * abr = new AddressBookRow(i, address, payment_id, row->m_description);
m_rows.push_back(abr);
}
@@ -98,7 +98,8 @@ bool AddressBookImpl::deleteRow(int rowId)
{
LOG_PRINT_L2("Deleting address book row " << rowId);
bool r = m_wallet->m_wallet->delete_address_book_row(rowId);
refresh();
if (r)
refresh();
return r;
}