Improve unauthenticated flow and avoid scene activation when not needed

Author: bgoncal

Sources/App/Scenes/SceneManager.swift

@@ -120,11 +120,15 @@ final class SceneManager {
     ) -> Guarantee<DelegateType> {
         if let active = existingScenes(for: query.activity).first,
            let delegate = active.delegate as? DelegateType {
+            Current.Log.verbose("Ready to activate scene \(active.session.persistentIdentifier)")
+
             let options = UIScene.ActivationRequestOptions()
             options.requestingScene = active
 
             // Only activate scene if not activated already
-            guard UIApplication.shared.connectedScenes.contains(where: { $0 != active }) else {
+            guard active.activationState != .foregroundActive else {
+                Current.Log
+                    .verbose("Did not activate scene \(active.session.persistentIdentifier), it was already active")
                 return .value(delegate)
             }
 
@@ -155,6 +159,8 @@ final class SceneManager {
         pendingResolvers[token] = PendingResolver(resolver: resolver)
 
         if supportsMultipleScenes {
+            Current.Log.verbose("Ready to request new scene activation for \(query.activity)")
+
             let activity = query.activity.activity
             activity.userInfo = [
                 Self.activityUserInfoKeyResolver: token,

Sources/App/WebView/WebViewController.swift

@@ -964,6 +964,8 @@ final class WebViewController: UIViewController, WKNavigationDelegate, WKUIDeleg
         view.titleLabel?.numberOfLines = 0
         view.bodyLabel?.numberOfLines = 0
 
+        // Avoid retrying from Home Assistant UI since this is a dead end
+        webView.load(URLRequest(url: URL(string: "about:blank")!))
         SwiftMessages.show(config: config, view: view)
     }
 }

Sources/Shared/API/Authentication/TokenManager.swift

@@ -163,6 +163,7 @@ public class TokenManager {
                         )
                         Current.clientEventStore.addEvent(event)
                         Current.modelManager.unsubscribe()
+                        Current.api(for: server)?.connection.disconnect()
                         Current.onboardingObservation.needed(.unauthenticated(
                             server.identifier.rawValue,
                             underlying.asAFError?.responseCode ?? -1