Refactored BLE connection process to eliminate a lot of cruft. Left the dead code as comments just in case, or roll back to the previous commit if it's really bad. Changed build number to 5

Author: xan-m

Infini-iOS.xcodeproj/project.pbxproj

@@ -780,7 +780,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 3;
+				CURRENT_PROJECT_VERSION = 5;
 				DEVELOPMENT_ASSET_PATHS = "\"Infini-iOS/Preview Content\"";
 				DEVELOPMENT_TEAM = 99BHY6DC82;
 				ENABLE_PREVIEWS = YES;
@@ -804,7 +804,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 3;
+				CURRENT_PROJECT_VERSION = 5;
 				DEVELOPMENT_ASSET_PATHS = "\"Infini-iOS/Preview Content\"";
 				DEVELOPMENT_TEAM = 99BHY6DC82;
 				ENABLE_PREVIEWS = YES;

Infini-iOS/BLE/BLEManager.swift

@@ -64,7 +64,8 @@ class BLEManager: NSObject, ObservableObject, CBCentralManagerDelegate {
 	@Published var blePermissions: Bool!
 
 	// Selecting and connecting variables
-	@Published var peripherals = [Peripheral]() 						// used to print human-readable device names to UI in selection process
+	@Published var peripherals = [Peripheral]()
+	@Published var newPeripherals: [CBPeripheral] = []					// used to print human-readable device names to UI in selection process
 	@Published var deviceToConnect: Int!								// When the user selects a device from the UI, that peripheral's ID goes in this var, which is passed to the peripheralDictionary
 	@Published var peripheralDictionary: [Int: CBPeripheral] = [:] 		// this is the dictionary that relates human-readable peripheral names to the CBPeripheral class that CoreBluetooth actually interacts with
 	@Published var infiniTime: CBPeripheral!							// variable to save the CBPeripheral that you're connecting to
@@ -99,6 +100,7 @@ class BLEManager: NSObject, ObservableObject, CBCentralManagerDelegate {
 		isScanning = true
 		peripherals = [Peripheral]()
 		peripheralDictionary = [:]
+		newPeripherals = []
 	}
 
 	func stopScanning() {
@@ -138,18 +140,22 @@ class BLEManager: NSObject, ObservableObject, CBCentralManagerDelegate {
 
 	func centralManager(_ central: CBCentralManager, didDiscover peripheral: CBPeripheral, advertisementData: [String : Any], rssi RSSI: NSNumber) {
 
-		var peripheralName: String!
+//		var peripheralName: String!
 
-		if let name = advertisementData[CBAdvertisementDataLocalNameKey] as? String {
-			peripheralName = name
-			let devUUIDString: String = peripheral.identifier.uuidString
-			let devUUID: CBUUID = CBUUID(string: devUUIDString)
-			let newPeripheral = Peripheral(id: peripheralDictionary.count, name: peripheralName, rssi: RSSI.intValue, peripheralHash: peripheral.hash, deviceUUID: devUUID, stringUUID: peripheral.identifier.uuidString)
+		if let _ = advertisementData[CBAdvertisementDataLocalNameKey] as? String {
+//			peripheralName = name
+//			let devUUIDString: String = peripheral.identifier.uuidString
+//			let devUUID: CBUUID = CBUUID(string: devUUIDString)
+//			let newPeripheral = Peripheral(id: peripheralDictionary.count, name: peripheralName, rssi: RSSI.intValue, peripheralHash: peripheral.hash, deviceUUID: devUUID, stringUUID: peripheral.identifier.uuidString)
 
 			guard BLEAutoconnectManager.shared.connect(peripheral: peripheral) else {
-				if !peripherals.contains(where: {$0.deviceUUID == newPeripheral.deviceUUID}) {
-					peripherals.append(newPeripheral)
-					peripheralDictionary[newPeripheral.peripheralHash] = peripheral
+//				if !peripherals.contains(where: {$0.deviceUUID == newPeripheral.deviceUUID}) {
+//					peripherals.append(newPeripheral)
+//					peripheralDictionary[newPeripheral.peripheralHash] = peripheral
+//				}
+				if !newPeripherals.contains(where: {$0.identifier.uuidString == peripheral.identifier.uuidString}) {
+					newPeripherals.append(peripheral)
+					print(newPeripherals.count)
 				}
 				return
 			}

Infini-iOS/View Components/Sheets/BLEConnectView.swift

@@ -15,7 +15,7 @@ struct Connect: View {
 	@Environment(\.presentationMode) var presentation
 	@AppStorage("autoconnect") var autoconnect: Bool = false
 	@AppStorage("autoconnectUUID") var autoconnectUUID: String = ""
-
+	
 	var body: some View {
 		SheetCloseButton()
 		VStack (){
@@ -37,25 +37,41 @@ struct Connect: View {
 					.padding()
 					.frame(maxWidth: .infinity, alignment: .leading)
 			}
-			List(bleManager.peripherals) { peripheral in
-				let deviceName = DeviceNameManager.init().getName(deviceUUID: peripheral.stringUUID)
-				HStack {
-					Button(action: {
-						self.bleManager.deviceToConnect = peripheral.peripheralHash
-						self.bleManager.connect(peripheral: self.bleManager.peripheralDictionary[peripheral.peripheralHash]!)
-						presentation.wrappedValue.dismiss()
-					}) {
-						if deviceName == "" {
-							Text(peripheral.name)
-						} else {
-							Text(deviceName)
-						}
+//			List(bleManager.peripherals) { peripheral in
+//				let deviceName = DeviceNameManager.init().getName(deviceUUID: peripheral.stringUUID)
+//				HStack {
+//					Button(action: {
+//						//self.bleManager.deviceToConnect = peripheral.peripheralHash
+//						self.bleManager.connect(peripheral: self.bleManager.peripheralDictionary[peripheral.peripheralHash]!)
+//						presentation.wrappedValue.dismiss()
+//					}) {
+//						if deviceName == "" {
+//							Text(peripheral.name)
+//						} else {
+//							Text(deviceName)
+//						}
+//					}
+//					Spacer()
+//					Text("RSSI: " + String(peripheral.rssi))
+//				}
+//			}
+//			Divider()
+//			Text("new list")
+			List(bleManager.newPeripherals, id: \.identifier.uuidString) { i in
+				let deviceName = DeviceNameManager.init().getName(deviceUUID: i.identifier.uuidString)
+				Button {
+					bleManager.connect(peripheral: i)
+					presentation.wrappedValue.dismiss()
+				} label: {
+					if deviceName == "" {
+						Text(i.name ?? "Unnamed")
+					} else {
+						Text(deviceName)
 					}
-					Spacer()
-					Text("RSSI: " + String(peripheral.rssi))
 				}
+//				Spacer()
 			}
-		
+			
 			Spacer()
 		}.onDisappear {
 			if bleManager.isScanning {