Revert "Added option to show xDrip4iOS instead of NS when tapping BG in header Home View. New toggle in "Nightscout" settings."

This reverts commit 380a1c933dea2dc3f254f01963a354d423c5f62c.

FreeAPS/Resources/json/defaults/freeaps/freeaps_settings.json

@@ -5,7 +5,6 @@
     "useAutotune": false
     "isUploadEnabled": false,
     "useLocalGlucoseSource": false,
-    "dontShowNS": false,
     "localGlucosePort": 8080,
     "debugOptions": false,
     "insulinReqFraction": 0.7,

FreeAPS/Sources/Models/FreeAPSSettings.swift

@@ -7,7 +7,6 @@ struct FreeAPSSettings: JSON, Equatable {
     var useAutotune: Bool
     var isUploadEnabled: Bool?
     var useLocalGlucoseSource: Bool?
-    var dontShowNS: Bool
     var localGlucosePort: Int?
     var debugOptions: Bool?
     var insulinReqFraction: Decimal?

FreeAPS/Sources/Modules/Home/HomeViewModel.swift

@@ -267,12 +267,6 @@ extension Home {
         }
 
         func openCGM() {
-            guard !settingsManager.settings.dontShowNS else {
-                let url = URL(string: "xdripswift://")!
-                UIApplication.shared.open(url, options: [:], completionHandler: nil)
-                return
-            }
-
             guard var url = nightscoutManager.cgmURL else { return }
 
             switch url.absoluteString {

FreeAPS/Sources/Modules/NightscoutConfig/NightscoutConfigViewModel.swift

@@ -14,7 +14,6 @@ extension NightscoutConfig {
 
         @Published var useLocalSource = false
         @Published var localPort: Decimal = 0
-        @Published var dontShowNS = false
 
         override func subscribe() {
             url = keychain.getValue(String.self, forKey: Config.urlKey) ?? ""
@@ -22,7 +21,6 @@ extension NightscoutConfig {
             isUploadEnabled = settingsManager.settings.isUploadEnabled ?? false
             useLocalSource = settingsManager.settings.useLocalGlucoseSource ?? false
             localPort = Decimal(settingsManager.settings.localGlucosePort ?? 8080)
-            dontShowNS = settingsManager.settings.dontShowNS
 
             $isUploadEnabled
                 .removeDuplicates()
@@ -41,12 +39,6 @@ extension NightscoutConfig {
                 .sink { [weak self] port in
                     self?.settingsManager.settings.localGlucosePort = Int(port)
                 }.store(in: &lifetime)
-
-            $dontShowNS
-                .removeDuplicates()
-                .sink { [weak self] enabled in
-                    self?.settingsManager.settings.dontShowNS = enabled
-                }.store(in: &lifetime)
         }
 
         func connect() {

FreeAPS/Sources/Modules/NightscoutConfig/View/NightscoutConfigRootView.swift

@@ -52,10 +52,6 @@ extension NightscoutConfig {
                         DecimalTextField("", value: $viewModel.localPort, formatter: portFormater)
                     }
                 }
-
-                Section(header: Text("Show xDrip4iOS or other CGM instead of NS")) {
-                    Toggle("Don't show NS", isOn: $viewModel.dontShowNS)
-                }
             }
             .navigationBarTitle("Nightscout Config", displayMode: .automatic)
         }

FreeAPS/Sources/Services/SettingsManager/SettingsManager.swift

@@ -38,7 +38,6 @@ final class BaseSettingsManager: SettingsManager, Injectable {
                 useAutotune: false,
                 isUploadEnabled: false,
                 useLocalGlucoseSource: false,
-                dontShowNS: false,
                 localGlucosePort: nil,
                 debugOptions: false
             )