From 82f835e638d9d81ed0f76aadba338a09f029ab45 Mon Sep 17 00:00:00 2001
From: Pete Schwamb <pschwamb@gmail.com>
Date: Sat, 31 Oct 2026 14:54:30 -0500
Subject: [PATCH] Remove the reconnect refusal window

A connect failure within 2 s of lodging the delayed reconnect backed
off for 30 s and rescanned instead of reconnecting. Drop that branch;
every failure now lodges the start-delay reconnect again. The
start-delay reconnect itself is unchanged.
---
 .../G7CGMManager/G7BluetoothManager.swift     | 21 ++-----------------
 1 file changed, 2 insertions(+), 19 deletions(-)

diff --git a/G7SensorKit/G7CGMManager/G7BluetoothManager.swift b/G7SensorKit/G7CGMManager/G7BluetoothManager.swift
index 8cab31a..168d72f 100644
--- a/G7SensorKit/G7CGMManager/G7BluetoothManager.swift
+++ b/G7SensorKit/G7CGMManager/G7BluetoothManager.swift
@@ -242,13 +242,6 @@ class G7BluetoothManager: NSObject {
     /// Whole seconds: CoreBluetooth rejects a fractional start delay as an invalid parameter.
     static let reconnectStartDelay = 30
 
-    /// A failure this soon after lodging is CoreBluetooth refusing the request itself; wait before asking again.
-    static let reconnectRefusalWindow: TimeInterval = 2
-    static let reconnectRefusalBackoff: TimeInterval = 30
-
-    /// When the last delayed reconnect was lodged. Confined to `managerQueue`.
-    private var reconnectLodgedAt: Date?
-
     /// There is exactly one of these per session, and a pairing run borrows
     /// it rather than building a second: only one central per app may claim
     /// the restore identifier, and sharing the central is what lets the
@@ -520,7 +513,6 @@ class G7BluetoothManager: NSObject {
     private func reconnectAfterAdvertisingTail(_ peripheral: CBPeripheral) {
         dispatchPrecondition(condition: .onQueue(managerQueue))
         reconnectLog("Reconnecting with a \(G7BluetoothManager.reconnectStartDelay) s start delay")
-        reconnectLodgedAt = Date()
         handleDiscoveredPeripheral(peripheral, connectOptions: [CBConnectPeripheralOptionStartDelayKey: NSNumber(value: G7BluetoothManager.reconnectStartDelay)])
     }
 
@@ -531,7 +523,7 @@ class G7BluetoothManager: NSObject {
     }
 
     /// Stock path only (no arm): an active peripheral reconnects on its own; anything else rescans.
-    private func resumeAfterLinkEnded(_ peripheral: CBPeripheral, refusedAt failure: Date? = nil) {
+    private func resumeAfterLinkEnded(_ peripheral: CBPeripheral) {
         dispatchPrecondition(condition: .onQueue(managerQueue))
         guard peripheral == activePeripheral, centralManager.state == .poweredOn else {
             managerQueue.asyncAfter(deadline: .now() + 2) { [weak self] in
@@ -539,15 +531,6 @@ class G7BluetoothManager: NSObject {
             }
             return
         }
-        // Re-lodging a refused request at once would spin; back off and go through the stock scan instead.
-        if let failure, let lodgedAt = reconnectLodgedAt, failure.timeIntervalSince(lodgedAt) < G7BluetoothManager.reconnectRefusalWindow {
-            reconnectLodgedAt = nil
-            reconnectLog("Reconnect refused; retrying in \(Int(G7BluetoothManager.reconnectRefusalBackoff)) s")
-            managerQueue.asyncAfter(deadline: .now() + G7BluetoothManager.reconnectRefusalBackoff) { [weak self] in
-                self?.managerQueue_scanForPeripheral()
-            }
-            return
-        }
         reconnectAfterAdvertisingTail(peripheral)
     }
 
@@ -755,7 +738,7 @@ extension G7BluetoothManager: CBCentralManagerDelegate {
             managedPeripherals.removeValue(forKey: peripheral.identifier)
         }
 
-        resumeAfterLinkEnded(peripheral, refusedAt: Date())
+        resumeAfterLinkEnded(peripheral)
     }
 }