Toggling sentry listening based on the PumpModel

loudnate · loudnate · commit 6ad957547408 · 2016-05-27T18:30:19.000-07:00
diff --git a/Cartfile b/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" "dev"
+github "ps2/rileylink_ios" "assert-pump-model"
 github "mpurland/Amplitude-iOS" "framework"
diff --git a/Cartfile.resolved b/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" "4305a83f897c19bd343c6b4f6fcdaaba0985ea64"
+github "ps2/rileylink_ios" "cb8de2c84b9f2a16870600e3112d056c2a082d2c"
 github "loudnate/xDripG5" "0.4.1"
diff --git a/Loop/Managers/DeviceDataManager.swift b/Loop/Managers/DeviceDataManager.swift
@@ -354,7 +354,7 @@ class DeviceDataManager: NSObject, CarbStoreDelegate, TransmitterDelegate, WCSes
             return pumpState?.pumpID
         }
         set {
-            guard newValue?.characters.count == 6 else {
+            guard newValue?.characters.count == 6 && newValue != pumpState?.pumpID else {
                 return
             }
 
@@ -365,8 +365,6 @@ class DeviceDataManager: NSObject, CarbStoreDelegate, TransmitterDelegate, WCSes
                     pumpState.timeZone = timeZone
                 }
 
-                pumpState.pumpModel = self.pumpState?.pumpModel
-
                 self.pumpState = pumpState
             } else {
                 self.pumpState = nil
@@ -692,7 +690,11 @@ class DeviceDataManager: NSObject, CarbStoreDelegate, TransmitterDelegate, WCSes
             }
 
             if let pumpModelNumber = NSUserDefaults.standardUserDefaults().pumpModelNumber {
-                pumpState.pumpModel = PumpModel(rawValue: pumpModelNumber)
+                if let model = PumpModel(rawValue: pumpModelNumber) {
+                    pumpState.pumpModel = model
+
+                    sentryEnabled = model.larger
+                }
             }
 
             self.pumpState = pumpState

Original file line number	Diff line number	Diff line change
`@@ -354,7 +354,7 @@ class DeviceDataManager: NSObject, CarbStoreDelegate, TransmitterDelegate, WCSes`
`354`	`354`	`return pumpState?.pumpID`
`355`	`355`	`}`
`356`	`356`	`set {`
`357`		`- guard newValue?.characters.count == 6 else {`
	`357`	`+ guard newValue?.characters.count == 6 && newValue != pumpState?.pumpID else {`
`358`	`358`	`return`
`359`	`359`	`}`
`360`	`360`
`@@ -365,8 +365,6 @@ class DeviceDataManager: NSObject, CarbStoreDelegate, TransmitterDelegate, WCSes`
`365`	`365`	`pumpState.timeZone = timeZone`
`366`	`366`	`}`
`367`	`367`
`368`		`- pumpState.pumpModel = self.pumpState?.pumpModel`
`369`		`-`
`370`	`368`	`self.pumpState = pumpState`
`371`	`369`	`} else {`
`372`	`370`	`self.pumpState = nil`
`@@ -692,7 +690,11 @@ class DeviceDataManager: NSObject, CarbStoreDelegate, TransmitterDelegate, WCSes`
`692`	`690`	`}`
`693`	`691`
`694`	`692`	`if let pumpModelNumber = NSUserDefaults.standardUserDefaults().pumpModelNumber {`
`695`		`- pumpState.pumpModel = PumpModel(rawValue: pumpModelNumber)`
	`693`	`+ if let model = PumpModel(rawValue: pumpModelNumber) {`
	`694`	`+ pumpState.pumpModel = model`
	`695`	`+`
	`696`	`+ sentryEnabled = model.larger`
	`697`	`+ }`
`696`	`698`	`}`
`697`	`699`
`698`	`700`	`self.pumpState = pumpState`