From be8fe8a10e479851aef81677c2e8bafacfd61c8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20Bj=C3=B6rkert?= Date: Sun, 19 Jul 2026 13:36:19 +0200 Subject: [PATCH] Use NightscoutUtils.constructURL for the Nightscout web viewer URL --- LoopFollow/Helpers/NightscoutUtils.swift | 5 ++++- .../ViewControllers/NightScoutViewController.swift | 14 ++++++-------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/LoopFollow/Helpers/NightscoutUtils.swift b/LoopFollow/Helpers/NightscoutUtils.swift index 0ea3c136c..519c5e4c5 100644 --- a/LoopFollow/Helpers/NightscoutUtils.swift +++ b/LoopFollow/Helpers/NightscoutUtils.swift @@ -190,7 +190,10 @@ class NightscoutUtils { queryItems.append(URLQueryItem(name: key, value: value)) } - components?.queryItems = queryItems + // Assigning an empty array would still append a bare "?" to the URL. + if !queryItems.isEmpty { + components?.queryItems = queryItems + } return components?.url } diff --git a/LoopFollow/ViewControllers/NightScoutViewController.swift b/LoopFollow/ViewControllers/NightScoutViewController.swift index 8dd1fc4b2..27c6b584f 100644 --- a/LoopFollow/ViewControllers/NightScoutViewController.swift +++ b/LoopFollow/ViewControllers/NightScoutViewController.swift @@ -37,14 +37,12 @@ class NightscoutViewController: UIViewController { } .store(in: &cancellables) - var url = Storage.shared.url.value - let token = Storage.shared.token.value - - if token != "" { - url = url + "?token=" + token - } - - guard let myUrl = URL(string: url) else { return } + guard let myUrl = NightscoutUtils.constructURL( + baseURL: Storage.shared.url.value, + token: Storage.shared.token.value, + endpoint: "", + parameters: [:] + ) else { return } let webpagePreferences = WKWebpagePreferences() webpagePreferences.allowsContentJavaScript = true