remove two stages

Author: ethanndickson

Coder-Desktop/Coder-Desktop/VPN/VPNProgress.swift

@@ -42,7 +42,7 @@ struct VPNProgressView: View {
         }
         switch progress.stage {
         case .initial:
-            return 0.05
+            return 0
         case .downloading:
             guard let downloadProgress = progress.downloadProgress else {
                 // We can't make this illegal state unrepresentable because XPC
@@ -52,15 +52,11 @@ struct VPNProgressView: View {
             // 40MB if the server doesn't give us the expected size
             let totalBytes = downloadProgress.totalBytesToWrite ?? 40_000_000
             let downloadPercent = min(1.0, Float(downloadProgress.totalBytesWritten) / Float(totalBytes))
-            return 0.05 + 0.4 * downloadPercent
+            return 0.4 * downloadPercent
         case .validating:
-            return 0.42
+            return 0.43
         case .removingQuarantine:
-            return 0.44
-        case .opening:
             return 0.46
-        case .settingUpTunnel:
-            return 0.48
         case .startingTunnel:
             return 0.50
         }

Coder-Desktop/VPN/Manager.swift

@@ -67,13 +67,11 @@ actor Manager {
         // so it's safe to execute. However, the SE must be sandboxed, so we defer to the app.
         try await removeQuarantine(dest)
 
-        pushProgress(stage: .opening)
         do {
             try tunnelHandle = TunnelHandle(dylibPath: dest)
         } catch {
             throw .tunnelSetup(error)
         }
-        pushProgress(stage: .settingUpTunnel)
         speaker = await Speaker<Vpn_ManagerMessage, Vpn_TunnelMessage>(
             writeFD: tunnelHandle.writeHandle,
             readFD: tunnelHandle.readHandle

Coder-Desktop/VPNLib/XPC.swift

@@ -19,8 +19,6 @@ import Foundation
     case downloading
     case validating
     case removingQuarantine
-    case opening
-    case settingUpTunnel
     case startingTunnel
 
     public var description: String? {
@@ -33,10 +31,6 @@ import Foundation
             "Validating library..."
         case .removingQuarantine:
             "Removing quarantine..."
-        case .opening:
-            "Opening library..."
-        case .settingUpTunnel:
-            "Setting up tunnel..."
         case .startingTunnel:
             nil
         }