From f56c71c0f1da33d184f603b5fb88d8739548ba89 Mon Sep 17 00:00:00 2001 From: cryptozoidberg Date: Thu, 21 Apr 2022 20:57:46 +0200 Subject: [PATCH] Implemented #315 --- src/daemon/daemon.cpp | 6 +++--- src/wallet/view_iface.h | 2 ++ src/wallet/wallets_manager.cpp | 10 +++++++++- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/src/daemon/daemon.cpp b/src/daemon/daemon.cpp index de1e0a74..43f1efe6 100644 --- a/src/daemon/daemon.cpp +++ b/src/daemon/daemon.cpp @@ -146,7 +146,7 @@ int main(int argc, char* argv[]) command_line::add_arg(desc_cmd_only, command_line::arg_version); command_line::add_arg(desc_cmd_only, command_line::arg_os_version); // tools::get_default_data_dir() can't be called during static initialization - command_line::add_arg(desc_cmd_only, command_line::arg_data_dir, tools::get_default_data_dir()); + command_line::add_arg(desc_cmd_sett, command_line::arg_data_dir, tools::get_default_data_dir()); command_line::add_arg(desc_cmd_only, command_line::arg_stop_after_height); command_line::add_arg(desc_cmd_only, command_line::arg_config_file); command_line::add_arg(desc_cmd_only, command_line::arg_disable_upnp); @@ -154,8 +154,8 @@ int main(int argc, char* argv[]) command_line::add_arg(desc_cmd_sett, command_line::arg_log_dir); command_line::add_arg(desc_cmd_sett, command_line::arg_log_level); command_line::add_arg(desc_cmd_sett, command_line::arg_console); - command_line::add_arg(desc_cmd_sett, command_line::arg_show_details); - command_line::add_arg(desc_cmd_sett, command_line::arg_show_rpc_autodoc); + command_line::add_arg(desc_cmd_only, command_line::arg_show_details); + command_line::add_arg(desc_cmd_only, command_line::arg_show_rpc_autodoc); command_line::add_arg(desc_cmd_sett, command_line::arg_disable_stop_if_time_out_of_sync); command_line::add_arg(desc_cmd_sett, command_line::arg_disable_stop_on_low_free_space); command_line::add_arg(desc_cmd_sett, command_line::arg_enable_offers_service); diff --git a/src/wallet/view_iface.h b/src/wallet/view_iface.h index edf78d14..3243242e 100644 --- a/src/wallet/view_iface.h +++ b/src/wallet/view_iface.h @@ -754,9 +754,11 @@ public: struct gui_options { bool use_debug_mode; + bool disable_price_fetch; BEGIN_KV_SERIALIZE_MAP() KV_SERIALIZE(use_debug_mode) + KV_SERIALIZE(disable_price_fetch) END_KV_SERIALIZE_MAP() }; diff --git a/src/wallet/wallets_manager.cpp b/src/wallet/wallets_manager.cpp index 298b338e..54a5cb26 100644 --- a/src/wallet/wallets_manager.cpp +++ b/src/wallet/wallets_manager.cpp @@ -60,6 +60,7 @@ const command_line::arg_descriptor arg_remote_node ( "remote-node" const command_line::arg_descriptor arg_enable_qt_logs ( "enable-qt-logs", "Forward Qt log messages into main log"); const command_line::arg_descriptor arg_disable_logs_init("disable-logs-init", "Disable log initialization in GUI"); const command_line::arg_descriptor arg_qt_dev_tools ( "qt-dev-tools", "Enable main web page inspection with Chromium DevTools, [,scale], e.g. \"horizontal,1.3\"", ""); +const command_line::arg_descriptor arg_disable_price_fetch("gui-disable-price-fetch", "Disable price fetching in UI(for privacy matter)"); wallets_manager::wallets_manager():m_pview(&m_view_stub), m_stop_singal_sent(false), @@ -186,6 +187,8 @@ bool wallets_manager::init_command_line(int argc, char* argv[], std::string& fai command_line::add_arg(desc_cmd_sett, command_line::arg_predownload_link); command_line::add_arg(desc_cmd_only, command_line::arg_deeplink); command_line::add_arg(desc_cmd_sett, command_line::arg_disable_ntp); + command_line::add_arg(desc_cmd_sett, arg_disable_price_fetch); + #ifndef MOBILE_WALLET_BUILD @@ -299,10 +302,15 @@ bool wallets_manager::init(view::i_view* pview_handler) { log_space::log_singletone::get_set_log_detalisation_level(true, command_line::get_arg(m_vm, command_line::arg_log_level)); } - if (command_line::has_arg(m_vm, arg_enable_gui_debug_mode)) + if (command_line::has_arg(m_vm, arg_enable_gui_debug_mode) && command_line::get_arg(m_vm, arg_enable_gui_debug_mode)) { m_ui_opt.use_debug_mode = true; } + if (command_line::has_arg(m_vm, arg_disable_price_fetch) && command_line::get_arg(m_vm, arg_disable_price_fetch)) + { + m_ui_opt.disable_price_fetch = true; + } + //set up logging options std::string log_dir;