G6 update hotfix (#128)

* Delay control subscription until after auth (#127)

* Bump LoopKit rev

* Bump version

CGMBLEKit Example/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.0</string>
+	<string>3.1</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>LSRequiresIPhoneOS</key>

CGMBLEKit.xcodeproj/project.pbxproj

@@ -1302,7 +1302,7 @@
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = "";
 				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 20;
+				DYLIB_CURRENT_VERSION = 21;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -1335,7 +1335,7 @@
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = "";
 				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 20;
+				DYLIB_CURRENT_VERSION = 21;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -1387,7 +1387,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 20;
+				CURRENT_PROJECT_VERSION = 21;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
@@ -1457,7 +1457,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 20;
+				CURRENT_PROJECT_VERSION = 21;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -1496,7 +1496,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 20;
+				DYLIB_CURRENT_VERSION = 21;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -1523,7 +1523,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 20;
+				DYLIB_CURRENT_VERSION = 21;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",

CGMBLEKit/BluetoothManager.swift

@@ -45,6 +45,13 @@ protocol BluetoothManagerDelegate: class {
     ///   - manager: The bluetooth manager
     ///   - response: The data received on the backfill characteristic
     func bluetoothManager(_ manager: BluetoothManager, didReceiveBackfillResponse response: Data)
+
+    /// Informs the delegate that the bluetooth manager received new data in the authentication characteristic
+    ///
+    /// - Parameters:
+    ///   - manager: The bluetooth manager
+    ///   - response: The data received on the authentication characteristic
+    func bluetoothManager(_ manager: BluetoothManager, peripheralManager: PeripheralManager, didReceiveAuthenticationResponse response: Data)
 }
 
 
@@ -318,12 +325,14 @@ extension BluetoothManager: PeripheralManagerDelegate {
         }
 
         switch CGMServiceCharacteristicUUID(rawValue: characteristic.uuid.uuidString.uppercased()) {
-        case .none, .communication?, .authentication?:
+        case .none, .communication?:
             return
         case .control?:
             self.delegate?.bluetoothManager(self, didReceiveControlResponse: value)
         case .backfill?:
             self.delegate?.bluetoothManager(self, didReceiveBackfillResponse: value)
+        case .authentication?:
+            self.delegate?.bluetoothManager(self, peripheralManager: manager, didReceiveAuthenticationResponse: value)
         }
     }
 }

CGMBLEKit/BluetoothServices.swift

@@ -40,15 +40,24 @@ enum DeviceInfoCharacteristicUUID: String, CBUUIDRawValue {
 
 
 enum CGMServiceCharacteristicUUID: String, CBUUIDRawValue {
+
     // Read/Notify
     case communication = "F8083533-849E-531C-C594-30F1F86A4EA5"
+
     // Write/Indicate
     case control = "F8083534-849E-531C-C594-30F1F86A4EA5"
-    // Read/Write/Indicate
+
+    // Write/Indicate
     case authentication = "F8083535-849E-531C-C594-30F1F86A4EA5"
 
     // Read/Write/Notify
     case backfill = "F8083536-849E-531C-C594-30F1F86A4EA5"
+
+//    // Unknown attribute present on older G6 transmitters
+//    case unknown1 = "F8083537-849E-531C-C594-30F1F86A4EA5"
+//
+//    // Updated G6 characteristic (read/notify)
+//    case unknown2 = "F8083538-849E-531C-C594-30F1F86A4EA5"
 }
 
 

CGMBLEKit/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.0</string>
+	<string>3.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

CGMBLEKit/Messages/AuthChallengeRxMessage.swift

@@ -10,8 +10,8 @@ import Foundation
 
 
 struct AuthChallengeRxMessage: TransmitterRxMessage {
-    let authenticated: UInt8
-    let bonded: UInt8
+    let isAuthenticated: Bool
+    let isBonded: Bool
 
     init?(data: Data) {
         guard data.count >= 3 else {
@@ -22,7 +22,7 @@ struct AuthChallengeRxMessage: TransmitterRxMessage {
             return nil
         }
 
-        authenticated = data[1]
-        bonded = data[2]
+        isAuthenticated = data[1] == 0x1
+        isBonded = data[2] == 0x1
     }
 }

CGMBLEKit/Transmitter.swift

@@ -149,9 +149,9 @@ public final class Transmitter: BluetoothManagerDelegate {
 
         peripheralManager.perform { (peripheral) in
             if self.passiveModeEnabled {
-                self.log.debug("Listening for control commands in passive mode")
+                self.log.debug("Listening for authentication responses in passive mode")
                 do {
-                    try peripheral.listenToControl()
+                    try peripheral.listenToCharacteristic(.authentication)
                 } catch let error {
                     self.delegateQueue.async {
                         self.delegate?.transmitter(self, didError: error)
@@ -162,14 +162,14 @@ public final class Transmitter: BluetoothManagerDelegate {
                     self.log.debug("Authenticating with transmitter")
                     let status = try peripheral.authenticate(id: self.id)
 
-                    if status.bonded != 0x1 {
+                    if !status.isBonded {
                         self.log.debug("Requesting bond")
                         try peripheral.requestBond()
 
                         self.log.debug("Bonding request sent. Waiting user to respond.")
                     }
 
-                    try peripheral.enableNotify(shouldWaitForBond: status.bonded != 0x1)
+                    try peripheral.enableNotify(shouldWaitForBond: !status.isBonded)
                     defer {
                         self.log.debug("Initiating a disconnect")
                         peripheral.disconnect()
@@ -319,6 +319,28 @@ public final class Transmitter: BluetoothManagerDelegate {
 
         self.backfillBuffer?.append(response)
     }
+
+    func bluetoothManager(_ manager: BluetoothManager, peripheralManager: PeripheralManager, didReceiveAuthenticationResponse response: Data) {
+
+        if let message = AuthChallengeRxMessage(data: response), message.isBonded, message.isAuthenticated {
+            self.log.debug("Observed authenticated session. enabling notifications for control characteristic.")
+            peripheralManager.perform { (peripheral) in
+                do {
+                    try peripheral.listenToCharacteristic(.control)
+                    try peripheral.listenToCharacteristic(.backfill)
+                } catch let error {
+                    self.log.error("Error trying to enable notifications on control characteristic: %{public}@", String(describing: error))
+                }
+                do {
+                    try peripheral.stopListeningToCharacteristic(.authentication)
+                } catch let error {
+                    self.log.error("Error trying to disable notifications on authentication characteristic: %{public}@", String(describing: error))
+                }
+            }
+        } else {
+            self.log.debug("Ignoring authentication response:  %{public}@", response.hexadecimalString)
+        }
+    }
 }
 
 
@@ -390,7 +412,7 @@ fileprivate extension PeripheralManager {
             throw TransmitterError.authenticationError("Unable to parse auth status: \(error)")
         }
 
-        guard challengeResponse.authenticated == 1 else {
+        guard challengeResponse.isAuthenticated else {
             throw TransmitterError.authenticationError("Transmitter rejected auth challenge")
         }
 
@@ -478,12 +500,19 @@ fileprivate extension PeripheralManager {
         }
     }
 
-    fileprivate func listenToControl() throws {
+    func listenToCharacteristic(_ characteristic: CGMServiceCharacteristicUUID) throws {
         do {
-            try setNotifyValue(true, for: .control)
-            try setNotifyValue(true, for: .backfill)
+            try setNotifyValue(true, for: characteristic)
         } catch let error {
-            throw TransmitterError.controlError("Error enabling notification: \(error)")
+            throw TransmitterError.controlError("Error enabling notification for \(characteristic): \(error)")
+        }
+    }
+
+    func stopListeningToCharacteristic(_ characteristic: CGMServiceCharacteristicUUID) throws {
+        do {
+            try setNotifyValue(false, for: characteristic)
+        } catch let error {
+            throw TransmitterError.controlError("Error disabling notification for \(characteristic): \(error)")
         }
     }
 }

CGMBLEKitTests/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.0</string>
+	<string>3.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

CGMBLEKitUI/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.0</string>
+	<string>3.1</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSPrincipalClass</key>

Cartfile.resolved

@@ -1,2 +1,2 @@
-github "LoopKit/LoopKit" "v2.2.1"
+github "LoopKit/LoopKit" "v2.2.2"
 github "LoopKit/dexcom-share-client-swift" "v1.0"

ResetTransmitter/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.0</string>
+	<string>3.1</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>LSRequiresIPhoneOS</key>