Dev update

Loop.xcodeproj/xcshareddata/xcschemes/Complication - WatchApp.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0810"
+   LastUpgradeVersion = "0820"
    version = "2.0">
    <BuildAction
       parallelizeBuildables = "YES"

Loop.xcodeproj/xcshareddata/xcschemes/DoseMathTests.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0810"
+   LastUpgradeVersion = "0820"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

Loop.xcodeproj/xcshareddata/xcschemes/Loop Status Extension.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0810"
+   LastUpgradeVersion = "0820"
    wasCreatedForAppExtension = "YES"
    version = "2.0">
    <BuildAction

Loop.xcodeproj/xcshareddata/xcschemes/Loop.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0810"
+   LastUpgradeVersion = "0820"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

Loop.xcodeproj/xcshareddata/xcschemes/LoopTests.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0810"
+   LastUpgradeVersion = "0820"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

Loop.xcodeproj/xcshareddata/xcschemes/Notification - WatchApp.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0810"
+   LastUpgradeVersion = "0820"
    version = "2.0">
    <BuildAction
       parallelizeBuildables = "YES"

Loop.xcodeproj/xcshareddata/xcschemes/WatchApp.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0810"
+   LastUpgradeVersion = "0820"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

Loop/Extensions/NSUserDefaults.swift

@@ -20,6 +20,7 @@ extension UserDefaults {
         case InsulinActionDuration = "com.loudnate.Naterade.InsulinActionDuration"
         case InsulinSensitivitySchedule = "com.loudnate.Naterade.InsulinSensitivitySchedule"
         case G4ReceiverEnabled = "com.loudnate.Loop.G4ReceiverEnabled"
+        case G5TransmitterEnabled = "com.loopkit.Loop.G5TransmitterEnabled"
         case G5TransmitterID = "com.loudnate.Naterade.TransmitterID"
         case GlucoseTargetRangeSchedule = "com.loudnate.Naterade.GlucoseTargetRangeSchedule"
         case MaximumBasalRatePerHour = "com.loudnate.Naterade.MaximumBasalRatePerHour"
@@ -223,6 +224,22 @@ extension UserDefaults {
         }
     }
 
+    var transmitterEnabled: Bool {
+        get {
+            if object(forKey: Key.G5TransmitterEnabled.rawValue) == nil {
+                // Old versions of Loop used the existence of transmitterID to indicate
+                // that the transmitter is enabled. Upgrade to the new format now. The
+                // transmitter is enabled if there's a 6 character transmitter ID
+                set(transmitterID?.characters.count == 6, forKey: Key.G5TransmitterEnabled.rawValue)
+            }
+
+            return bool(forKey: Key.G5TransmitterEnabled.rawValue)
+        }
+        set {
+            set(newValue, forKey: Key.G5TransmitterEnabled.rawValue)
+        }
+    }
+
     var transmitterID: String? {
         get {
             return string(forKey: Key.G5TransmitterID.rawValue)

Loop/Managers/DeviceDataManager.swift

@@ -54,6 +54,15 @@ final class DeviceDataManager: CarbStoreDelegate, CarbStoreSyncDelegate, DoseSto
         }
     }
 
+    var transmitterEnabled: Bool {
+        get {
+            return UserDefaults.standard.transmitterEnabled
+        }
+        set {
+            return UserDefaults.standard.transmitterEnabled = newValue
+        }
+    }
+
     var sensorInfo: SensorDisplayable? {
         return latestGlucoseG5 ?? latestGlucoseG4 ?? latestGlucoseFromShare ?? latestPumpStatusFromMySentry
     }
@@ -1050,7 +1059,10 @@ final class DeviceDataManager: CarbStoreDelegate, CarbStoreSyncDelegate, DoseSto
             receiver?.delegate = self
         }
 
-        if let transmitterID = UserDefaults.standard.transmitterID, transmitterID.characters.count == 6 {
+        if UserDefaults.standard.transmitterEnabled,
+            let transmitterID = UserDefaults.standard.transmitterID,
+            transmitterID.characters.count == 6 {
+
             transmitter = Transmitter(ID: transmitterID, passiveModeEnabled: true)
             transmitter?.delegate = self
         }
@@ -1071,6 +1083,7 @@ extension DeviceDataManager: CustomDebugStringConvertible {
             "latestGlucoseG4: \(latestGlucoseG4)",
             "pumpState: \(String(reflecting: pumpState))",
             "preferredInsulinDataSource: \(preferredInsulinDataSource)",
+            "transmitterEnabled: \(transmitterEnabled)",
             "transmitterID: \(transmitterID)",
             "glucoseTargetRangeSchedule: \(glucoseTargetRangeSchedule?.debugDescription ?? "")",
             "workoutModeEnabled: \(workoutModeEnabled)",

Loop/Managers/StatusExtensionDataManager.swift

@@ -109,6 +109,7 @@ extension StatusExtensionDataManager: CustomDebugStringConvertible {
     var debugDescription: String {
         return [
             "## StatusExtensionDataManager",
+            "appGroupName: \(Bundle.main.appGroupSuiteName)",
             "statusExtensionContext: \(String(reflecting: defaults?.statusExtensionContext))"
         ].joined(separator: "\n")
     }