mirrors
/
xdripswift
mirror of https://github.com/JohanDegraeve/xdripswift.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'JohanDegraeve:develop' into develop

This commit is contained in:
Paul Plant 2022-05-06 10:41:09 +02:00 committed by GitHub
parent 110c0b69ae 9cbbe35221
commit 342e9d63b1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
xdrip/Managers/NightScout/NightScoutUploadManager.swift
View File

@ -163,11 +163,6 @@ public class NightScoutUploadManager: NSObject {
// and nightScoutUrl exists
guard UserDefaults.standard.nightScoutEnabled, UserDefaults.standard.nightScoutUrl != nil else {return}
// check that either the API_SECRET or Token exists, if both are nil then return
if UserDefaults.standard.nightScoutAPIKey == nil && UserDefaults.standard.nightscoutToken == nil {
return
}
// if sync already running, then set nightScoutTreatmentSyncRequired to true
// sync is running already, once stopped it will rerun
if let nightScoutTreatmentsSyncStartTimeStamp = nightScoutTreatmentsSyncStartTimeStamp {
@ -705,13 +700,7 @@ public class NightScoutUploadManager: NSObject {
// there's no other treatmentEntries with the same id, so it's ok to delete it
// first check if it's uploaded, otherwise it makes no sense to delete it at NightScout
guard treatmentToDelete.uploaded else {
completionHandler(.success(0))
return
}
// now check that id exists, it should otherwise it's not uploaded, anyway let's check
// check that id exists, if not then it's never been uploaded, and so makes no sense to delete
guard treatmentToDelete.id != TreatmentEntry.EmptyId && treatmentToDelete.id.count > 0 else {
completionHandler(.success(0))
return