oxen-io
/
oxen-core
mirror of https://github.com/oxen-io/oxen-core.git
2
1
Fork 0
Code Issues Projects Releases Wiki Activity

Compilation fixes for windows/mobile

This commit is contained in:
Jason Rhinelander 2020-12-14 16:16:19 -04:00
parent 3d4d6ba916
commit fa8ccd4f5d
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/wallet/api/wallet.cpp
View File

@ -681,7 +681,7 @@ bool WalletImpl::recoverFromDevice(std::string_view path_, const std::string &pa
m_recoveringFromDevice = true;
try
{
m_wallet->restore(path, password, device_name);
m_wallet->restore_from_device(path, password, device_name);
LOG_PRINT_L1("Generated new wallet from device: " + device_name);
}
catch (const std::exception& e) {

2
src/wallet/wallet2.cpp
View File

@ -4937,7 +4937,7 @@ void wallet2::generate(const fs::path& wallet_, const epee::wipeable_string& pas
store();
}
void wallet2::restore_from_device(const std::string& wallet_, const epee::wipeable_string& password, const std::string &device_name,
void wallet2::restore_from_device(const fs::path& wallet_, const epee::wipeable_string& password, const std::string &device_name,
bool create_address_file, std::optional<std::string> hwdev_label, std::function<void(std::string msg)> progress_callback)
{
clear();

2
src/wallet/wallet2.h
View File

@ -529,7 +529,7 @@ private:
* a hardware-backed wallet file with an optional comment.
* \param status_callback callback to invoke with progress messages to display to the user
*/
void restore_from_device(const std::string& wallet_, const epee::wipeable_string& password, const std::string &device_name,
void restore_from_device(const fs::path& wallet_, const epee::wipeable_string& password, const std::string &device_name,
bool create_address_file = false, std::optional<std::string> hwdev_label = std::nullopt, std::function<void(std::string msg)> status_callback = {});
/*!