Skip to content
Merged
Changes from all commits
Commits
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
10 changes: 4 additions & 6 deletions clients/shared/Network/GatewayConnectionManager.swift
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ public final class GatewayConnectionManager: ObservableObject {

func setUpdateInProgress(_ value: Bool) {
let wasInProgress = isUpdateInProgress
isUpdateInProgress = value
if value != wasInProgress { isUpdateInProgress = value }
if value && !wasInProgress {
outcomeEmittedForCurrentCycle = false
if healthCheckTask != nil {
Expand Down Expand Up @@ -312,8 +312,6 @@ public final class GatewayConnectionManager: ObservableObject {
}
#endif
handleDaemonVersionChanged(newVersion)
} else if let newVersion = decoded.version {
assistantVersion = newVersion
}
}

Expand Down Expand Up @@ -427,7 +425,7 @@ public final class GatewayConnectionManager: ObservableObject {
private func handleServerMessage(_ message: ServerMessage) {
if case .assistantStatus(let status) = message {
if let version = status.version {
assistantVersion = version
if version != assistantVersion { assistantVersion = version }
checkVersionCompatibility(assistantVersion: version)
if self.isUpdateInProgress && !self.outcomeEmittedForCurrentCycle {
if let target = self.updateTargetVersion, self.versionsMatch(version, target) {
Expand All @@ -448,7 +446,7 @@ public final class GatewayConnectionManager: ObservableObject {
}
if let newFingerprint = status.keyFingerprint {
let oldFingerprint = keyFingerprint
keyFingerprint = newFingerprint
if newFingerprint != oldFingerprint { keyFingerprint = newFingerprint }

if let oldFingerprint, oldFingerprint != newFingerprint {
log.info("Assistant key fingerprint changed (\(oldFingerprint, privacy: .public) → \(newFingerprint, privacy: .public)) — invalidating credentials")
Expand Down Expand Up @@ -733,7 +731,7 @@ public final class GatewayConnectionManager: ObservableObject {
private func setConnected(_ connected: Bool) {
guard isConnected != connected else { return }
isConnected = connected
isConnecting = false
if isConnecting { isConnecting = false }
if connected {
NotificationCenter.default.post(name: .daemonDidReconnect, object: self)
#if os(macOS)
Expand Down