Browse Source

Block fetching of carbs, tt, and announcements when NS fetch toggle is off

Daniel Snällfot 1 năm trước cách đây
mục cha
commit
c174b05821

+ 7 - 3
FreeAPS/Sources/Services/Network/NightscoutManager.swift

@@ -52,6 +52,10 @@ final class BaseNightscoutManager: NightscoutManager, Injectable {
         settingsManager.settings.isUploadEnabled
         settingsManager.settings.isUploadEnabled
     }
     }
 
 
+    private var isDownloadEnabled: Bool {
+        settingsManager.settings.isDownloadEnabled
+    }
+
     private var isUploadGlucoseEnabled: Bool {
     private var isUploadGlucoseEnabled: Bool {
         settingsManager.settings.uploadGlucose
         settingsManager.settings.uploadGlucose
     }
     }
@@ -196,7 +200,7 @@ final class BaseNightscoutManager: NightscoutManager, Injectable {
     }
     }
 
 
     func fetchCarbs() async -> [CarbsEntry] {
     func fetchCarbs() async -> [CarbsEntry] {
-        guard let nightscout = nightscoutAPI, isNetworkReachable else {
+        guard let nightscout = nightscoutAPI, isNetworkReachable, isDownloadEnabled else {
             return []
             return []
         }
         }
 
 
@@ -211,7 +215,7 @@ final class BaseNightscoutManager: NightscoutManager, Injectable {
     }
     }
 
 
     func fetchTempTargets() async -> [TempTarget] {
     func fetchTempTargets() async -> [TempTarget] {
-        guard let nightscout = nightscoutAPI, isNetworkReachable else {
+        guard let nightscout = nightscoutAPI, isNetworkReachable, isDownloadEnabled else {
             return []
             return []
         }
         }
 
 
@@ -226,7 +230,7 @@ final class BaseNightscoutManager: NightscoutManager, Injectable {
     }
     }
 
 
     func fetchAnnouncements() -> AnyPublisher<[Announcement], Never> {
     func fetchAnnouncements() -> AnyPublisher<[Announcement], Never> {
-        guard let nightscout = nightscoutAPI, isNetworkReachable else {
+        guard let nightscout = nightscoutAPI, isNetworkReachable, isDownloadEnabled else {
             return Just([]).eraseToAnyPublisher()
             return Just([]).eraseToAnyPublisher()
         }
         }