Skip to content

Commit 17da969

Browse files
committed
chore: remove "VPN" from setting description
Change-Id: If1e0c81dd7188eea92f814424a997944a07caf86 Signed-off-by: Thomas Kosiewski <[email protected]>
1 parent e18f466 commit 17da969

File tree

9 files changed

+20
-20
lines changed

9 files changed

+20
-20
lines changed

Coder Desktop/Coder Desktop/NetworkExtension.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ extension CoderVPNService {
5050
logger.debug("inserting new tunnel")
5151

5252
let tm = NETunnelProviderManager()
53-
tm.localizedDescription = "CoderVPN"
53+
tm.localizedDescription = "Coder"
5454
tm.protocolConfiguration = proto
5555

5656
logger.debug("saving new tunnel")

Coder Desktop/Coder Desktop/SystemExtension.swift

+4-4
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ enum SystemExtensionState: Equatable, Sendable {
1111
var description: String {
1212
switch self {
1313
case .uninstalled:
14-
"VPN SystemExtension is waiting to be activated"
14+
"NE SystemExtension is waiting to be activated"
1515
case .needsUserApproval:
16-
"VPN SystemExtension needs user approval to activate"
16+
"NE SystemExtension needs user approval to activate"
1717
case .installed:
18-
"VPN SystemExtension is installed"
18+
"NE SystemExtension is installed"
1919
case let .failed(error):
20-
"VPN SystemExtension failed with error: \(error)"
20+
"NE SystemExtension failed with error: \(error)"
2121
}
2222
}
2323
}

Coder Desktop/Coder Desktop/Views/Settings/GeneralTab.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ struct GeneralTab: View {
1010
}
1111
Section {
1212
Toggle(isOn: $state.stopVPNOnQuit) {
13-
Text("Stop VPN on Quit")
13+
Text("Stop Coder Connect on Quit")
1414
}
1515
}
1616
}.formStyle(.grouped)

Coder Desktop/Coder Desktop/Views/VPNMenu.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ struct VPNMenu<VPN: VPNService>: View {
2020
}
2121
}
2222
)) {
23-
Text("CoderVPN")
23+
Text("Coder Connect")
2424
.frame(maxWidth: .infinity, alignment: .leading)
2525
.font(.body.bold())
2626
.foregroundColor(.primary)

Coder Desktop/Coder Desktop/Views/VPNState.swift

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,18 @@ struct VPNState<VPN: VPNService>: View {
1414
.font(.body)
1515
.foregroundStyle(.secondary)
1616
case (_, false):
17-
Text("Sign in to use CoderVPN")
17+
Text("Sign in to use Coder Desktop")
1818
.font(.body)
1919
.foregroundColor(.secondary)
2020
case (.disabled, _):
21-
Text("Enable CoderVPN to see workspaces")
21+
Text("Enable Coder Connect to see workspaces")
2222
.font(.body)
2323
.foregroundStyle(.secondary)
2424
case (.connecting, _), (.disconnecting, _):
2525
HStack {
2626
Spacer()
2727
ProgressView(
28-
vpn.state == .connecting ? "Starting CoderVPN..." : "Stopping CoderVPN..."
28+
vpn.state == .connecting ? "Starting Coder Connect..." : "Stopping Coder Connect..."
2929
).padding()
3030
Spacer()
3131
}

Coder Desktop/Coder DesktopTests/VPNMenuTests.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ struct VPNMenuTests {
2424
try await sut.inspection.inspect { view in
2525
let toggle = try view.find(ViewType.Toggle.self)
2626
#expect(toggle.isDisabled())
27-
#expect(throws: Never.self) { try view.find(text: "Sign in to use CoderVPN") }
27+
#expect(throws: Never.self) { try view.find(text: "Sign in to use Coder Desktop") }
2828
#expect(throws: Never.self) { try view.find(button: "Sign in") }
2929
}
3030
}

Coder Desktop/Coder DesktopTests/VPNStateTests.swift

+3-3
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ struct VPNStateTests {
2626
try await ViewHosting.host(view) {
2727
try await sut.inspection.inspect { view in
2828
#expect(throws: Never.self) {
29-
try view.find(text: "Enable CoderVPN to see workspaces")
29+
try view.find(text: "Enable Coder Connect to see workspaces")
3030
}
3131
}
3232
}
@@ -39,7 +39,7 @@ struct VPNStateTests {
3939
try await ViewHosting.host(view) {
4040
try await sut.inspection.inspect { view in
4141
let progressView = try view.find(ViewType.ProgressView.self)
42-
#expect(try progressView.labelView().text().string() == "Starting CoderVPN...")
42+
#expect(try progressView.labelView().text().string() == "Starting Coder Connect...")
4343
}
4444
}
4545
}
@@ -51,7 +51,7 @@ struct VPNStateTests {
5151
try await ViewHosting.host(view) {
5252
try await sut.inspection.inspect { view in
5353
let progressView = try view.find(ViewType.ProgressView.self)
54-
#expect(try progressView.labelView().text().string() == "Stopping CoderVPN...")
54+
#expect(try progressView.labelView().text().string() == "Stopping Coder Connect...")
5555
}
5656
}
5757
}

pkgbuild/scripts/postinstall

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ if [ -f "$VPN_MARKER_FILE" ]; then
1616
echo "Restarting CoderVPN..."
1717
echo "Sleeping for 3..."
1818
sleep 3
19-
scutil --nc start "CoderVPN"
19+
scutil --nc start "Coder"
2020
rm "$VPN_MARKER_FILE"
2121
echo "CoderVPN started."
2222
fi

pkgbuild/scripts/preinstall

+5-5
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,19 @@ if pgrep 'Coder Desktop'; then
1010
fi
1111

1212
echo "Turning off VPN"
13-
if scutil --nc list | grep -q "CoderVPN"; then
13+
if scutil --nc list | grep -q "Coder"; then
1414
echo "CoderVPN found. Stopping..."
15-
if scutil --nc status "CoderVPN" | grep -q "^Connected$"; then
15+
if scutil --nc status "Coder" | grep -q "^Connected$"; then
1616
touch $VPN_MARKER_FILE
1717
fi
18-
scutil --nc stop "CoderVPN"
18+
scutil --nc stop "Coder"
1919

2020
# Wait for VPN to be disconnected
21-
while scutil --nc status "CoderVPN" | grep -q "^Connected$"; do
21+
while scutil --nc status "Coder" | grep -q "^Connected$"; do
2222
echo "Waiting for VPN to disconnect..."
2323
sleep 1
2424
done
25-
while scutil --nc status "CoderVPN" | grep -q "^Disconnecting$"; do
25+
while scutil --nc status "Coder" | grep -q "^Disconnecting$"; do
2626
echo "Waiting for VPN to complete disconnect..."
2727
sleep 1
2828
done

0 commit comments

Comments
 (0)