File tree Expand file tree Collapse file tree 3 files changed +3
-15
lines changed Expand file tree Collapse file tree 3 files changed +3
-15
lines changed Original file line number Diff line number Diff line change @@ -42,7 +42,7 @@ struct VPNProgressView: View {
42
42
}
43
43
switch progress. stage {
44
44
case . initial:
45
- return 0.05
45
+ return 0
46
46
case . downloading:
47
47
guard let downloadProgress = progress. downloadProgress else {
48
48
// We can't make this illegal state unrepresentable because XPC
@@ -52,15 +52,11 @@ struct VPNProgressView: View {
52
52
// 40MB if the server doesn't give us the expected size
53
53
let totalBytes = downloadProgress. totalBytesToWrite ?? 40_000_000
54
54
let downloadPercent = min ( 1.0 , Float ( downloadProgress. totalBytesWritten) / Float( totalBytes) )
55
- return 0.05 + 0. 4 * downloadPercent
55
+ return 0.4 * downloadPercent
56
56
case . validating:
57
- return 0.42
57
+ return 0.43
58
58
case . removingQuarantine:
59
- return 0.44
60
- case . opening:
61
59
return 0.46
62
- case . settingUpTunnel:
63
- return 0.48
64
60
case . startingTunnel:
65
61
return 0.50
66
62
}
Original file line number Diff line number Diff line change @@ -67,13 +67,11 @@ actor Manager {
67
67
// so it's safe to execute. However, the SE must be sandboxed, so we defer to the app.
68
68
try await removeQuarantine ( dest)
69
69
70
- pushProgress ( stage: . opening)
71
70
do {
72
71
try tunnelHandle = TunnelHandle ( dylibPath: dest)
73
72
} catch {
74
73
throw . tunnelSetup( error)
75
74
}
76
- pushProgress ( stage: . settingUpTunnel)
77
75
speaker = await Speaker < Vpn_ManagerMessage , Vpn_TunnelMessage > (
78
76
writeFD: tunnelHandle. writeHandle,
79
77
readFD: tunnelHandle. readHandle
Original file line number Diff line number Diff line change @@ -19,8 +19,6 @@ import Foundation
19
19
case downloading
20
20
case validating
21
21
case removingQuarantine
22
- case opening
23
- case settingUpTunnel
24
22
case startingTunnel
25
23
26
24
public var description : String ? {
@@ -33,10 +31,6 @@ import Foundation
33
31
" Validating library... "
34
32
case . removingQuarantine:
35
33
" Removing quarantine... "
36
- case . opening:
37
- " Opening library... "
38
- case . settingUpTunnel:
39
- " Setting up tunnel... "
40
34
case . startingTunnel:
41
35
nil
42
36
}
You can’t perform that action at this time.
0 commit comments