Merge pull request #2 from loudnate/read-reservoir

Read reservoir before bolusing

Author: loudnate

Cartfile

@@ -2,5 +2,5 @@ github "loudnate/LoopKit" ~> 0.3
 github "loudnate/xDripG5" ~> 0.4
 github "loudnate/SwiftCharts" "loudnate/naterade"
 github "mddub/dexcom-share-client-swift" ~> 0.1
-github "ps2/rileylink_ios" ~> 0.3
+github "ps2/rileylink_ios" "dev"
 github "mpurland/Amplitude-iOS" "framework"

Cartfile.resolved

@@ -3,5 +3,5 @@ github "loudnate/Crypto" "e0ef5b498f2c373d676135dabf5d1803b8558509"
 github "loudnate/LoopKit" "v0.3.2"
 github "loudnate/SwiftCharts" "448b80f4025bbf592a4d8ca9d079e9684bc0b64b"
 github "mddub/dexcom-share-client-swift" "v0.1.0"
-github "ps2/rileylink_ios" "v0.3.0"
+github "ps2/rileylink_ios" "4305a83f897c19bd343c6b4f6fcdaaba0985ea64"
 github "loudnate/xDripG5" "0.4.1"

Loop/Managers/LoopDataManager.swift

@@ -516,15 +516,30 @@ class LoopDataManager {
             return
         }
 
-        ops.setNormalBolus(units) { (error) in
-            if let error = error {
-                self.deviceDataManager.logger?.addError(error, fromSource: "Bolus")
+        ops.readRemainingInsulin { (result) in
+            switch result {
+            case .Success(let unitVolume):
+                self.deviceDataManager.doseStore.addReservoirValue(unitVolume, atDate: NSDate()) { (_, _, error) in
+                    if let error = error {
+                        self.deviceDataManager.logger?.addError(error, fromSource: "Bolus")
+                        resultsHandler(success: false, error: .CommunicationError)
+                    } else {
+                        ops.setNormalBolus(units) { (error) in
+                            if let error = error {
+                                self.deviceDataManager.logger?.addError(error, fromSource: "Bolus")
+                                resultsHandler(success: false, error: .CommunicationError)
+                            } else {
+                                self.lastBolus = (units: units, date: NSDate())
+                                resultsHandler(success: true, error: nil)
+                            }
 
+                            self.notify()
+                        }
+                    }
+                }
+            case .Failure(let error):
+                self.deviceDataManager.logger?.addError(error, fromSource: "Bolus")
                 resultsHandler(success: false, error: .CommunicationError)
-            } else {
-                self.lastBolus = (units: units, date: NSDate())
-
-                resultsHandler(success: true, error: nil)
             }
         }
     }