diff options
| author | David Lönnhager <david.l@mullvad.net> | 2025-03-04 09:31:14 +0100 |
|---|---|---|
| committer | David Lönnhager <david.l@mullvad.net> | 2025-03-05 23:32:53 +0100 |
| commit | 2aa5f05a5451417d27308e1b25bcc78517365d28 (patch) | |
| tree | f76c070eccbe1b04ffeb178fe79a215fe012bfb5 | |
| parent | c42a706d0b6c49e32cfd2bd7e790939e01c8777f (diff) | |
| download | mullvadvpn-2aa5f05a5451417d27308e1b25bcc78517365d28.tar.xz mullvadvpn-2aa5f05a5451417d27308e1b25bcc78517365d28.zip | |
Change domain name to option
| -rw-r--r-- | installer-downloader/src/ui_downloader.rs | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/installer-downloader/src/ui_downloader.rs b/installer-downloader/src/ui_downloader.rs index 9c97b17b8a..c69b1f9599 100644 --- a/installer-downloader/src/ui_downloader.rs +++ b/installer-downloader/src/ui_downloader.rs @@ -130,7 +130,7 @@ impl<Delegate: AppDelegate, Downloader: AppDownloader + Send + 'static> AppDownl /// Implementation of [fetch::ProgressUpdater] that updates some [AppDelegate]. pub struct UiProgressUpdater<Delegate: AppDelegate> { - domain: String, + domain: Option<String>, prev_progress: Option<u32>, queue: Delegate::Queue, } @@ -138,7 +138,7 @@ pub struct UiProgressUpdater<Delegate: AppDelegate> { impl<Delegate: AppDelegate> UiProgressUpdater<Delegate> { pub fn new(queue: Delegate::Queue) -> Self { Self { - domain: "unknown source".to_owned(), + domain: None, prev_progress: None, queue, } @@ -161,9 +161,13 @@ impl<Delegate: AppDelegate> UiProgressUpdater<Delegate> { format!( "{} {}... ({complete_percentage}%)", resource::DOWNLOADING_DESC_PREFIX, - self.domain + self.domain() ) } + + fn domain(&self) -> &str { + self.domain.as_deref().unwrap_or("unknown source") + } } impl<Delegate: AppDelegate + 'static> fetch::ProgressUpdater for UiProgressUpdater<Delegate> { @@ -201,6 +205,6 @@ impl<Delegate: AppDelegate + 'static> fetch::ProgressUpdater for UiProgressUpdat // Parse out domain name let url = url.strip_prefix("https://").unwrap_or(url); let (domain, _) = url.split_once('/').unwrap_or((url, "")); - self.domain = domain.to_owned(); + self.domain = Some(domain.to_owned()); } } |
