From a8399f61484cb41a7b883205a554f3ef97aa189d Mon Sep 17 00:00:00 2001 From: Garth Vander Houwen Date: Fri, 28 Jun 2024 19:41:17 -0700 Subject: [PATCH] Swiftlint updates --- Meshtastic/Extensions/CoreData/MQTTConfigEntityExtension.swift | 2 +- .../Extensions/CoreData/RangeTestConfigEntityExtension.swift | 2 +- .../Extensions/CoreData/SerialConfigEntityExtension.swift | 2 +- .../Extensions/CoreData/StoreForwardConfigEntityExtension.swift | 2 +- Meshtastic/Views/Settings/AppData.swift | 1 - 5 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Meshtastic/Extensions/CoreData/MQTTConfigEntityExtension.swift b/Meshtastic/Extensions/CoreData/MQTTConfigEntityExtension.swift index ca01ba91..29b1d064 100644 --- a/Meshtastic/Extensions/CoreData/MQTTConfigEntityExtension.swift +++ b/Meshtastic/Extensions/CoreData/MQTTConfigEntityExtension.swift @@ -20,7 +20,7 @@ extension MQTTConfigEntity { self.mapPositionPrecision = Int32(config.mapReportSettings.positionPrecision) self.mapPublishIntervalSecs = Int32(config.mapReportSettings.publishIntervalSecs) } - + func update(with config: ModuleConfig.MQTTConfig) { enabled = config.enabled proxyToClientEnabled = config.proxyToClientEnabled diff --git a/Meshtastic/Extensions/CoreData/RangeTestConfigEntityExtension.swift b/Meshtastic/Extensions/CoreData/RangeTestConfigEntityExtension.swift index d85a6ab8..20aa1713 100644 --- a/Meshtastic/Extensions/CoreData/RangeTestConfigEntityExtension.swift +++ b/Meshtastic/Extensions/CoreData/RangeTestConfigEntityExtension.swift @@ -11,7 +11,7 @@ extension RangeTestConfigEntity { self.enabled = config.enabled self.save = config.save } - + func update(with config: ModuleConfig.RangeTestConfig) { sender = Int32(config.sender) enabled = config.enabled diff --git a/Meshtastic/Extensions/CoreData/SerialConfigEntityExtension.swift b/Meshtastic/Extensions/CoreData/SerialConfigEntityExtension.swift index da48dde2..49400a94 100644 --- a/Meshtastic/Extensions/CoreData/SerialConfigEntityExtension.swift +++ b/Meshtastic/Extensions/CoreData/SerialConfigEntityExtension.swift @@ -15,7 +15,7 @@ extension SerialConfigEntity { self.timeout = Int32(config.timeout) self.mode = Int32(config.mode.rawValue) } - + func update(with config: ModuleConfig.SerialConfig) { enabled = config.enabled echo = config.echo diff --git a/Meshtastic/Extensions/CoreData/StoreForwardConfigEntityExtension.swift b/Meshtastic/Extensions/CoreData/StoreForwardConfigEntityExtension.swift index c44de4f7..886a79d5 100644 --- a/Meshtastic/Extensions/CoreData/StoreForwardConfigEntityExtension.swift +++ b/Meshtastic/Extensions/CoreData/StoreForwardConfigEntityExtension.swift @@ -13,7 +13,7 @@ extension StoreForwardConfigEntity { self.historyReturnMax = Int32(config.historyReturnMax) self.historyReturnWindow = Int32(config.historyReturnWindow) } - + func update(with config: ModuleConfig.StoreForwardConfig) { enabled = config.enabled heartbeat = config.heartbeat diff --git a/Meshtastic/Views/Settings/AppData.swift b/Meshtastic/Views/Settings/AppData.swift index dee18d9f..1d38844d 100644 --- a/Meshtastic/Views/Settings/AppData.swift +++ b/Meshtastic/Views/Settings/AppData.swift @@ -59,7 +59,6 @@ struct AppData: View { bleManager.disconnectPeripheral(reconnect: false) let container = NSPersistentContainer(name: "Meshtastic") do { - clearCoreDataDatabase(context: context, includeRoutes: true) try container.restorePersistentStore(from: file.absoluteURL) let request = MyInfoEntity.fetchRequest() try context.fetch(request)