Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Set direct only default to false on android #7305

Merged
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions mullvad-types/src/wireguard.rs
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,6 @@ pub struct QuantumResistantStateParseError;
pub struct DaitaSettings {
pub enabled: bool,

#[cfg_attr(target_os = "android", serde(skip))]
#[serde(default = "DaitaSettings::default_use_multihop_if_necessary")]
/// Whether to use multihop if the selected relay is not DAITA-compatible. Note that this is
/// the inverse of of "Direct only" in the GUI.
Expand All @@ -94,10 +93,9 @@ pub struct DaitaSettings {

#[cfg(daita)]
impl DaitaSettings {
/// This setting should be enabled by default, expect on Android where multihop is not
/// supported.
/// This setting should be enabled by default.
const fn default_use_multihop_if_necessary() -> bool {
cfg!(not(target_os = "android"))
true
}
}

Expand Down
Loading