From d765cb64113f025427419e00903232afa376be88 Mon Sep 17 00:00:00 2001 From: Garth Vander Houwen Date: Sun, 11 Dec 2022 21:10:23 -0800 Subject: [PATCH 1/2] Delete unused packages --- Meshtastic.xcodeproj/project.pbxproj | 9 --------- .../xcshareddata/swiftpm/Package.resolved | 18 ------------------ 2 files changed, 27 deletions(-) diff --git a/Meshtastic.xcodeproj/project.pbxproj b/Meshtastic.xcodeproj/project.pbxproj index 268a8e42..ce7109d7 100644 --- a/Meshtastic.xcodeproj/project.pbxproj +++ b/Meshtastic.xcodeproj/project.pbxproj @@ -647,7 +647,6 @@ packageReferences = ( DD5394FA276993AD00AD86B1 /* XCRemoteSwiftPackageReference "swift-protobuf" */, C9697FA327933B8C00250207 /* XCRemoteSwiftPackageReference "SQLite.swift" */, - DD457182293C55CD000C49FB /* XCRemoteSwiftPackageReference "IOS-DFU-Library" */, ); productRefGroup = DDC2E15526CE248E0042C5E4 /* Products */; projectDirPath = ""; @@ -1159,14 +1158,6 @@ minimumVersion = 0.9.2; }; }; - DD457182293C55CD000C49FB /* XCRemoteSwiftPackageReference "IOS-DFU-Library" */ = { - isa = XCRemoteSwiftPackageReference; - repositoryURL = "https://github.com/NordicSemiconductor/IOS-DFU-Library"; - requirement = { - kind = upToNextMajorVersion; - minimumVersion = 4.0.0; - }; - }; DD5394FA276993AD00AD86B1 /* XCRemoteSwiftPackageReference "swift-protobuf" */ = { isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/apple/swift-protobuf.git"; diff --git a/Meshtastic.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Meshtastic.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index b1fa0604..bccfe8c9 100644 --- a/Meshtastic.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/Meshtastic.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -1,14 +1,5 @@ { "pins" : [ - { - "identity" : "ios-dfu-library", - "kind" : "remoteSourceControl", - "location" : "https://github.com/NordicSemiconductor/IOS-DFU-Library", - "state" : { - "revision" : "ec5364755f4fcdf68d62ff4cf796d22e7b935f40", - "version" : "4.13.0" - } - }, { "identity" : "sqlite.swift", "kind" : "remoteSourceControl", @@ -26,15 +17,6 @@ "revision" : "e1499bc69b9040b29184f7f2996f7bab467c1639", "version" : "1.19.0" } - }, - { - "identity" : "zipfoundation", - "kind" : "remoteSourceControl", - "location" : "https://github.com/weichsel/ZIPFoundation", - "state" : { - "revision" : "ec32d62d412578542c0ffb7a6ce34d3e64b43b94", - "version" : "0.9.11" - } } ], "version" : 2 From b71a30b97d1d487c607436cbb91e1da4bc515044 Mon Sep 17 00:00:00 2001 From: Garth Vander Houwen Date: Mon, 12 Dec 2022 10:23:25 -0800 Subject: [PATCH 2/2] Sync user settings after setting connected device and preferred --- Meshtastic/Helpers/BLEManager.swift | 1 + 1 file changed, 1 insertion(+) diff --git a/Meshtastic/Helpers/BLEManager.swift b/Meshtastic/Helpers/BLEManager.swift index 1c672bf1..3057e4d7 100644 --- a/Meshtastic/Helpers/BLEManager.swift +++ b/Meshtastic/Helpers/BLEManager.swift @@ -164,6 +164,7 @@ class BLEManager: NSObject, CBPeripheralDelegate, ObservableObject { preferredPeripheral = false print("Trying to connect a non prefered peripheral") } + UserDefaults.standard.synchronize() // Invalidate and reset connection timer count timeoutTimerCount = 0 if timeoutTimer != nil {