Skip to content

Commit a16c762

Browse files
committed
use absence of g5 transmitter to indicate share-only setup.
1 parent 5439c7b commit a16c762

File tree

4 files changed

+15
-20
lines changed

4 files changed

+15
-20
lines changed

Loop/Extensions/NSUserDefaults.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ extension UserDefaults {
8888
return .g5(transmitterID: transmitterID)
8989
}
9090

91-
return .share
91+
return nil
9292
}
9393
}
9494
set {

Loop/Managers/CGM/DexCGMManager.swift

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -108,18 +108,20 @@ final class ShareClientManager: CGMManager {
108108

109109

110110
final class G5CGMManager: DexCGMManager, TransmitterDelegate {
111-
private let transmitter: Transmitter
111+
private let transmitter: Transmitter?
112112

113-
init?(transmitterID: String?) {
114-
guard let transmitterID = transmitterID else {
115-
return nil
113+
init(transmitterID: String?) {
114+
if let transmitterID = transmitterID {
115+
self.transmitter = Transmitter(ID: transmitterID, passiveModeEnabled: true)
116+
} else {
117+
self.transmitter = nil
116118
}
117119

118-
self.transmitter = Transmitter(ID: transmitterID, passiveModeEnabled: true)
119-
120120
super.init()
121121

122-
self.transmitter.delegate = self
122+
self.providesBLEHeartbeat = self.transmitter != nil
123+
124+
self.transmitter?.delegate = self
123125
}
124126

125127
override var sensorState: SensorDisplayable? {
@@ -150,7 +152,7 @@ final class G5CGMManager: DexCGMManager, TransmitterDelegate {
150152
return [
151153
"## G5CGMManager",
152154
"latestReading: \(String(describing: latestReading))",
153-
"transmitter: \(transmitter)",
155+
"transmitter: \(String(describing: transmitter))",
154156
super.debugDescription,
155157
""
156158
].joined(separator: "\n")

Loop/Models/CGM.swift

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,10 @@ enum CGM {
1212
case g5(transmitterID: String?)
1313
case g4
1414
case enlite
15-
case share
1615

1716
var appURL: URL? {
1817
switch self {
19-
case .g4, .share:
18+
case .g4:
2019
return URL(string: "dexcomshare://")
2120
case .g5:
2221
return URL(string: "dexcomcgm://")
@@ -33,8 +32,6 @@ enum CGM {
3332
return G4CGMManager()
3433
case .g5(let transmitterID):
3534
return G5CGMManager(transmitterID: transmitterID)
36-
case .share:
37-
return ShareClientManager()
3835
}
3936
}
4037
}
@@ -60,8 +57,6 @@ extension CGM: RawRepresentable {
6057
self = .g4
6158
case .enlite?:
6259
self = .enlite
63-
case .share?:
64-
self = .share
6560
case .none:
6661
return nil
6762
}
@@ -71,15 +66,13 @@ extension CGM: RawRepresentable {
7166
case g5
7267
case g4
7368
case enlite
74-
case share
7569
}
7670

7771
private var type: CGMType {
7872
switch self {
7973
case .g5: return .g5
8074
case .g4: return .g4
8175
case .enlite: return .enlite
82-
case .share: return .share
8376
}
8477
}
8578

Loop/View Controllers/SettingsTableViewController.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -687,7 +687,7 @@ final class SettingsTableViewController: UITableViewController, DailyValueSchedu
687687
tableView.insertRows(at: [IndexPath(row: CGMRow.g5TransmitterID.rawValue, section:Section.cgm.rawValue)], with: .top)
688688
} else {
689689
removeG5TransmitterIDRow()
690-
dataManager.cgm = .share
690+
dataManager.cgm = nil
691691
}
692692
tableView.endUpdates()
693693
}
@@ -699,7 +699,7 @@ final class SettingsTableViewController: UITableViewController, DailyValueSchedu
699699
setEnliteSwitchOff()
700700
dataManager.cgm = .g4
701701
} else {
702-
dataManager.cgm = .share
702+
dataManager.cgm = nil
703703
}
704704
tableView.endUpdates()
705705
}
@@ -711,7 +711,7 @@ final class SettingsTableViewController: UITableViewController, DailyValueSchedu
711711
setG4SwitchOff()
712712
dataManager.cgm = .enlite
713713
} else {
714-
dataManager.cgm = .share
714+
dataManager.cgm = nil
715715
}
716716
tableView.endUpdates()
717717
}

0 commit comments

Comments
 (0)