Skip to content

Commit a0e3c6e

Browse files
committed
Merge branch 'use-share' of github.com:LoopKit/Loop into use-share
2 parents a16c762 + ddaaeba commit a0e3c6e

File tree

3 files changed

+12
-5
lines changed

3 files changed

+12
-5
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 nil
91+
return .share
9292
}
9393
}
9494
set {

Loop/Models/CGM.swift

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

1617
var appURL: URL? {
1718
switch self {
18-
case .g4:
19+
case .g4, .share:
1920
return URL(string: "dexcomshare://")
2021
case .g5:
2122
return URL(string: "dexcomcgm://")
@@ -32,6 +33,8 @@ enum CGM {
3233
return G4CGMManager()
3334
case .g5(let transmitterID):
3435
return G5CGMManager(transmitterID: transmitterID)
36+
case .share:
37+
return ShareClientManager()
3538
}
3639
}
3740
}
@@ -57,6 +60,8 @@ extension CGM: RawRepresentable {
5760
self = .g4
5861
case .enlite?:
5962
self = .enlite
63+
case .share?:
64+
self = .share
6065
case .none:
6166
return nil
6267
}
@@ -66,13 +71,15 @@ extension CGM: RawRepresentable {
6671
case g5
6772
case g4
6873
case enlite
74+
case share
6975
}
7076

7177
private var type: CGMType {
7278
switch self {
7379
case .g5: return .g5
7480
case .g4: return .g4
7581
case .enlite: return .enlite
82+
case .share: return .share
7683
}
7784
}
7885

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 = nil
690+
dataManager.cgm = .share
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 = nil
702+
dataManager.cgm = .share
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 = nil
714+
dataManager.cgm = .share
715715
}
716716
tableView.endUpdates()
717717
}

0 commit comments

Comments
 (0)