diff --git a/Meshtastic/Helpers/BLEManager.swift b/Meshtastic/Helpers/BLEManager.swift index bf4959f8..a1fbb017 100644 --- a/Meshtastic/Helpers/BLEManager.swift +++ b/Meshtastic/Helpers/BLEManager.swift @@ -645,6 +645,7 @@ class BLEManager: NSObject, CBPeripheralDelegate, MqttClientProxyManagerDelegate if FileManager.default.fileExists(atPath: databasePath.path) { do { disconnectPeripheral(reconnect: false) + clearCoreDataDatabase(context: context!, includeRoutes: true) try container.restorePersistentStore(from: databasePath) UserDefaults.preferredPeripheralNum = Int(myInfo?.myNodeNum ?? 0) context!.reset() @@ -3071,7 +3072,7 @@ extension BLEManager: CBCentralManagerDelegate { // MARK: Bluetooth enabled/disabled func centralManagerDidUpdateState(_ central: CBCentralManager) { if central.state == CBManagerState.poweredOn { - Logger.services.debug("🔌 BLE powered on") + Logger.services.info("✅ [BLE] powered on") isSwitchedOn = true startScanning() } else { @@ -3096,7 +3097,7 @@ extension BLEManager: CBCentralManagerDelegate { default: status = "default" } - Logger.services.debug("📜 [BLE] Bluetooth status: \(status)") + Logger.services.info("📜 [BLE] Bluetooth status: \(status)") } // Called each time a peripheral is discovered diff --git a/Meshtastic/MeshtasticApp.swift b/Meshtastic/MeshtasticApp.swift index da3383d2..b00fab92 100644 --- a/Meshtastic/MeshtasticApp.swift +++ b/Meshtastic/MeshtasticApp.swift @@ -140,22 +140,22 @@ struct MeshtasticAppleApp: App { .onChange(of: scenePhase) { (newScenePhase) in switch newScenePhase { case .background: - Logger.services.info("🍏 Scene is in the background") + Logger.services.info("🎬 [App] Scene is in the background") do { try persistenceController.container.viewContext.save() - Logger.services.info("💾 Saved CoreData ViewContext when the app went to the background.") + Logger.services.info("💾 [App] Saved CoreData ViewContext when the app went to the background.") } catch { - Logger.services.error("💥 Failed to save viewContext when the app goes to the background.") + Logger.services.error("💥 [App] Failed to save viewContext when the app goes to the background.") } case .inactive: - Logger.services.info("🍏 Scene is inactive") + Logger.services.info("🎬 [App] Scene is inactive") case .active: - Logger.services.info("🍏 Scene is active") + Logger.services.info("🎬 [App] Scene is active") @unknown default: - Logger.services.error("🍎 Apple must have changed something") + Logger.services.error("🍎 [App] Apple must have changed something") } } } diff --git a/Meshtastic/Views/Settings/AppData.swift b/Meshtastic/Views/Settings/AppData.swift index 237fc197..74f718d8 100644 --- a/Meshtastic/Views/Settings/AppData.swift +++ b/Meshtastic/Views/Settings/AppData.swift @@ -53,7 +53,7 @@ struct AppData: View { VStack(alignment: .leading ) { if file.pathExtension.contains("sqlite") { Label { - Text("Node Core Data Backup \(file.pathComponents[9])/\(file.lastPathComponent) - \(file.creationDate?.formatted() ?? "") - \(file.fileSizeString)") + Text("Node Core Data Backup \(file.pathComponents[10])/\(file.lastPathComponent) - \(file.creationDate?.formatted() ?? "") - \(file.fileSizeString)") .swipeActions { Button(role: .none) { bleManager.disconnectPeripheral(reconnect: false)