Skip to content

Commit 0603fee

Browse files
committed
fix: tweak copy
Signed-off-by: Michael Nahkies <[email protected]>
1 parent d6102c7 commit 0603fee

File tree

2 files changed

+11
-13
lines changed

2 files changed

+11
-13
lines changed

android/src/main/java/com/tailscale/ipn/ui/view/SettingsView.kt

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -110,12 +110,10 @@ fun SettingsView(
110110

111111
Lists.ItemDivider()
112112
Setting.Switch(
113-
R.string.client_remote_logging_enabled,
114-
subtitle = stringResource(R.string.client_remote_logging_enabled_subtitle),
115-
isOn = isClientRemoteLoggingEnabled,
116-
onToggle = {
117-
viewModel.toggleIsClientRemoteLoggingEnabled()
118-
})
113+
R.string.client_remote_logging_enabled,
114+
subtitle = stringResource(R.string.client_remote_logging_enabled_subtitle),
115+
isOn = isClientRemoteLoggingEnabled,
116+
onToggle = { viewModel.toggleIsClientRemoteLoggingEnabled() })
119117

120118
if (!AndroidTVUtil.isAndroidTV()) {
121119
Lists.ItemDivider()
@@ -201,12 +199,12 @@ object Setting {
201199
},
202200
supportingContent =
203201
subtitle?.let {
204-
{
205-
Text(
206-
it,
207-
style = MaterialTheme.typography.bodySmall,
208-
color = MaterialTheme.colorScheme.onSurfaceVariant)
209-
}
202+
{
203+
Text(
204+
it,
205+
style = MaterialTheme.typography.bodySmall,
206+
color = MaterialTheme.colorScheme.onSurfaceVariant)
207+
}
210208
},
211209
trailingContent = {
212210
TintedSwitch(checked = isOn, onCheckedChange = onToggle, enabled = enabled)

android/src/main/res/values/strings.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,7 @@
347347
<string name="use_tailscale_subnets_subtitle">Route traffic according to your network\'s rules. Some networks require this to access IP addresses that don\'t start with 100.x.y.z.</string>
348348
<string name="subnet_routing">Subnet routing</string>
349349
<string name="client_remote_logging_enabled">Remote client logging</string>
350-
<string name="client_remote_logging_enabled_subtitle">Equivalent to --no-logs-no-support on Linux.\nChanges require restarting the app to take effect.</string>
350+
<string name="client_remote_logging_enabled_subtitle">Whether debug logs are uploaded to Tailscale support. When disabled no support or network flow logs.\nChanges require restarting the app to take effect.</string>
351351
<string name="specifies_a_device_name_to_be_used_instead_of_the_automatic_default">Specifies a device name to be used instead of the automatic default.</string>
352352
<string name="hostname">Hostname</string>
353353
<string name="failed_to_save">Failed to save</string>

0 commit comments

Comments
 (0)