Skip to content

fix: adopt already-connected peripheral instead of stranding at "(Pairing…)" #39

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MegaManSec merged 1 commit into from
Jun 3, 2026
Merged

fix: adopt already-connected peripheral instead of stranding at "(Pairing…)" #39

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions Magic Switch/Model/Store/BluetoothPeripheralStore.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -582,6 +582,18 @@ final class BluetoothPeripheralStore: NSObject, ObservableObject, BluetoothPerip
return
}

// Already connected — e.g. macOS reconnected this bonded peripheral on
// its own while the auto-reconnect watcher's HOLDS_ONE probe was in
// flight, so by the time we got here there's nothing left to pair.
// Starting an `IOBluetoothDevicePair` on an already-connected device
// never fires `devicePairingFinished`, stranding the UI at `.connecting`
// ("(Pairing…)"). Adopt the live connection instead.
if btDevice.isConnected() {
self.setConnectionState(.connected, for: peripheral.id)
self.registerForDisconnect(device: btDevice, address: peripheral.id)
return
}

if btDevice.rssi() == Constants.invalidRSSI {
print("\(peripheral.name) is out of range or not responding")
self.setConnectionState(.disconnected, for: peripheral.id)
Expand Down