Skip to content

Commit

Permalink
Merge branch 'daita-is-set-to-direct-only-true-per-default-droid-1628'
Browse files Browse the repository at this point in the history
  • Loading branch information
Pururun committed Dec 10, 2024
2 parents 1cb6189 + b9f1094 commit 06b9a75
Showing 1 changed file with 2 additions and 4 deletions.
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

0 comments on commit 06b9a75

Please sign in to comment.