Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

chore: remove "VPN" from setting description#86

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged
Show file tree
Hide file tree
Changes fromall commits
Commits
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletionCoder Desktop/Coder Desktop/NetworkExtension.swift
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -50,7 +50,7 @@ extension CoderVPNService {
logger.debug("inserting new tunnel")

let tm = NETunnelProviderManager()
tm.localizedDescription = "CoderVPN"
tm.localizedDescription = "Coder"
tm.protocolConfiguration = proto

logger.debug("saving new tunnel")
Expand Down
8 changes: 4 additions & 4 deletionsCoder Desktop/Coder Desktop/SystemExtension.swift
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,13 +11,13 @@ enum SystemExtensionState: Equatable, Sendable {
var description: String {
switch self {
case .uninstalled:
"VPN SystemExtension is waiting to be activated"
"NE SystemExtension is waiting to be activated"
case .needsUserApproval:
"VPN SystemExtension needs user approval to activate"
"NE SystemExtension needs user approval to activate"
case .installed:
"VPN SystemExtension is installed"
"NE SystemExtension is installed"
case let .failed(error):
"VPN SystemExtension failed with error: \(error)"
"NE SystemExtension failed with error: \(error)"
}
}
}
Expand Down
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@ struct GeneralTab: View {
}
Section {
Toggle(isOn: $state.stopVPNOnQuit) {
Text("StopVPN on Quit")
Text("StopCoder Connect on Quit")
}
}
}.formStyle(.grouped)
Expand Down
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@ struct LiteralHeadersSection<VPN: VPNService>: View {
Toggle(isOn: $state.useLiteralHeaders) {
Text("HTTP Headers")
Text("When enabled, these headers will be included on all outgoing HTTP requests.")
if vpn.state != .disabled { Text("Cannot be modified while CoderVPN is enabled.") }
if vpn.state != .disabled { Text("Cannot be modified while CoderConnect is enabled.") }
}
.controlSize(.large)

Expand Down
2 changes: 1 addition & 1 deletionCoder Desktop/Coder Desktop/Views/VPNMenu.swift
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,7 @@ struct VPNMenu<VPN: VPNService>: View {
}
}
)) {
Text("CoderVPN")
Text("Coder Connect")
.frame(maxWidth: .infinity, alignment: .leading)
.font(.body.bold())
.foregroundColor(.primary)
Expand Down
6 changes: 3 additions & 3 deletionsCoder Desktop/Coder Desktop/Views/VPNState.swift
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,18 +14,18 @@ struct VPNState<VPN: VPNService>: View {
.font(.body)
.foregroundStyle(.secondary)
case (_, false):
Text("Sign in to useCoderVPN")
Text("Sign in to useCoder Desktop")
.font(.body)
.foregroundColor(.secondary)
case (.disabled, _):
Text("EnableCoderVPN to see workspaces")
Text("EnableCoder Connect to see workspaces")
.font(.body)
.foregroundStyle(.secondary)
case (.connecting, _), (.disconnecting, _):
HStack {
Spacer()
ProgressView(
vpn.state == .connecting ? "StartingCoderVPN..." : "StoppingCoderVPN..."
vpn.state == .connecting ? "StartingCoder Connect..." : "StoppingCoder Connect..."
).padding()
Spacer()
}
Expand Down
2 changes: 1 addition & 1 deletionCoder Desktop/Coder DesktopTests/VPNMenuTests.swift
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@ struct VPNMenuTests {
try await sut.inspection.inspect { view in
let toggle = try view.find(ViewType.Toggle.self)
#expect(toggle.isDisabled())
#expect(throws: Never.self) { try view.find(text: "Sign in to useCoderVPN") }
#expect(throws: Never.self) { try view.find(text: "Sign in to useCoder Desktop") }
#expect(throws: Never.self) { try view.find(button: "Sign in") }
}
}
Expand Down
6 changes: 3 additions & 3 deletionsCoder Desktop/Coder DesktopTests/VPNStateTests.swift
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,7 @@ struct VPNStateTests {
try await ViewHosting.host(view) {
try await sut.inspection.inspect { view in
#expect(throws: Never.self) {
try view.find(text: "EnableCoderVPN to see workspaces")
try view.find(text: "EnableCoder Connect to see workspaces")
}
}
}
Expand All@@ -39,7 +39,7 @@ struct VPNStateTests {
try await ViewHosting.host(view) {
try await sut.inspection.inspect { view in
let progressView = try view.find(ViewType.ProgressView.self)
#expect(try progressView.labelView().text().string() == "StartingCoderVPN...")
#expect(try progressView.labelView().text().string() == "StartingCoder Connect...")
}
}
}
Expand All@@ -51,7 +51,7 @@ struct VPNStateTests {
try await ViewHosting.host(view) {
try await sut.inspection.inspect { view in
let progressView = try view.find(ViewType.ProgressView.self)
#expect(try progressView.labelView().text().string() == "StoppingCoderVPN...")
#expect(try progressView.labelView().text().string() == "StoppingCoder Connect...")
}
}
}
Expand Down
2 changes: 1 addition & 1 deletionpkgbuild/scripts/postinstall
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@ if [ -f "$VPN_MARKER_FILE" ]; then
echo "Restarting CoderVPN..."
echo "Sleeping for 3..."
sleep 3
scutil --nc start "CoderVPN"
scutil --nc start "Coder"
rm "$VPN_MARKER_FILE"
echo "CoderVPN started."
fi
Expand Down
10 changes: 5 additions & 5 deletionspkgbuild/scripts/preinstall
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,19 +10,19 @@ if pgrep 'Coder Desktop'; then
fi

echo "Turning off VPN"
if scutil --nc list | grep -q "CoderVPN"; then
if scutil --nc list | grep -q "Coder"; then
echo "CoderVPN found. Stopping..."
if scutil --nc status "CoderVPN" | grep -q "^Connected$"; then
if scutil --nc status "Coder" | grep -q "^Connected$"; then
touch $VPN_MARKER_FILE
fi
scutil --nc stop "CoderVPN"
scutil --nc stop "Coder"

# Wait for VPN to be disconnected
while scutil --nc status "CoderVPN" | grep -q "^Connected$"; do
while scutil --nc status "Coder" | grep -q "^Connected$"; do
echo "Waiting for VPN to disconnect..."
sleep 1
done
while scutil --nc status "CoderVPN" | grep -q "^Disconnecting$"; do
while scutil --nc status "Coder" | grep -q "^Disconnecting$"; do
echo "Waiting for VPN to complete disconnect..."
sleep 1
done
Expand Down
Loading
[8]ページ先頭
©2009-2025 Movatter.jp