diff options
| author | David Lönnhager <david.l@mullvad.net> | 2021-01-08 16:32:31 +0100 |
|---|---|---|
| committer | David Lönnhager <david.l@mullvad.net> | 2021-01-12 16:10:21 +0100 |
| commit | 00885edcf042d4ae45eed26c2f5c2c67bc5de9ec (patch) | |
| tree | c9dcf02bfc652d32ac90ecefb3dc452975699141 /mullvad-daemon/src | |
| parent | 12ca4a60bf3455132aed849ad8d5df87cd919d35 (diff) | |
| download | mullvadvpn-00885edcf042d4ae45eed26c2f5c2c67bc5de9ec.tar.xz mullvadvpn-00885edcf042d4ae45eed26c2f5c2c67bc5de9ec.zip | |
Replace the old cache directory
Diffstat (limited to 'mullvad-daemon/src')
| -rw-r--r-- | mullvad-daemon/src/lib.rs | 3 | ||||
| -rw-r--r-- | mullvad-daemon/src/main.rs | 3 |
2 files changed, 1 insertions, 5 deletions
diff --git a/mullvad-daemon/src/lib.rs b/mullvad-daemon/src/lib.rs index 00cbec6d36..93c02fff69 100644 --- a/mullvad-daemon/src/lib.rs +++ b/mullvad-daemon/src/lib.rs @@ -485,7 +485,6 @@ where resource_dir: PathBuf, settings_dir: PathBuf, cache_dir: PathBuf, - user_cache_dir: PathBuf, event_listener: L, command_channel: DaemonCommandChannel, #[cfg(target_os = "android")] android_context: AndroidContext, @@ -500,7 +499,7 @@ where let mut rpc_runtime = mullvad_rpc::MullvadRpcRuntime::with_cache( tokio::runtime::Handle::current(), Some(&resource_dir), - &user_cache_dir, + &cache_dir, true, move |address| { let (result_tx, result_rx) = oneshot::channel(); diff --git a/mullvad-daemon/src/main.rs b/mullvad-daemon/src/main.rs index bd91729af1..4e055183b9 100644 --- a/mullvad-daemon/src/main.rs +++ b/mullvad-daemon/src/main.rs @@ -123,8 +123,6 @@ async fn create_daemon( .map_err(|e| e.display_chain_with_msg("Unable to get settings dir"))?; let cache_dir = mullvad_paths::cache_dir() .map_err(|e| e.display_chain_with_msg("Unable to get cache dir"))?; - let user_cache_dir = mullvad_paths::user_cache_dir() - .map_err(|e| e.display_chain_with_msg("Unable to get user cache dir"))?; let command_channel = DaemonCommandChannel::new(); let event_listener = spawn_management_interface(command_channel.sender()).await?; @@ -134,7 +132,6 @@ async fn create_daemon( resource_dir, settings_dir, cache_dir, - user_cache_dir, event_listener, command_channel, ) |