Skip to content

Commit 14686ef

Browse files
committed
Merge tidepool/dev
2 parents b833eb4 + 3654d9d commit 14686ef

File tree

3 files changed

+11
-5
lines changed

3 files changed

+11
-5
lines changed

Loop/Managers/Service.swift

+9-3
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,12 @@ let staticServicesByIdentifier: [String: Service.Type] = [
1616
MockService.serviceIdentifier: MockService.self
1717
]
1818

19-
let availableStaticServices: [ServiceDescriptor] = [
20-
ServiceDescriptor(identifier: MockService.serviceIdentifier, localizedTitle: MockService.localizedTitle)
21-
]
19+
var availableStaticServices: [ServiceDescriptor] {
20+
if FeatureFlags.allowSimulators {
21+
return [
22+
ServiceDescriptor(identifier: MockService.serviceIdentifier, localizedTitle: MockService.localizedTitle)
23+
]
24+
} else {
25+
return []
26+
}
27+
}

Loop/Managers/ServicesManager.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ class ServicesManager {
8787
return .failure(UnknownServiceIdentifierError())
8888
}
8989

90-
let result = serviceUIType.setupViewController(colorPalette: .default, pluginHost: self)
90+
let result = serviceUIType.setupViewController(colorPalette: .default, pluginHost: self, allowDebugFeatures: FeatureFlags.allowDebugFeatures)
9191
if case .createdAndOnboarded(let serviceUI) = result {
9292
serviceOnboarding(didCreateService: serviceUI)
9393
serviceOnboarding(didOnboardService: serviceUI)

Loop/View Controllers/StatusTableViewController.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -2295,7 +2295,7 @@ extension StatusTableViewController: ServicesViewModelDelegate {
22952295
}
22962296

22972297
fileprivate func showServiceSettings(_ serviceUI: ServiceUI) {
2298-
var settingsViewController = serviceUI.settingsViewController(colorPalette: .default)
2298+
var settingsViewController = serviceUI.settingsViewController(colorPalette: .default, allowDebugFeatures: FeatureFlags.allowDebugFeatures)
22992299
settingsViewController.serviceOnboardingDelegate = servicesManager
23002300
settingsViewController.completionDelegate = self
23012301
show(settingsViewController, sender: self)

0 commit comments

Comments
 (0)