Skip to content

Updates to match protocol changes in LoopKit #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 23, 2023
Merged

Updates to match protocol changes in LoopKit #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions MinimedKit/PumpManager/MinimedPumpManager.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -772,7 +772,7 @@ extension MinimedPumpManager {

self.log.default("Reporting new pump events: %{public}@", String(describing: remainingHistoryEvents + pendingEvents))

delegate.pumpManager(self, hasNewPumpEvents: remainingHistoryEvents + pendingEvents, lastReconciliation: self.state.lastReconciliation, completion: { (error) in
delegate.pumpManager(self, hasNewPumpEvents: remainingHistoryEvents + pendingEvents, lastReconciliation: self.state.lastReconciliation, replacePendingEvents: true) { (error) in
// Called on an unknown queue by the delegate
if error == nil {
self.recents.lastAddedPumpEvents = self.dateGenerator()
Expand All @@ -793,7 +793,7 @@ extension MinimedPumpManager {
})
}
completion(error)
})
}
})
} catch let error {
self.troubleshootPumpComms(using: device)
Expand All @@ -815,15 +815,15 @@ extension MinimedPumpManager {
preconditionFailure("pumpManagerDelegate cannot be nil")
}

delegate.pumpManager(self, hasNewPumpEvents: events, lastReconciliation: self.state.lastReconciliation, completion: { (error) in
delegate.pumpManager(self, hasNewPumpEvents: events, lastReconciliation: self.state.lastReconciliation, replacePendingEvents: true) { (error) in
// Called on an unknown queue by the delegate
if let error = error {
self.log.error("Pump event storage failed: %{public}@", String(describing: error))
completion(MinimedPumpManagerError.storageFailure)
} else {
completion(nil)
}
})
}
})
}

Expand Down
2 changes: 1 addition & 1 deletion MinimedKitTests/Mocks/MockPumpManagerDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ class MockPumpManagerDelegate: PumpManagerDelegate {

var reportedPumpEvents: [(events: [NewPumpEvent], lastReconciliation: Date?)] = []

func pumpManager(_ pumpManager: PumpManager, hasNewPumpEvents events: [NewPumpEvent], lastReconciliation: Date?, completion: @escaping (Error?) -> Void) {
func pumpManager(_ pumpManager: PumpManager, hasNewPumpEvents events: [NewPumpEvent], lastReconciliation: Date?, replacePendingEvents: Bool, completion: @escaping (Error?) -> Void) {
reportedPumpEvents.append((events: events, lastReconciliation: lastReconciliation))
completion(nil)
}
Expand Down