Merge pull request #578 from tidepool-org/cameron/LOOP-4649-marketing-demo

Author: Camji55

Loop/Managers/DeviceDataManager.swift

@@ -86,7 +86,7 @@ final class DeviceDataManager {
 
     public private(set) var displayGlucosePreference: DisplayGlucosePreference
 
-    var onlyAllowSimulators: Bool = false
+    var deviceWhitelist = DeviceWhitelist()
 
     // MARK: - CGM
 
@@ -465,11 +465,11 @@ final class DeviceDataManager {
         var pumpManagers = pluginManager.availablePumpManagers + availableStaticPumpManagers
 
         pumpManagers = pumpManagers.filter({ pumpManager in
-            if onlyAllowSimulators {
-                return pumpManager.identifier == "MockPumpManager"
-            } else {
+            guard !deviceWhitelist.pumpDevices.isEmpty else {
                 return true
             }
+            
+            return deviceWhitelist.pumpDevices.contains(pumpManager.identifier)
         })
 
         return pumpManagers
@@ -585,11 +585,11 @@ final class DeviceDataManager {
         }
 
         availableCGMManagers = availableCGMManagers.filter({ cgmManager in
-            if onlyAllowSimulators {
-                return cgmManager.identifier == "MockCGMManager"
-            } else {
+            guard !deviceWhitelist.cgmDevices.isEmpty else {
                 return true
             }
+            
+            return deviceWhitelist.cgmDevices.contains(cgmManager.identifier)
         })
 
         return availableCGMManagers

Loop/Managers/LoopAppManager.swift

@@ -220,9 +220,7 @@ class LoopAppManager: NSObject {
                                         servicesManager: deviceDataManager.servicesManager,
                                         alertIssuer: alertManager)
 
-        if supportManager.availableSupports.contains(where: { $0.onlyAllowSimulatorDevices }) {
-            deviceDataManager.onlyAllowSimulators = true
-        }
+        setWhitelistedDevices()
 
         onboardingManager = OnboardingManager(pluginManager: pluginManager,
                                               bluetoothProvider: bluetoothStateManager,
@@ -401,6 +399,18 @@ class LoopAppManager: NSObject {
     }
 
     // MARK: - Private
+    
+    private func setWhitelistedDevices() {
+        var whitelistedCGMs: Set<String> = []
+        var whitelistedPumps: Set<String> = []
+        
+        supportManager.availableSupports.forEach {
+            $0.deviceIdentifierWhitelist.cgmDevices.forEach({ whitelistedCGMs.insert($0) })
+            $0.deviceIdentifierWhitelist.pumpDevices.forEach({ whitelistedPumps.insert($0) })
+        }
+        
+        deviceDataManager.deviceWhitelist = DeviceWhitelist(cgmDevices: Array(whitelistedCGMs), pumpDevices: Array(whitelistedPumps))
+    }
 
     private func isProtectedDataAvailable() -> Bool {
         let fileManager = FileManager.default