summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--android/src/main/kotlin/net/mullvad/mullvadvpn/WireguardKeyFragment.kt20
-rw-r--r--android/src/main/res/layout/wireguard_key.xml58
-rw-r--r--android/src/main/res/values/strings.xml4
-rw-r--r--gui/src/renderer/components/AdvancedSettings.tsx2
-rw-r--r--gui/src/renderer/components/WireguardKeys.tsx2
-rw-r--r--mullvad-cli/src/cmds/tunnel.rs2
6 files changed, 44 insertions, 44 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/WireguardKeyFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/WireguardKeyFragment.kt
index 47e79fb74c..1b5e1a3cfe 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/WireguardKeyFragment.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/WireguardKeyFragment.kt
@@ -65,11 +65,17 @@ class WireguardKeyFragment : Fragment() {
statusMessage = view.findViewById<TextView>(R.id.wireguard_key_status)
- visitWebsiteView = view.findViewById<View>(R.id.wireguard_key_visit_website)
+ visitWebsiteView = view.findViewById<View>(R.id.wireguard_manage_keys)
publicKey = view.findViewById<TextView>(R.id.wireguard_public_key)
actionButton = view.findViewById<Button>(R.id.wg_key_button)
actionSpinner = view.findViewById<ProgressBar>(R.id.wg_action_spinner)
+ visitWebsiteView.visibility = View.VISIBLE
+ visitWebsiteView.setOnClickListener {
+ val intent = Intent(Intent.ACTION_VIEW, Uri.parse(parentActivity.getString(R.string.account_url)))
+ startActivity(intent)
+ }
+
updateViews()
return view
@@ -82,7 +88,6 @@ class WireguardKeyFragment : Fragment() {
private fun updateViews() {
clearErrorMessage()
- visitWebsiteView.visibility = View.GONE
actionButton.setClickable(true)
@@ -92,11 +97,6 @@ class WireguardKeyFragment : Fragment() {
setGenerateButton()
}
is KeygenEvent.TooManyKeys -> {
- visitWebsiteView.visibility = View.VISIBLE
- visitWebsiteView.setOnClickListener {
- val intent = Intent(Intent.ACTION_VIEW, Uri.parse(parentActivity.getString(R.string.account_url)))
- startActivity(intent)
- }
setStatusMessage(R.string.too_many_keys, R.color.red)
setGenerateButton()
@@ -110,7 +110,7 @@ class WireguardKeyFragment : Fragment() {
publicKey.visibility = View.VISIBLE
publicKey.setText(publicKeyString)
- setValidateButton()
+ setVerifyButton()
if (keyState.verified != null) {
if (keyState.verified) {
@@ -148,14 +148,14 @@ class WireguardKeyFragment : Fragment() {
}
}
- private fun setValidateButton() {
+ private fun setVerifyButton() {
if (validatingKey) {
showActionSpinner()
return
}
actionSpinner.visibility = View.GONE
actionButton.visibility = View.VISIBLE
- actionButton.setText(R.string.wireguard_validate_key)
+ actionButton.setText(R.string.wireguard_verify_key)
actionButton.setOnClickListener {
onValidateKeyPress()
}
diff --git a/android/src/main/res/layout/wireguard_key.xml b/android/src/main/res/layout/wireguard_key.xml
index e50282a1d4..90d41fbebd 100644
--- a/android/src/main/res/layout/wireguard_key.xml
+++ b/android/src/main/res/layout/wireguard_key.xml
@@ -87,34 +87,6 @@
</LinearLayout>
<LinearLayout
- android:id="@+id/wireguard_key_visit_website"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginTop="24dp"
- android:background="@drawable/cell_button_background"
- android:clickable="true"
- android:gravity="center"
- android:paddingHorizontal="16dp"
- android:visibility="gone">
-
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:paddingHorizontal="8dp"
- android:paddingVertical="17dp"
- android:text="@string/wireguard_key_visit_website"
- android:textColor="@color/white"
- android:textSize="20sp"
- android:textStyle="bold" />
-
- <ImageView
- android:layout_width="16dp"
- android:layout_height="16dp"
- android:alpha="0.6"
- android:src="@drawable/icon_extlink" />
- </LinearLayout>
-
- <LinearLayout
android:id="@+id/wireguard_button_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -136,7 +108,7 @@
style="@style/Button"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
- android:text="@string/wireguard_validate_key"/>
+ android:text="@string/wireguard_verify_key"/>
<ProgressBar
android:id="@+id/wg_action_spinner"
@@ -150,4 +122,32 @@
</RelativeLayout>
</LinearLayout>
+ <LinearLayout
+ android:id="@+id/wireguard_manage_keys"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="24dp"
+ android:background="@drawable/cell_button_background"
+ android:clickable="true"
+ android:gravity="center"
+ android:paddingHorizontal="16dp"
+ android:visibility="gone">
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:paddingHorizontal="8dp"
+ android:paddingVertical="17dp"
+ android:text="@string/wireguard_manage_keys"
+ android:textColor="@color/white"
+ android:textSize="20sp"
+ android:textStyle="bold" />
+
+ <ImageView
+ android:layout_width="16dp"
+ android:layout_height="16dp"
+ android:alpha="0.6"
+ android:src="@drawable/icon_extlink" />
+ </LinearLayout>
+
</LinearLayout>
diff --git a/android/src/main/res/values/strings.xml b/android/src/main/res/values/strings.xml
index 986e0fc623..a01506510e 100644
--- a/android/src/main/res/values/strings.xml
+++ b/android/src/main/res/values/strings.xml
@@ -106,9 +106,9 @@
</string>
<string name="wireguard_key">WireGuard key</string>
<string name="wireguard_public_key">Public key</string>
- <string name="wireguard_validate_key">Validate key</string>
+ <string name="wireguard_verify_key">Verify key</string>
<string name="wireguard_generate_key">Generate key</string>
- <string name="wireguard_key_visit_website">Manage your keys on website</string>
+ <string name="wireguard_manage_keys">Manage keys</string>
<string name="wireguard_key_connectivity">
Connectivity required to manage your key.
</string>
diff --git a/gui/src/renderer/components/AdvancedSettings.tsx b/gui/src/renderer/components/AdvancedSettings.tsx
index 2745fbf1a2..94776fab41 100644
--- a/gui/src/renderer/components/AdvancedSettings.tsx
+++ b/gui/src/renderer/components/AdvancedSettings.tsx
@@ -342,7 +342,7 @@ export default class AdvancedSettings extends Component<IProps, IState> {
return (
<View style={styles.advanced_settings__wgkeys_cell}>
<Cell.CellButton onPress={this.props.onViewWireguardKeys}>
- <Cell.Label>{messages.pgettext('advanced-settings-view', 'WireGuard keys')}</Cell.Label>
+ <Cell.Label>{messages.pgettext('advanced-settings-view', 'WireGuard key')}</Cell.Label>
<Cell.Icon height={12} width={7} source="icon-chevron" />
</Cell.CellButton>
</View>
diff --git a/gui/src/renderer/components/WireguardKeys.tsx b/gui/src/renderer/components/WireguardKeys.tsx
index 3bc4b129e1..ba00cfa8f8 100644
--- a/gui/src/renderer/components/WireguardKeys.tsx
+++ b/gui/src/renderer/components/WireguardKeys.tsx
@@ -37,7 +37,7 @@ export default class WireguardKeys extends Component<IProps> {
<View style={styles.wgkeys__container}>
<SettingsHeader>
<HeaderTitle>
- {messages.pgettext('wireguard-keys-nav', 'WireGuard keys')}
+ {messages.pgettext('wireguard-keys-nav', 'WireGuard key')}
</HeaderTitle>
</SettingsHeader>
diff --git a/mullvad-cli/src/cmds/tunnel.rs b/mullvad-cli/src/cmds/tunnel.rs
index 9fc7c12469..dc16705558 100644
--- a/mullvad-cli/src/cmds/tunnel.rs
+++ b/mullvad-cli/src/cmds/tunnel.rs
@@ -52,7 +52,7 @@ fn create_wireguard_mtu_subcommand() -> clap::App<'static, 'static> {
fn create_wireguard_keys_subcommand() -> clap::App<'static, 'static> {
clap::SubCommand::with_name("key")
- .about("Manage your wireguard keys")
+ .about("Manage your wireguard key")
.setting(clap::AppSettings::SubcommandRequiredElseHelp)
.subcommand(clap::SubCommand::with_name("check"))
.subcommand(clap::SubCommand::with_name("generate"))
Copyright © 2025 - 2026 Wayne Cole. WTFPL. Attribution appreciated. No warranty. Not liable for bodily damages.