diff --git a/src/tribler/core/sentry_reporter/sentry_scrubber.py b/src/tribler/core/sentry_reporter/sentry_scrubber.py index 2966acd68d2..a3efa7dd404 100644 --- a/src/tribler/core/sentry_reporter/sentry_scrubber.py +++ b/src/tribler/core/sentry_reporter/sentry_scrubber.py @@ -27,7 +27,7 @@ def __init__(self): 'Documents and Settings', 'Users', ] - self.dict_keys_for_scrub = ['USERNAME', 'USERDOMAIN', 'server_name', 'COMPUTERNAME'] + self.dict_keys_for_scrub = ['USERNAME', 'USERDOMAIN', 'server_name', 'COMPUTERNAME', 'key'] self.event_fields_to_cut = [] self.exclusions = ['local', '127.0.0.1'] diff --git a/src/tribler/gui/tribler_window.py b/src/tribler/gui/tribler_window.py index ced1aecd653..f7b0d51a765 100644 --- a/src/tribler/gui/tribler_window.py +++ b/src/tribler/gui/tribler_window.py @@ -56,6 +56,7 @@ from tribler.core.utilities.unicode import hexlify from tribler.core.utilities.utilities import parse_query from tribler.core.version import version_id +from tribler.gui import gui_sentry_reporter from tribler.gui.app_manager import AppManager from tribler.gui.core_manager import CoreManager from tribler.gui.debug_window import DebugWindow @@ -554,6 +555,7 @@ def on_core_connected(self, version): def on_receive_settings(self, settings): self.tribler_settings = settings['settings'] + gui_sentry_reporter.additional_information['settings'] = self.tribler_settings self.start_ui() def start_ui(self): diff --git a/src/tribler/gui/widgets/settingspage.py b/src/tribler/gui/widgets/settingspage.py index 34c3191beb5..d33056fbec5 100644 --- a/src/tribler/gui/widgets/settingspage.py +++ b/src/tribler/gui/widgets/settingspage.py @@ -7,6 +7,7 @@ from tribler.core.utilities.osutils import get_root_state_directory from tribler.core.utilities.path_util import Path from tribler.core.utilities.simpledefs import MAX_LIBTORRENT_RATE_LIMIT +from tribler.gui import gui_sentry_reporter from tribler.gui.defs import ( DARWIN, PAGE_SETTINGS_ANONYMITY, @@ -529,21 +530,22 @@ def on_settings_saved(self, data): if not data: return # Now save the GUI settings - self.window().gui_settings.setValue("family_filter", self.window().family_filter_checkbox.isChecked()) - self.window().gui_settings.setValue("disable_tags", self.window().disable_tags_checkbox.isChecked()) - self.window().gui_settings.setValue("autocommit_enabled", self.window().channel_autocommit_checkbox.isChecked()) - self.window().gui_settings.setValue( - "ask_download_settings", self.window().always_ask_location_checkbox.isChecked() - ) - self.window().gui_settings.setValue( - "use_monochrome_icon", self.window().use_monochrome_icon_checkbox.isChecked() - ) - self.window().gui_settings.setValue("minimize_to_tray", self.window().minimize_to_tray_checkbox.isChecked()) + gui_settings = self.window().gui_settings + + gui_settings.setValue("family_filter", self.window().family_filter_checkbox.isChecked()) + gui_settings.setValue("disable_tags", self.window().disable_tags_checkbox.isChecked()) + gui_settings.setValue("autocommit_enabled", self.window().channel_autocommit_checkbox.isChecked()) + gui_settings.setValue("ask_download_settings", self.window().always_ask_location_checkbox.isChecked()) + gui_settings.setValue("use_monochrome_icon", self.window().use_monochrome_icon_checkbox.isChecked()) + gui_settings.setValue("minimize_to_tray", self.window().minimize_to_tray_checkbox.isChecked()) self.save_language_selection() self.window().tray_show_message(tr("Tribler settings"), tr("Settings saved")) def on_receive_settings(response): - self.window().tribler_settings = response['settings'] + settings = response['settings'] + + self.window().tribler_settings = settings + gui_sentry_reporter.additional_information['settings'] = settings request_manager.get("settings", on_receive_settings, capture_errors=False)