NetP: Reenable loading toggle after 2 sec delay (#2307)

duckduckgo · Jan 9, 2024 · ecde50f · ecde50f
1 parent 89ed900
commit ecde50f
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 3 deletions.
diff --git a/DuckDuckGo/NetworkProtectionStatusView.swift b/DuckDuckGo/NetworkProtectionStatusView.swift
@@ -24,7 +24,7 @@ import NetworkProtection
 
 @available(iOS 15, *)
 struct NetworkProtectionStatusView: View {
-    @ObservedObject public var statusModel: NetworkProtectionStatusViewModel
+    @StateObject public var statusModel: NetworkProtectionStatusViewModel
 
     var body: some View {
         List {

diff --git a/DuckDuckGo/NetworkProtectionStatusViewModel.swift b/DuckDuckGo/NetworkProtectionStatusViewModel.swift
@@ -37,6 +37,7 @@ final class NetworkProtectionStatusViewModel: ObservableObject {
     private let serverInfoObserver: ConnectionServerInfoObserver
     private let errorObserver: ConnectionErrorObserver
     private var cancellables: Set<AnyCancellable> = []
+    private var delayedToggleReenableCancellable: Cancellable?
 
     // MARK: Error
 
@@ -146,11 +147,24 @@ final class NetworkProtectionStatusViewModel: ObservableObject {
     }
 
     private func setUpDisableTogglePublisher() {
-        statusObserver.publisher
-            .map { $0.isLoading }
+        let isLoadingPublisher = statusObserver.publisher.map { $0.isLoading }
+
+        isLoadingPublisher
             .receive(on: DispatchQueue.main)
             .assign(to: \.shouldDisableToggle, onWeaklyHeld: self)
             .store(in: &cancellables)
+
+        // Set up a delayed publisher to fire just once that reenables the toggle
+        // Each event cancels the previous delayed publisher
+        isLoadingPublisher
+            .filter { $0 }
+            .map {
+                Just(!$0)
+                    .delay(for: 2.0, scheduler: DispatchQueue.main)
+                    .assign(to: \.shouldDisableToggle, onWeaklyHeld: self)
+            }
+            .assign(to: \.delayedToggleReenableCancellable, onWeaklyHeld: self)
+            .store(in: &cancellables)
     }
 
     private func setUpServerInfoPublishers() {
@@ -177,6 +191,8 @@ final class NetworkProtectionStatusViewModel: ObservableObject {
 
     @MainActor
     func didToggleNetP(to enabled: Bool) async {
+        shouldDisableToggle = true
+
         // This is to prevent weird looking animations on navigating to the screen.
         // It makes sense as animations should mostly only happen when a user has interacted.
         animationsOn = true