Sfoglia il codice sorgente

Use NightscoutUtils.constructURL for the Nightscout web viewer URL (#712)

Jonas Björkert 1 settimana fa
parent
commit
b752eac2bd

+ 4 - 1
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
     }

+ 6 - 8
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