Format Android XML files

21 files changed, 119 insertions, 178 deletions

diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml
index afad471490..29e0c013d2 100644
--- a/android/src/main/AndroidManifest.xml
+++ b/android/src/main/AndroidManifest.xml
@@ -25,7 +25,6 @@
         </activity>
         <service android:name="net.mullvad.mullvadvpn.service.MullvadVpnService"
                  android:permission="android.permission.BIND_VPN_SERVICE">
-
             <intent-filter>
                 <action android:name="android.net.VpnService" />
             </intent-filter>
@@ -40,7 +39,6 @@
                  android:label="@string/app_name"
                  android:icon="@drawable/small_logo_black"
                  android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
-
             <intent-filter>
                 <action android:name="android.service.quicksettings.action.QS_TILE" />
             </intent-filter>
diff --git a/android/src/main/res/drawable/account_history_background.xml b/android/src/main/res/drawable/account_history_background.xml
index e0729e32cb..b596284ace 100644
--- a/android/src/main/res/drawable/account_history_background.xml
+++ b/android/src/main/res/drawable/account_history_background.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-
     <item>
         <shape xmlns:android="http://schemas.android.com/apk/res/android">
-
             <corners android:radius="@dimen/account_input_corner_radius" />
             <solid android:color="@color/darkBlue" />
         </shape>
@@ -13,7 +11,6 @@
           android:bottom="1dp"
           android:left="1dp">
         <shape xmlns:android="http://schemas.android.com/apk/res/android">
-
             <corners android:radius="@dimen/account_input_corner_radius" />
             <solid android:color="@color/white" />
         </shape>
diff --git a/android/src/main/res/drawable/blue_button_background.xml b/android/src/main/res/drawable/blue_button_background.xml
index f6813bb22f..44f0406e46 100644
--- a/android/src/main/res/drawable/blue_button_background.xml
+++ b/android/src/main/res/drawable/blue_button_background.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-
     <item android:state_pressed="false">
         <shape android:shape="rectangle">
             <corners android:radius="4dp" />
diff --git a/android/src/main/res/drawable/cell_button_background.xml b/android/src/main/res/drawable/cell_button_background.xml
index 203eaecb27..e00f49464d 100644
--- a/android/src/main/res/drawable/cell_button_background.xml
+++ b/android/src/main/res/drawable/cell_button_background.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-
     <item android:state_pressed="false">
         <shape android:shape="rectangle">
             <solid android:color="@color/blue" />
diff --git a/android/src/main/res/drawable/cell_input_background.xml b/android/src/main/res/drawable/cell_input_background.xml
index a08eb4cbcc..436b3adb6e 100644
--- a/android/src/main/res/drawable/cell_input_background.xml
+++ b/android/src/main/res/drawable/cell_input_background.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-
     <corners android:radius="4dp" />
     <solid android:color="@color/white10" />
 </shape>
diff --git a/android/src/main/res/drawable/green_button_background.xml b/android/src/main/res/drawable/green_button_background.xml
index 608315067b..275f4fc3cb 100644
--- a/android/src/main/res/drawable/green_button_background.xml
+++ b/android/src/main/res/drawable/green_button_background.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-
     <item android:state_pressed="false">
         <shape android:shape="rectangle">
             <corners android:radius="4dp" />
diff --git a/android/src/main/res/drawable/red_button_background.xml b/android/src/main/res/drawable/red_button_background.xml
index b1d12de841..69f16f298f 100644
--- a/android/src/main/res/drawable/red_button_background.xml
+++ b/android/src/main/res/drawable/red_button_background.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-
     <item android:state_pressed="false">
         <shape android:shape="rectangle">
             <corners android:radius="4dp" />
diff --git a/android/src/main/res/drawable/transparent_red_button_background.xml b/android/src/main/res/drawable/transparent_red_button_background.xml
index a06b458c8c..e284fb9bfb 100644
--- a/android/src/main/res/drawable/transparent_red_button_background.xml
+++ b/android/src/main/res/drawable/transparent_red_button_background.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-
     <item android:state_pressed="false">
         <shape android:shape="rectangle">
             <corners android:radius="4dp" />
diff --git a/android/src/main/res/drawable/transparent_red_left_half_button_background.xml b/android/src/main/res/drawable/transparent_red_left_half_button_background.xml
index ab971b6b4e..1102ec771b 100644
--- a/android/src/main/res/drawable/transparent_red_left_half_button_background.xml
+++ b/android/src/main/res/drawable/transparent_red_left_half_button_background.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-
     <item android:state_pressed="false">
         <shape android:shape="rectangle">
             <corners android:topLeftRadius="4dp"
diff --git a/android/src/main/res/drawable/transparent_red_right_half_button_background.xml b/android/src/main/res/drawable/transparent_red_right_half_button_background.xml
index 2f2945bd94..0c31d5f429 100644
--- a/android/src/main/res/drawable/transparent_red_right_half_button_background.xml
+++ b/android/src/main/res/drawable/transparent_red_right_half_button_background.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-
     <item android:state_pressed="false">
         <shape android:shape="rectangle">
             <corners android:topRightRadius="4dp"
diff --git a/android/src/main/res/drawable/white20_button_background.xml b/android/src/main/res/drawable/white20_button_background.xml
index b4354e2d10..8a2601fdf8 100644
--- a/android/src/main/res/drawable/white20_button_background.xml
+++ b/android/src/main/res/drawable/white20_button_background.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-
     <item android:state_pressed="false">
         <shape android:shape="rectangle">
             <corners android:radius="4dp" />
diff --git a/android/src/main/res/layout/account.xml b/android/src/main/res/layout/account.xml
index 092b4d2817..fb18b09c04 100644
--- a/android/src/main/res/layout/account.xml
+++ b/android/src/main/res/layout/account.xml
@@ -14,7 +14,6 @@
                   android:gravity="center_vertical | left"
                   android:clickable="true"
                   android:background="?android:attr/selectableItemBackground">
-
         <ImageView android:layout_width="24dp"
                    android:layout_height="24dp"
                    android:layout_marginRight="8dp"
@@ -47,14 +46,14 @@
                                                                   mullvad:clipboardLabel="@string/mullvad_account_number"
                                                                   mullvad:copiedToast="@string/copied_mullvad_account_number"
                                                                   mullvad:description="@string/account_number"
-                                                                  mullvad:whenMissing="hide"/>
+                                                                  mullvad:whenMissing="hide" />
         <net.mullvad.mullvadvpn.ui.widget.InformationView android:id="@+id/account_expiry"
                                                           android:layout_width="match_parent"
                                                           android:layout_height="wrap_content"
                                                           android:paddingHorizontal="24dp"
                                                           android:paddingVertical="12dp"
                                                           mullvad:description="@string/paid_until"
-                                                          mullvad:whenMissing="hide"/>
+                                                          mullvad:whenMissing="hide" />
         <Button android:id="@+id/logout"
                 android:layout_marginTop="12dp"
                 android:layout_marginHorizontal="24dp"
diff --git a/android/src/main/res/layout/advanced.xml b/android/src/main/res/layout/advanced.xml
index e6a029ae74..3264c2d619 100644
--- a/android/src/main/res/layout/advanced.xml
+++ b/android/src/main/res/layout/advanced.xml
@@ -13,7 +13,6 @@
                   android:gravity="center_vertical | left"
                   android:clickable="true"
                   android:background="?android:attr/selectableItemBackground">
-
         <ImageView android:layout_width="24dp"
                    android:layout_height="24dp"
                    android:layout_marginRight="8dp"
@@ -63,8 +62,7 @@
                   android:hint="@string/hint_default"
                   android:textColorHint="@color/white80"
                   android:textColor="@color/white"
-                  android:textSize="20sp"
-                  />
+                  android:textSize="20sp" />
     </LinearLayout>
     <TextView android:id="@+id/wireguard_mtu_footer"
               android:layout_width="match_parent"
diff --git a/android/src/main/res/layout/connect.xml b/android/src/main/res/layout/connect.xml
index 52d418a639..f7bbf4bed9 100644
--- a/android/src/main/res/layout/connect.xml
+++ b/android/src/main/res/layout/connect.xml
@@ -47,14 +47,12 @@
                         android:paddingLeft="20dp"
                         android:paddingRight="10dp"
                         android:background="?android:attr/selectableItemBackground">
-
             <RelativeLayout android:id="@+id/notification_status_container"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_alignParentTop="true"
                             android:layout_alignParentLeft="true"
                             android:layout_alignBottom="@id/notification_title">
-
                 <ImageView android:id="@+id/notification_status"
                            android:layout_width="wrap_content"
                            android:layout_height="wrap_content"
@@ -146,7 +144,6 @@
                       android:gravity="start"
                       android:clickable="true"
                       android:background="?android:attr/selectableItemBackground">
-
             <LinearLayout android:layout_width="wrap_content"
                           android:layout_height="wrap_content"
                           android:orientation="horizontal">
diff --git a/android/src/main/res/layout/login.xml b/android/src/main/res/layout/login.xml
index 5b90712841..df0e9be771 100644
--- a/android/src/main/res/layout/login.xml
+++ b/android/src/main/res/layout/login.xml
@@ -90,7 +90,6 @@
                                                          android:layout_width="match_parent"
                                                          android:layout_height="48dp"
                                                          android:orientation="horizontal">
-
             <EditText android:id="@+id/account_input"
                       android:digits="0123456789"
                       android:layout_width="match_parent"
diff --git a/android/src/main/res/layout/preferences.xml b/android/src/main/res/layout/preferences.xml
index 61d1b99ae2..33845d4e09 100644
--- a/android/src/main/res/layout/preferences.xml
+++ b/android/src/main/res/layout/preferences.xml
@@ -13,7 +13,6 @@
                   android:gravity="center_vertical | left"
                   android:clickable="true"
                   android:background="?android:attr/selectableItemBackground">
-
         <ImageView android:layout_width="24dp"
                    android:layout_height="24dp"
                    android:layout_marginRight="8dp"
diff --git a/android/src/main/res/layout/problem_report.xml b/android/src/main/res/layout/problem_report.xml
index 71b2317ee7..93ea844249 100644
--- a/android/src/main/res/layout/problem_report.xml
+++ b/android/src/main/res/layout/problem_report.xml
@@ -13,7 +13,6 @@
                   android:gravity="center_vertical | left"
                   android:clickable="true"
                   android:background="?android:attr/selectableItemBackground">
-
         <ImageView android:layout_width="24dp"
                    android:layout_height="24dp"
                    android:layout_marginRight="8dp"
diff --git a/android/src/main/res/layout/wireguard_key.xml b/android/src/main/res/layout/wireguard_key.xml
index 554e709fdb..8e6384eefb 100644
--- a/android/src/main/res/layout/wireguard_key.xml
+++ b/android/src/main/res/layout/wireguard_key.xml
@@ -15,7 +15,6 @@
                   android:gravity="center_vertical | left"
                   android:clickable="true"
                   android:background="?android:attr/selectableItemBackground">
-
         <ImageView android:layout_width="24dp"
                    android:layout_height="24dp"
                    android:layout_marginRight="8dp"
@@ -47,7 +46,7 @@
                                                               mullvad:copiedToast="@string/copied_wireguard_public_key"
                                                               mullvad:description="@string/public_key"
                                                               mullvad:maxLength="20"
-                                                              mullvad:whenMissing="showSpinner"/>
+                                                              mullvad:whenMissing="showSpinner" />
     <net.mullvad.mullvadvpn.ui.widget.InformationView android:id="@+id/key_age"
                                                       android:layout_width="match_parent"
                                                       android:layout_height="wrap_content"
@@ -55,7 +54,7 @@
                                                       android:paddingHorizontal="24dp"
                                                       android:paddingVertical="12dp"
                                                       mullvad:description="@string/wireguard_key_generated"
-                                                      mullvad:whenMissing="showSpinner"/>
+                                                      mullvad:whenMissing="showSpinner" />
     <FrameLayout android:layout_width="wrap_content"
                  android:layout_height="wrap_content"
                  android:paddingHorizontal="24dp"
diff --git a/android/src/main/res/values/attrs.xml b/android/src/main/res/values/attrs.xml
index 85e9c24dd5..362af43680 100644
--- a/android/src/main/res/values/attrs.xml
+++ b/android/src/main/res/values/attrs.xml
@@ -1,30 +1,48 @@
 <resources>
     <declare-styleable name="Button">
-        <attr name="buttonColor" format="enum">
-            <enum name="blue" value="0"/>
-            <enum name="green" value="1"/>
+        <attr name="buttonColor"
+              format="enum">
+            <enum name="blue"
+                  value="0" />
+            <enum name="green"
+                  value="1" />
         </attr>
-        <attr name="detailImage" format="reference"/>
-        <attr name="showSpinner" format="boolean"/>
-        <attr name="text" format="reference|string"/>
+        <attr name="detailImage"
+              format="reference" />
+        <attr name="showSpinner"
+              format="boolean" />
+        <attr name="text"
+              format="reference|string" />
     </declare-styleable>
     <declare-styleable name="CopyableInformationView">
-        <attr name="clipboardLabel" format="reference|string"/>
-        <attr name="copiedToast" format="reference|string"/>
+        <attr name="clipboardLabel"
+              format="reference|string" />
+        <attr name="copiedToast"
+              format="reference|string" />
     </declare-styleable>
     <declare-styleable name="InformationView">
-        <attr name="description" format="reference|string"/>
-        <attr name="errorColor" format="reference|color"/>
-        <attr name="informationColor" format="reference|color"/>
-        <attr name="maxLength" format="integer"/>
-        <attr name="whenMissing" format="enum">
-            <enum name="nothing" value="0"/>
-            <enum name="hide" value="1"/>
-            <enum name="showSpinner" value="2"/>
+        <attr name="description"
+              format="reference|string" />
+        <attr name="errorColor"
+              format="reference|color" />
+        <attr name="informationColor"
+              format="reference|color" />
+        <attr name="maxLength"
+              format="integer" />
+        <attr name="whenMissing"
+              format="enum">
+            <enum name="nothing"
+                  value="0" />
+            <enum name="hide"
+                  value="1" />
+            <enum name="showSpinner"
+                  value="2" />
         </attr>
     </declare-styleable>
     <declare-styleable name="UrlButton">
-        <attr name="url" format="reference|string"/>
-        <attr name="withToken" format="boolean"/>
+        <attr name="url"
+              format="reference|string" />
+        <attr name="withToken"
+              format="boolean" />
     </declare-styleable>
 </resources>
diff --git a/android/src/main/res/values/strings.xml b/android/src/main/res/values/strings.xml
index a2d06c83cc..4e03f847ee 100644
--- a/android/src/main/res/values/strings.xml
+++ b/android/src/main/res/values/strings.xml
@@ -5,102 +5,79 @@
     <string name="disconnecting">Disconnecting</string>
     <string name="secured">Secured</string>
     <string name="unsecured">Unsecured</string>
-    <string name="critical_error">Critical error (your attention is
-    required)</string>
-    <string name="blocking_all_connections">Blocking all
-    connections</string>
-    <string name="foreground_notification_channel_name">VPN tunnel
+    <string name="critical_error">Critical error (your attention is required)</string>
+    <string name="blocking_all_connections">Blocking all connections</string>
+    <string name="foreground_notification_channel_name">VPN tunnel status</string>
+    <string name="foreground_notification_channel_description">Shows current VPN tunnel
     status</string>
-    <string name="foreground_notification_channel_description">
-    Shows current VPN tunnel status</string>
-    <string name="connecting_to_daemon">Connecting to Mullvad
-    system service...</string>
+    <string name="connecting_to_daemon">Connecting to Mullvad system service...</string>
     <string name="login_title">Login</string>
-    <string name="login_description">Enter your account
-    number</string>
+    <string name="login_description">Enter your account number</string>
     <string name="login_hint">0000 0000 0000 0000</string>
     <string name="logging_in_title">Logging in</string>
-    <string name="logging_in_description">Checking account
-    number</string>
+    <string name="logging_in_description">Checking account number</string>
     <string name="logged_in_title">Login successful</string>
     <string name="login_fail_title">Login failed</string>
-    <string name="login_fail_description">Invalid account number,
-    try again</string>
-    <string name="dont_have_an_account">Don\'t have an account
-    number?</string>
+    <string name="login_fail_description">Invalid account number, try again</string>
+    <string name="dont_have_an_account">Don\'t have an account number?</string>
     <string name="create_account">Create account</string>
     <string name="creating_new_account">Creating new account</string>
     <string name="failed_to_create_account">Failed to create account</string>
     <string name="account_created">Account created</string>
     <string name="congrats">Congrats!</string>
-    <string name="here_is_your_account_number">Here\'s your account number.
-    Save it!</string>
-    <string name="pay_to_start_using">To start using the app, you first need
-    to add time to you account. Buy credit on our website.</string>
+    <string name="here_is_your_account_number">Here\'s your account number. Save it!</string>
+    <string name="pay_to_start_using">To start using the app, you first need to add time to you
+    account. Buy credit on our website.</string>
     <string name="buy_credit">Buy credit</string>
     <string name="settings">Settings</string>
     <string name="settings_account">Account</string>
-    <string name="less_than_a_day_left">less than a day
-    left</string>
-    <string name="less_than_a_minute_ago">less than a minute
-    ago</string>
+    <string name="less_than_a_day_left">less than a day left</string>
+    <string name="less_than_a_minute_ago">less than a minute ago</string>
     <string name="out_of_time">Out of time</string>
     <string name="settings_preferences">Preferences</string>
     <string name="settings_advanced">Advanced</string>
     <string name="app_version">App version</string>
-    <string name="update_available_footer">Update available,
-    download to remain safe.</string>
+    <string name="update_available_footer">Update available, download to remain safe.</string>
     <string name="report_a_problem">Report a problem</string>
     <string name="quit">Quit</string>
     <string name="account_number">Account number</string>
-    <string name="mullvad_account_number">Mullvad account
-    number</string>
-    <string name="copied_mullvad_account_number">Copied Mullvad
-    account number to clipboard</string>
+    <string name="mullvad_account_number">Mullvad account number</string>
+    <string name="copied_mullvad_account_number">Copied Mullvad account number to
+    clipboard</string>
     <string name="paid_until">Paid until</string>
     <string name="log_out">Log out</string>
-    <string name="local_network_sharing">Local network
-    sharing</string>
-    <string name="allow_lan_footer">Allows access to other devices
-    on the same network for sharing, printing etc.</string>
+    <string name="local_network_sharing">Local network sharing</string>
+    <string name="allow_lan_footer">Allows access to other devices on the same network for sharing,
+    printing etc.</string>
     <string name="auto_connect">Auto-connect</string>
-    <string name="auto_connect_footer">Automatically connect to a
-    server when the app launches.</string>
+    <string name="auto_connect_footer">Automatically connect to a server when the app
+    launches.</string>
     <string name="wireguard_mtu">WireGuard MTU</string>
-    <string name="wireguard_mtu_footer">Set WireGuard MTU value. Valid range:
-    %1$d - %2$d.</string>
+    <string name="wireguard_mtu_footer">Set WireGuard MTU value. Valid range: %1$d - %2$d.</string>
     <string name="hint_default">Default</string>
-    <string name="problem_report_description">To help you more
-    effectively, your app\'s log file will be attached to this
-    message. Your data will remain secure and private, as it is
-    anonymised before being sent over an encrypted
-    channel.</string>
+    <string name="problem_report_description">To help you more effectively, your app\'s log file
+    will be attached to this message. Your data will remain secure and private, as it is anonymised
+    before being sent over an encrypted channel.</string>
     <string name="user_email_hint">Your email (optional)</string>
     <string name="user_message_hint">Describe your problem</string>
     <string name="send">Send</string>
     <string name="sending">Sending...</string>
     <string name="sent">Sent</string>
     <string name="failed_to_send">Failed to send</string>
-    <string name="confirm_no_email">You are about to send the
-    problem report without a way for us to get back to you. If you
-    want an answer to your report you will have to enter an email
+    <string name="confirm_no_email">You are about to send the problem report without a way for us
+    to get back to you. If you want an answer to your report you will have to enter an email
     address.</string>
     <string name="send_anyway">Send anyway</string>
     <string name="back">Back</string>
-    <string name="sent_thanks">Thanks! We will look into
-    this.</string>
-    <string name="sent_contact">If needed we will contact you
-    on</string>
-    <string name="failed_to_send_details">You may need to go back
-    to the app\'s main screen and click Disconnect before trying
-    again. Don\'t worry, the information you entered will remain in
+    <string name="sent_thanks">Thanks! We will look into this.</string>
+    <string name="sent_contact">If needed we will contact you on</string>
+    <string name="failed_to_send_details">You may need to go back to the app\'s main screen and
+    click Disconnect before trying again. Don\'t worry, the information you entered will remain in
     the form.</string>
     <string name="edit_message">Edit message</string>
     <string name="try_again">Try again</string>
-    <string name="unsecured_connection">Unsecured
-    connection</string>
-    <string name="creating_secure_connection">Creating secure
-    connection</string>
+    <string name="unsecured_connection">Unsecured connection</string>
+    <string name="creating_secure_connection">Creating secure connection</string>
     <string name="secure_connection">Secure connection</string>
     <string name="blocked_connection">Blocked connection</string>
     <string name="error_state">Failed to secure connection</string>
@@ -115,51 +92,37 @@
     <string name="in_address">In %1$s:%2$d %3$s</string>
     <string name="out_address">Out %1$s</string>
     <string name="blocking_internet">Blocking internet</string>
-    <string name="not_blocking_internet">You might be leaking
-    network traffic</string>
-    <string name="failed_to_block_internet">Failed to block all
-    network traffic. Please troubleshoot or report the problem to
-    us.</string>
-    <string name="auth_failed">Account authentication
-    failed.</string>
-    <string name="ipv6_unavailable">Could not configure
-    IPv6</string>
-    <string name="set_firewall_policy_error">Failed to apply
-    firewall rules. The device might currently be
-    unsecured</string>
-    <string name="set_dns_error">Failed to set system DNS
-    server</string>
-    <string name="start_tunnel_error">Failed to start tunnel
-    connection</string>
-    <string name="vpn_permission_denied_error">VPN permission was
-    denied when creating the tunnel. Please try connecting
-    again.</string>
-    <string name="no_matching_relay">No relay server matches the
-    current settings</string>
-    <string name="no_matching_bridge_relay">No bridge relay server
-    matches the current settings</string>
+    <string name="not_blocking_internet">You might be leaking network traffic</string>
+    <string name="failed_to_block_internet">Failed to block all network traffic. Please
+    troubleshoot or report the problem to us.</string>
+    <string name="auth_failed">Account authentication failed.</string>
+    <string name="ipv6_unavailable">Could not configure IPv6</string>
+    <string name="set_firewall_policy_error">Failed to apply firewall rules. The device might
+    currently be unsecured</string>
+    <string name="set_dns_error">Failed to set system DNS server</string>
+    <string name="start_tunnel_error">Failed to start tunnel connection</string>
+    <string name="vpn_permission_denied_error">VPN permission was denied when creating the tunnel.
+    Please try connecting again.</string>
+    <string name="no_matching_relay">No relay server matches the current settings</string>
+    <string name="no_matching_bridge_relay">No bridge relay server matches the current
+    settings</string>
     <string name="no_wireguard_key">No WireGuard key set</string>
-    <string name="custom_tunnel_host_resolution_error">Failed to
-    resolve the hostname of custom server</string>
-    <string name="is_offline">This device is offline, no tunnels
-    can be established</string>
+    <string name="custom_tunnel_host_resolution_error">Failed to resolve the hostname of custom
+    server</string>
+    <string name="is_offline">This device is offline, no tunnels can be established</string>
     <string name="tap_adapter_problem">TAP adapter error</string>
     <string name="wireguard_error">WireGuard error</string>
-    <string name="too_many_keys">Too many WireGuard keys registered
-    to account</string>
-    <string name="failed_to_generate_key">Failed to generate
-    WireGuard key</string>
+    <string name="too_many_keys">Too many WireGuard keys registered to account</string>
+    <string name="failed_to_generate_key">Failed to generate WireGuard key</string>
     <string name="update_available">Update available</string>
-    <string name="update_available_description">Install Mullvad VPN
-    (%1$s) to stay up to date</string>
+    <string name="update_available_description">Install Mullvad VPN (%1$s) to stay up to
+    date</string>
     <string name="unsupported_version">Unsupported version</string>
-    <string name="unsupported_version_description">You are running
-    an unsupported app version. Please upgrade to %1$s now to
-    ensure your security</string>
+    <string name="unsupported_version_description">You are running an unsupported app version.
+    Please upgrade to %1$s now to ensure your security</string>
     <string name="select_location">Select location</string>
-    <string name="select_location_description">While connected,
-    your real location is masked with a private and secure location
-    in the selected region</string>
+    <string name="select_location_description">While connected, your real location is masked with a
+    private and secure location in the selected region</string>
     <string name="wireguard_key">WireGuard key</string>
     <string name="public_key">Public key</string>
     <string name="wireguard_key_generated">Key generated</string>
@@ -168,26 +131,17 @@
     <string name="wireguard_replace_key">Regenerate key</string>
     <string name="wireguard_manage_keys">Manage keys</string>
     <string name="wireguard_key_age">Key generated on</string>
-    <string name="wireguard_key_reconnecting">Reconnecting with new
-    WireGuard key...</string>
-    <string name="wireguard_key_blocked_state_message">Unable to
-    manage keys while in a blocked state</string>
+    <string name="wireguard_key_reconnecting">Reconnecting with new WireGuard key...</string>
+    <string name="wireguard_key_blocked_state_message">Unable to manage keys while in a blocked
+    state</string>
     <string name="wireguard_key_valid">Key is valid</string>
     <string name="wireguard_key_invalid">Key is invalid</string>
-    <string name="wireguard_key_verification_failure">Key verification
-    failed</string>
-    <string name="wireguard_public_key">WireGuard public key
-    </string>
-    <string name="copied_wireguard_public_key">Copied WireGuard
-    public key to clipboard</string>
-    <string name="account_url">
-    https://mullvad.net/en/account</string>
-    <string name="wg_key_url">
-    https://mullvad.net/account/ports</string>
-    <string name="create_account_url">
-    https://mullvad.net/en/account/create</string>
-    <string name="download_url">
-    https://mullvad.net/en/download</string>
-    <string name="copied_to_clipboard">Copied to
-    clipboard</string>
+    <string name="wireguard_key_verification_failure">Key verification failed</string>
+    <string name="wireguard_public_key">WireGuard public key</string>
+    <string name="copied_wireguard_public_key">Copied WireGuard public key to clipboard</string>
+    <string name="account_url">https://mullvad.net/en/account</string>
+    <string name="wg_key_url">https://mullvad.net/account/ports</string>
+    <string name="create_account_url">https://mullvad.net/en/account/create</string>
+    <string name="download_url">https://mullvad.net/en/download</string>
+    <string name="copied_to_clipboard">Copied to clipboard</string>
 </resources>
diff --git a/android/src/main/res/values/styles.xml b/android/src/main/res/values/styles.xml
index c380a2f51c..1191d0c61f 100644
--- a/android/src/main/res/values/styles.xml
+++ b/android/src/main/res/values/styles.xml
@@ -7,18 +7,15 @@
     <style name="InputText"
            parent="Widget.AppCompat.EditText">
         <item name="android:padding">14dp</item>
-        <item name="android:background">
-        @drawable/input_text_background</item>
-        <item name="android:textCursorDrawable">
-        @drawable/text_input_cursor</item>
+        <item name="android:background">@drawable/input_text_background</item>
+        <item name="android:textCursorDrawable">@drawable/text_input_cursor</item>
         <item name="android:textColorHint">@color/blue40</item>
         <item name="android:textColor">@color/blue</item>
         <item name="android:textSize">13sp</item>
     </style>
     <style name="Button"
            parent="Widget.AppCompat.Button.Borderless">
-        <item name="android:layout_height">
-        @dimen/normal_button_height</item>
+        <item name="android:layout_height">@dimen/normal_button_height</item>
         <item name="android:layout_width">match_parent</item>
         <item name="android:padding">0dp</item>
         <item name="android:textAllCaps">false</item>
@@ -28,22 +25,18 @@
     </style>
     <style name="GreenButton"
            parent="Button">
-        <item name="android:background">
-        @drawable/green_button_background</item>
+        <item name="android:background">@drawable/green_button_background</item>
     </style>
     <style name="RedButton"
            parent="Button">
-        <item name="android:background">
-        @drawable/red_button_background</item>
+        <item name="android:background">@drawable/red_button_background</item>
     </style>
     <style name="BlueButton"
            parent="Button">
-        <item name="android:background">
-        @drawable/blue_button_background</item>
+        <item name="android:background">@drawable/blue_button_background</item>
     </style>
     <style name="White20Button"
            parent="Button">
-        <item name="android:background">
-        @drawable/white20_button_background</item>
+        <item name="android:background">@drawable/white20_button_background</item>
     </style>
 </resources>