Просмотр исходного кода

Ony upload profiles when changed, fix.

(cherry picked from commit dbb832b5acb6212d1ecdf419147b062a8c3536f6)
Jon Mårtensson 2 лет назад
Родитель
Сommit
8d1db2b827
1 измененных файлов с 15 добавлено и 15 удалено
  1. 15 15
      FreeAPS/Sources/Services/Network/NightscoutManager.swift

+ 15 - 15
FreeAPS/Sources/Services/Network/NightscoutManager.swift

@@ -560,25 +560,25 @@ final class BaseNightscoutManager: NightscoutManager, Injectable {
             NSLog("NightscoutManager Settings, settings unchanged")
             NSLog("NightscoutManager Settings, settings unchanged")
         } else { uploadSettings(settings) }
         } else { uploadSettings(settings) }
 
 
+        // UPLOAD Profiles WHEN CHANGED
         if let uploadedProfile = storage.retrieve(OpenAPS.Nightscout.uploadedProfile, as: NightscoutProfileStore.self),
         if let uploadedProfile = storage.retrieve(OpenAPS.Nightscout.uploadedProfile, as: NightscoutProfileStore.self),
            (uploadedProfile.store["default"]?.rawJSON ?? "").sorted() == ps.rawJSON.sorted(), !force
            (uploadedProfile.store["default"]?.rawJSON ?? "").sorted() == ps.rawJSON.sorted(), !force
         {
         {
             NSLog("NightscoutManager uploadProfile, no profile change")
             NSLog("NightscoutManager uploadProfile, no profile change")
-            return
-        }
-
-        processQueue.async {
-            nightscout.uploadProfile(p)
-                .sink { completion in
-                    switch completion {
-                    case .finished:
-                        self.storage.save(p, as: OpenAPS.Nightscout.uploadedProfile)
-                        debug(.nightscout, "Profile uploaded")
-                    case let .failure(error):
-                        debug(.nightscout, error.localizedDescription)
-                    }
-                } receiveValue: {}
-                .store(in: &self.lifetime)
+        } else {
+            processQueue.async {
+                nightscout.uploadProfile(p)
+                    .sink { completion in
+                        switch completion {
+                        case .finished:
+                            self.storage.save(p, as: OpenAPS.Nightscout.uploadedProfile)
+                            debug(.nightscout, "Profile uploaded")
+                        case let .failure(error):
+                            debug(.nightscout, error.localizedDescription)
+                        }
+                    } receiveValue: {}
+                    .store(in: &self.lifetime)
+            }
         }
         }
     }
     }