Skip to content

Linux + iPhone Continuity / iMessage / SMS

fix iphone auto-reconnect

Zack Bartel20c2bc84290b
diff --git a/apple/Tether/Services/CertificateManager.swift b/apple/Tether/Services/CertificateManager.swift
index 348302a..f6c4ac0 100644
--- a/apple/Tether/Services/CertificateManager.swift
+++ b/apple/Tether/Services/CertificateManager.swift
@@ -19,6 +19,7 @@ final class CertificateManager {
private static let certLabel = "net.jeedup.Tether.cert"
private static let knownHostsKey = "TetherKnownHosts"
private static let localDeviceNameKey = "TetherLocalDeviceName"
+ private static let lastConnectedFingerprintKey = "TetherLastConnectedFingerprint"
// SHA-256 fingerprint of our own certificate (lowercase hex, no separators).
private(set) var myFingerprint: String = ""
@@ -26,6 +27,13 @@ final class CertificateManager {
// Map of known host fingerprints → device name.
private(set) var knownHosts: [String: String] = [:]
+ // The fingerprint of the host we most recently connected to.
+ var lastConnectedFingerprint: String? {
+ didSet {
+ UserDefaults.standard.set(lastConnectedFingerprint, forKey: Self.lastConnectedFingerprintKey)
+ }
+ }
+
// Name of this device as presented to others.
var localDeviceName: String = "" {
didSet {
@@ -42,6 +50,7 @@ final class CertificateManager {
func initialize() {
loadKnownHosts()
loadLocalDeviceName()
+ lastConnectedFingerprint = UserDefaults.standard.string(forKey: Self.lastConnectedFingerprintKey)
if let existing = loadIdentityFromKeychain() {
identity = existing
diff --git a/apple/Tether/ViewModels/TetherViewModel.swift b/apple/Tether/ViewModels/TetherViewModel.swift
index 38c9137..87ec01c 100644
--- a/apple/Tether/ViewModels/TetherViewModel.swift
+++ b/apple/Tether/ViewModels/TetherViewModel.swift
@@ -217,6 +217,7 @@ final class TetherViewModel {
pendingReconnectTask?.cancel()
pendingReconnectTask = nil
autoConnectingFingerprint = nil
+ certificateManager.lastConnectedFingerprint = nil // Also clear last connection
connection.disconnect()
appState = .disconnected
connectedDeviceName = nil
@@ -372,6 +373,7 @@ final class TetherViewModel {
self.pendingReconnectTask?.cancel()
self.pendingReconnectTask = nil
self.autoConnectingFingerprint = nil
+ self.certificateManager.lastConnectedFingerprint = self.connection.serverFingerprint
self.handleConnected() // TODO: isInbound
case .disconnected:
self.autoConnectingFingerprint = nil
@@ -474,24 +476,22 @@ final class TetherViewModel {
private func attemptAutoReconnect() {
guard shouldAutoReconnect else { return }
- guard certificateManager.knownHosts.count == 1,
- let fingerprint = certificateManager.knownHosts.keys.first else { return }
-
- let matchingHosts = discovery.hosts.filter { $0.fingerprint == fingerprint }
- let targetHost: DiscoveredHost?
-
- if matchingHosts.count == 1 {
- targetHost = matchingHosts[0]
- } else if discovery.hosts.count == 1 {
- let soleHost = discovery.hosts[0]
- targetHost = soleHost.fingerprint.isEmpty || soleHost.fingerprint == fingerprint ? soleHost : nil
+
+ // If we have a last connected fingerprint, prioritize it.
+ let targetFingerprint = certificateManager.lastConnectedFingerprint
+
+ let matchingHosts: [DiscoveredHost]
+ if let targetFingerprint {
+ matchingHosts = discovery.hosts.filter { $0.fingerprint == targetFingerprint }
} else {
- targetHost = nil
+ // Fallback to any host if we don't have a record,
+ // but ONLY if there's exactly one host found.
+ matchingHosts = discovery.hosts.count == 1 ? discovery.hosts : []
}
+
+ guard let targetHost = matchingHosts.first else { return }
- guard let targetHost else { return }
-
- autoConnectingFingerprint = fingerprint
+ autoConnectingFingerprint = targetHost.fingerprint
connectTo(host: targetHost)
}