Apply minor fixes

OneBusAway · Dec 10, 2024 · 9e4e4c3 · 9e4e4c3
1 parent bce9527
commit 9e4e4c3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 12 deletions.
diff --git a/OBAKitCore/Orchestration/CoreApplication.swift b/OBAKitCore/Orchestration/CoreApplication.swift
@@ -91,7 +91,7 @@ open class CoreApplication: NSObject,
     }
 
     /// This function reloads the REST API and Obaco Services.
-    private func refreshServices() {
+    public func refreshServices() {
         refreshRESTAPIService()
         refreshObacoService()
         apiServicesRefreshed()
@@ -129,15 +129,6 @@ open class CoreApplication: NSObject,
         self.apiService = RESTAPIService(APIServiceConfiguration(baseURL: region.OBABaseURL, apiKey: config.apiKey, uuid: userUUID, appVersion: config.appVersion, regionIdentifier: region.regionIdentifier))
     }
 
-    public func getNewRefreshedRESTAPIService() -> RESTAPIService? {
-        guard let region = regionsService.currentRegion else {
-            return nil
-        }
-        let apiService = RESTAPIService(APIServiceConfiguration(baseURL: region.OBABaseURL, apiKey: config.apiKey, uuid: userUUID, appVersion: config.appVersion, regionIdentifier: region.regionIdentifier))
-
-        return apiService
-    }
-
     // MARK: - Obaco
 
     public private(set) var obacoService: ObacoAPIService? {

diff --git a/OBAWidget/Provider/WidgetDataProvider.swift b/OBAWidget/Provider/WidgetDataProvider.swift
@@ -48,9 +48,11 @@ class WidgetDataProvider: NSObject, ObservableObject {
 
     /// Loads arrivals and departures for all favorited bookmarks for the widget.
     func loadData() async {
-        arrDepDic = [:] 
 
-        guard let apiService = app.getNewRefreshedRESTAPIService() else {
+        arrDepDic = [:]
+        app.refreshServices()
+
+        guard let apiService = app.apiService else {
             Logger.error("Failed to get REST API Service.")
             return
         }