@@ -764,14 +764,10 @@ struct OnboardingWizardView: View {
764764} else if trimmedBootstrapToken?.isEmpty == false {
765765self.gatewayPassword = ""
766766}
767-if trimmedBootstrapToken?.isEmpty == false || !trimmedToken.isEmpty || !trimmedPassword.isEmpty {
768-self.pendingManualAuthOverride = GatewayConnectionController.ManualAuthOverride.normalized(
769- token: trimmedToken,
770- bootstrapToken: trimmedBootstrapToken,
771- password: trimmedPassword)
772-} else {
773-self.pendingManualAuthOverride = nil
774-}
767+self.pendingManualAuthOverride = GatewayConnectionController.ManualAuthOverride.normalized(
768+ token: trimmedToken,
769+ bootstrapToken: trimmedBootstrapToken,
770+ password: trimmedPassword)
775771self.saveGatewayCredentials(token: self.gatewayToken, password: self.gatewayPassword)
776772self.showQRScanner = false
777773self.connectMessage = "Connecting via QR code…"
@@ -1017,14 +1013,9 @@ struct OnboardingWizardView: View {
10171013self.connectMessage = "Connecting to \(host)…"
10181014self.statusLine = "Connecting to \(host):\(self.manualPort)…"
10191015defer { self.connectingGatewayID = nil }
1020-let authOverride = self.pendingManualAuthOverride.map { pending in
1021-GatewayConnectionController.ManualAuthOverride.explicit(
1022- token: self.gatewayToken,
1023- bootstrapToken: pending.bootstrapToken,
1024- password: self.gatewayPassword)
1025-} ?? GatewayConnectionController.ManualAuthOverride.normalized(
1016+let authOverride = GatewayConnectionController.ManualAuthOverride.currentManualInput(
10261017 token: self.gatewayToken,
1027-bootstrapToken: nil,
1018+pendingOverride: self.pendingManualAuthOverride,
10281019 password: self.gatewayPassword)
10291020self.pendingManualAuthOverride = nil
10301021await self.gatewayController.connectManual(
此内容由惯性聚合(RSS阅读器)自动聚合整理，仅供阅读参考。 原文来自 — 版权归原作者所有。