feat: slightly changed telemetry checking behavior

This commit is contained in:
Observer KRypt0n_ 2023-06-18 12:58:34 +02:00
parent 6f6343df58
commit 396697a6f5
No known key found for this signature in database
GPG key ID: 844DA47BA25FE1E2
3 changed files with 42 additions and 3 deletions

View file

@ -150,7 +150,20 @@ impl LauncherState {
}
// Check telemetry servers
if telemetry::is_disabled(params.game_edition)?.is_some() {
let disabled = telemetry::is_disabled(params.game_edition)
// Return true if there's no domain name resolved, or false otherwise
.map(|result| result.is_none())
// And return true if there's an error happened during domain name resolving
// FIXME: might not be a good idea? Idk
.unwrap_or_else(|err| {
tracing::warn!("Failed to check telemetry servers: {err}. Assuming they're disabled");
true
});
if !disabled {
return Ok(Self::TelemetryNotDisabled);
}

View file

@ -85,7 +85,20 @@ impl LauncherState {
}
// Check telemetry servers
if telemetry::is_disabled()?.is_some() {
let disabled = telemetry::is_disabled(params.game_edition)
// Return true if there's no domain name resolved, or false otherwise
.map(|result| result.is_none())
// And return true if there's an error happened during domain name resolving
// FIXME: might not be a good idea? Idk
.unwrap_or_else(|err| {
tracing::warn!("Failed to check telemetry servers: {err}. Assuming they're disabled");
true
});
if !disabled {
return Ok(Self::TelemetryNotDisabled);
}

View file

@ -84,7 +84,20 @@ impl LauncherState {
}
// Check telemetry servers
if telemetry::is_disabled(params.game_edition)?.is_some() {
let disabled = telemetry::is_disabled(params.game_edition)
// Return true if there's no domain name resolved, or false otherwise
.map(|result| result.is_none())
// And return true if there's an error happened during domain name resolving
// FIXME: might not be a good idea? Idk
.unwrap_or_else(|err| {
tracing::warn!("Failed to check telemetry servers: {err}. Assuming they're disabled");
true
});
if !disabled {
return Ok(Self::TelemetryNotDisabled);
}