summaryrefslogtreecommitdiffhomepage
path: root/mullvad-daemon/src
diff options
context:
space:
mode:
authorDavid Lönnhager <david.l@mullvad.net>2020-03-03 13:38:33 +0100
committerDavid Lönnhager <david.l@mullvad.net>2020-03-11 12:11:09 +0100
commit93175648ddb1187e5f5a79b9c2fea0334f406fbb (patch)
tree2d307ce309566f8c489d2f6826dbb4620f67a955 /mullvad-daemon/src
parent6861a5039de26358e1e5fb7de94e66be3038de10 (diff)
downloadmullvadvpn-93175648ddb1187e5f5a79b9c2fea0334f406fbb.tar.xz
mullvadvpn-93175648ddb1187e5f5a79b9c2fea0334f406fbb.zip
Add beta program field to 'Settings'
Diffstat (limited to 'mullvad-daemon/src')
-rw-r--r--mullvad-daemon/src/lib.rs6
-rw-r--r--mullvad-daemon/src/version.rs4
2 files changed, 9 insertions, 1 deletions
diff --git a/mullvad-daemon/src/lib.rs b/mullvad-daemon/src/lib.rs
index aa7912ebf6..8bc0988cc1 100644
--- a/mullvad-daemon/src/lib.rs
+++ b/mullvad-daemon/src/lib.rs
@@ -485,7 +485,11 @@ where
);
tokio_remote.spawn(|_| version_check_future);
- let settings = settings::load();
+ let mut settings = settings::load();
+
+ if version::is_beta_version() && settings.get_show_beta_releases().is_none() {
+ let _ = settings.set_show_beta_releases(true);
+ }
let account_history = account_history::AccountHistory::new(
&cache_dir,
diff --git a/mullvad-daemon/src/version.rs b/mullvad-daemon/src/version.rs
index 72c28144ff..b80ea9d03e 100644
--- a/mullvad-daemon/src/version.rs
+++ b/mullvad-daemon/src/version.rs
@@ -4,6 +4,10 @@ pub const PRODUCT_VERSION: &str = include_str!(concat!(env!("OUT_DIR"), "/produc
/// Contains the date of the git commit this was built from
pub const COMMIT_DATE: &str = include_str!(concat!(env!("OUT_DIR"), "/git-commit-date.txt"));
+pub fn is_beta_version() -> bool {
+ PRODUCT_VERSION.contains("beta")
+}
+
pub fn log_version() {
log::info!(
"Starting {} - {} {}",