Charon/blockchain
1
0
Fork 0
forked from lthn/blockchain
Code Pull requests Activity

fixes for mobile wallet in zarcanum network

Browse source
This commit is contained in:
cryptozoidberg 2023-10-12 21:09:01 +02:00
parent 71c1ba9377
commit b0f31ebd1b
No known key found for this signature in database
GPG key ID: 22DEB97A54C6FDEC
2 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/wallet/wallets_manager.cpp
View file

@ -2050,7 +2050,9 @@ bool wallets_manager::on_mw_select_wallet(uint64_t wallet_id)
if (it == m_wallets.end())
return false;
#ifndef MOBILE_WALLET_BUILD
m_rpc_selected_wallet_id = wallet_id;
#endif
return true;
}
@ -2070,6 +2072,7 @@ bool wallets_manager::on_mw_select_wallet(const tools::wallet_public::COMMAND_MW
void wallets_manager::lock()
{
#ifndef MOBILE_WALLET_BUILD
{
SHARED_CRITICAL_REGION_LOCAL(m_wallets_lock);
auto it = m_wallets.find(m_rpc_selected_wallet_id);
@ -2079,21 +2082,26 @@ void wallets_manager::lock()
}
m_current_wallet_locked_object = it->second.w.lock();
}
#endif
}
void wallets_manager::unlock()
{
#ifndef MOBILE_WALLET_BUILD
m_current_wallet_locked_object.reset();
#endif
}
#ifndef MOBILE_WALLET_BUILD
std::shared_ptr<tools::wallet2> wallets_manager::get_wallet()
{
if (!m_current_wallet_locked_object.get())
{
throw std::runtime_error("Wallet is not locked for get_wallet() call");
}
return **m_current_wallet_locked_object;
}
#endif
void wallets_manager::wallet_vs_options::worker_func()
{

2
src/wallet/wallets_manager.h
View file

@ -203,7 +203,9 @@ private:
//----- i_wallet_provider ------
virtual void lock();
virtual void unlock();
#ifndef MOBILE_WALLET_BUILD
virtual std::shared_ptr<tools::wallet2> get_wallet();
#endif
//--------
BEGIN_URI_MAP2_VIRTUAL()