فهرست منبع

Revert "Face-ID for import"

This reverts commit ff36ad34cf6d43d9bafd9dfb9754f5e82f3d833e.
Jon Mårtensson 2 سال پیش
والد
کامیت
b5e74a0563

+ 0 - 12
FreeAPS/Sources/Modules/NightscoutConfig/NightscoutConfigStateModel.swift

@@ -13,7 +13,6 @@ extension NightscoutConfig {
         @Injected() private var healthKitManager: HealthKitManager!
         @Injected() private var cgmManager: FetchGlucoseManager!
         @Injected() private var storage: FileStorage!
-        @Injected() var unlockmanager: UnlockManager!
 
         let coredataContext = CoreDataStack.shared.persistentContainer.viewContext
 
@@ -28,7 +27,6 @@ extension NightscoutConfig {
         @Published var useLocalSource = false
         @Published var localPort: Decimal = 0
         @Published var units: GlucoseUnits = .mmolL
-        @Published var importedHasRun = false
 
         override func subscribe() {
             url = keychain.getValue(String.self, forKey: Config.urlKey) ?? ""
@@ -86,16 +84,6 @@ extension NightscoutConfig {
             return NightscoutAPI(url: url, secret: secret)
         }
 
-        func startImport() {
-            unlockmanager.unlock()
-                .sink { _ in } receiveValue: { [weak self] _ in
-                    guard let self = self else { return }
-                    importSettings()
-                    importedHasRun = true
-                }
-                .store(in: &lifetime)
-        }
-
         func importSettings() {
             guard let nightscout = nightscoutAPI else {
                 saveError("Can't access nightscoutAPI")

+ 4 - 2
FreeAPS/Sources/Modules/NightscoutConfig/View/NightscoutConfigRootView.swift

@@ -8,6 +8,7 @@ extension NightscoutConfig {
         @StateObject var state = StateModel()
         @State var importAlert: Alert?
         @State var isImportAlertPresented = false
+        @State var importedHasRun = false
 
         @FetchRequest(
             entity: ImportError.entity(),
@@ -78,7 +79,8 @@ extension NightscoutConfig {
                             primaryButton: .destructive(
                                 Text("Yes, Import"),
                                 action: {
-                                    state.startImport()
+                                    state.importSettings()
+                                    importedHasRun = true
                                 }
                             ),
                             secondaryButton: .cancel()
@@ -88,7 +90,7 @@ extension NightscoutConfig {
 
                 } header: { Text("Import from Nightscout") }
 
-                    .alert(isPresented: $state.importedHasRun) {
+                    .alert(isPresented: $importedHasRun) {
                         Alert(
                             title: Text("Settings imported"),
                             message: Text(