feat: slightly changed telemetry checking behavior
This commit is contained in:
parent
6f6343df58
commit
396697a6f5
3 changed files with 42 additions and 3 deletions
|
@ -150,7 +150,20 @@ impl LauncherState {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Check telemetry servers
|
// 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);
|
return Ok(Self::TelemetryNotDisabled);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -85,7 +85,20 @@ impl LauncherState {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Check telemetry servers
|
// 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);
|
return Ok(Self::TelemetryNotDisabled);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -84,7 +84,20 @@ impl LauncherState {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Check telemetry servers
|
// 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);
|
return Ok(Self::TelemetryNotDisabled);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue