Skip to content

Commit 3414640

Browse files
committed
Fix layout of some long multiline strings
Unexpectedly newlines and indentation here do seem to affect TextView behaviour, so we end up with subtly weirdly intented text in some places. This fixes that by simply reverting to simple single-line string resource XML.
1 parent 42c9871 commit 3414640

File tree

1 file changed

+7
-30
lines changed

1 file changed

+7
-30
lines changed

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

+7-30
Original file line numberDiff line numberDiff line change
@@ -11,41 +11,23 @@
1111
<string name="connected_status">Connected</string>
1212
<string name="failed_status">Oh no!</string>
1313

14-
<string name="disconnected_details">
15-
To intercept this device, start HTTP Toolkit on your computer, and activate Android
16-
interception there via QR code or using ADB.
14+
<string name="disconnected_details">To intercept this device, start HTTP Toolkit on your computer, and activate Android interception there via QR code or using ADB.
1715
</string>
1816

1917
<string name="connected_details">to %s on port %d</string>
2018
<string name="connected_tunnel_details">via ADB tunnel</string>
21-
<string name="failed_details">
22-
We couldn\'t connect to HTTP Toolkit.\n\nIs it running, and connected to the same network
23-
as this device?
24-
</string>
19+
<string name="failed_details">We couldn\'t connect to HTTP Toolkit.\n\nIs it running, and connected to the same network as this device?</string>
2520

2621
<string name="disabled_connection_status_heading">HTTPS interception disabled</string>
2722
<string name="user_connection_status_enabled_heading">User trust enabled</string>
2823
<string name="system_connection_status_disabled_heading">System trust disabled</string>
2924
<string name="system_connection_status_enabled_heading">System trust enabled</string>
3025
<string name="pre_v7_connection_status_enabled_heading">Certificate trusted</string>
3126

32-
<string name="none_connection_status_details">
33-
Your HTTP Toolkit certificate is not trusted on this device, so HTTPS traffic will only be
34-
available from apps that individually include and trust it.\n\nDisconnect and reconnect to
35-
rerun HTTPS certificate setup.
36-
</string>
37-
<string name="user_connection_status_details">
38-
HTTPS interception will only be available for apps that are configured to trust user-installed certificates
39-
(<a href="https://httptoolkit.tech/docs/guides/android#intercepting-traffic-from-your-own-android-app">How?</a>)
40-
</string>
41-
<string name="system_connection_status_details">
42-
Traffic from all intercepted applications will
43-
be available, except those using explicit certificate pinning.
44-
</string>
45-
<string name="pre_v7_connection_status_details">
46-
Traffic from all intercepted applications will
47-
be available, except those using explicit certificate pinning.
48-
</string>
27+
<string name="none_connection_status_details">Your HTTP Toolkit certificate is not trusted on this device, so HTTPS traffic will only be available from apps that individually include and trust it.\n\nDisconnect and reconnect to rerun HTTPS certificate setup.</string>
28+
<string name="user_connection_status_details">HTTPS interception will only be available for apps that are configured to trust user-installed certificates (<a href="https://httptoolkit.tech/docs/guides/android#intercepting-traffic-from-your-own-android-app">How?</a>)</string>
29+
<string name="system_connection_status_details">Traffic from all intercepted applications will be available, except those using explicit certificate pinning.</string>
30+
<string name="pre_v7_connection_status_details">Traffic from all intercepted applications will be available, except those using explicit certificate pinning.</string>
4931

5032
<string name="scan_button">Scan QR code</string>
5133
<string name="reconnect_button">Reconnect</string>
@@ -71,10 +53,5 @@
7153
<string name="few_ports">%s port%s</string>
7254
<string name="add_port_prompt">Add another port</string>
7355
<string name="reset_to_default_ports">Reset to default ports</string>
74-
<string name="port_config_explanation">
75-
HTTP Toolkit sets the device\'s HTTP proxy configuration, to capture traffic from all apps
76-
on any port, but some apps may ignore this.\n\nYou can add ports here to forcibly redirect
77-
all outgoing traffic to that port, but be careful, as this will interfere with any non-HTTP
78-
traffic on these ports.
79-
</string>
56+
<string name="port_config_explanation">HTTP Toolkit sets the device\'s HTTP proxy configuration, to capture traffic from all apps on any port, but some apps may ignore this.\n\nYou can add ports here to forcibly redirect all outgoing traffic to that port, but be careful, as this will interfere with any non-HTTP traffic on these ports.</string>
8057
</resources>

0 commit comments

Comments
 (0)