Compare commits

..

No commits in common. "0e9d82d2bb957be02d55f93d62136fd7285b41a5" and "9ebad2cc7bdeb2d117e37d8e6508e7ab4483ad76" have entirely different histories.

2 changed files with 4 additions and 5 deletions

View file

@ -271,10 +271,9 @@ def get_custom_message(reason: str, compatability_dict: dict) -> str:
GUI's startup script in __main__ GUI's startup script in __main__
""" """
if reason == "upgrade": if reason == "upgrade":
custom_error = "You just upgraded HydraVeil, so let's upgrade your database to handle the new data types. This will NOT harm your existing profiles or browser sessions." custom_error = "You just upgraded HydraVeil, so let's upgrade your database to handle the new data types."
elif reason == "old_app": elif reason == "old_app":
custom_error = "Upgrade Time! You're using an old version of HydraVeil, with a newer version of the database. This means the older app would crash trying to handle the newer data. This will NOT harm your existing profiles or browser sessions." custom_error = "You're using an old version of HydraVeil, with a newer version of the database. This means the older app would crash trying to handle the newer data."
else: else:
error_msg = compatability_dict.get("error", "Unknown reason.") error_msg = compatability_dict.get("error", "Unknown reason.")
custom_error = f"There was an error with upgrading your database version. Please tell customer support: {error_msg}." custom_error = f"There was an error with upgrading your database version. Please tell customer support: {error_msg}."

View file

@ -35,7 +35,7 @@ def _execute_tor_request(
payload: Optional[dict], payload: Optional[dict],
connection_observer: Optional[ConnectionObserver] = None, connection_observer: Optional[ConnectionObserver] = None,
client_observer: Optional[ClientObserver] = None, client_observer: Optional[ClientObserver] = None,
timeout: int = 20, timeout: int = 6,
clearweb_resolved_ip: str = None # if DNS via Tor is blocked clearweb_resolved_ip: str = None # if DNS via Tor is blocked
) -> ApiResponse: ) -> ApiResponse:
""" """
@ -108,7 +108,7 @@ def _execute_regular_request(
payload: Optional[dict], payload: Optional[dict],
connection_observer: Optional[ConnectionObserver] = None, connection_observer: Optional[ConnectionObserver] = None,
client_observer: Optional[client_observer] = None, client_observer: Optional[client_observer] = None,
timeout: int = 10, timeout: int = 5,
) -> ApiResponse: ) -> ApiResponse:
""" """
Regular (non-Tor) request. NO observer coupling. Regular (non-Tor) request. NO observer coupling.