Skip to content
Snippets Groups Projects
Commit 108dd0bf authored by Dariusz Rybicki's avatar Dariusz Rybicki
Browse files

Merge branch 'fix/message-delivery-callback' into 'development'

Handle missing round results in MessageDeliveryCallback

See merge request elixxir/elixxir-dapps-sdk-swift!48
parents 9d87117c ff2bca68
No related branches found
No related tags found
2 merge requests!102Release 1.0.0,!48Handle missing round results in MessageDeliveryCallback
...@@ -30,12 +30,15 @@ extension MessageDeliveryCallback { ...@@ -30,12 +30,15 @@ extension MessageDeliveryCallback {
let callback: MessageDeliveryCallback let callback: MessageDeliveryCallback
func eventCallback(_ delivered: Bool, timedOut: Bool, roundResults: Data?) { func eventCallback(_ delivered: Bool, timedOut: Bool, roundResults: Data?) {
if delivered, if delivered && !timedOut {
!timedOut, let roundResultsArray: [Int]
let roundResultsData = roundResults, if let data = roundResults,
let roundResults = try? JSONDecoder().decode([Int].self, from: roundResultsData) let array = try? JSONDecoder().decode([Int].self, from: data) {
{ roundResultsArray = array
callback.handle(.delivered(roundResults: roundResults)) } else {
roundResultsArray = []
}
callback.handle(.delivered(roundResults: roundResultsArray))
return return
} }
...@@ -48,7 +51,7 @@ extension MessageDeliveryCallback { ...@@ -48,7 +51,7 @@ extension MessageDeliveryCallback {
BindingsMessageDeliveryCallback received invalid parameters: BindingsMessageDeliveryCallback received invalid parameters:
- delivered → \(delivered) - delivered → \(delivered)
- timedOut → \(timedOut) - timedOut → \(timedOut)
- roundResults → \(roundResults.map { String(data: $0, encoding: .utf8) ?? "" } ?? "") - roundResults → \(roundResults.map { String(data: $0, encoding: .utf8) ?? "\($0)" } ?? "nil")
""") """)
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment