aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/app/src/main/res
diff options
context:
space:
mode:
authorSamuel Holland <samuel@sholland.org>2018-01-08 00:34:55 -0600
committerSamuel Holland <samuel@sholland.org>2018-01-08 00:34:55 -0600
commit08cca563882ff7f743789a99f91afa2e9dbac23d (patch)
treeb448da612fb98151a2fa03a086b7ed065c3f8d74 /app/src/main/res
parentTunnelManager: Simplify save/resume methods (diff)
downloadwireguard-android-08cca563882ff7f743789a99f91afa2e9dbac23d.tar.xz
wireguard-android-08cca563882ff7f743789a99f91afa2e9dbac23d.zip
ToolsInstaller: Extract to its own classes
Signed-off-by: Samuel Holland <samuel@sholland.org>
Diffstat (limited to 'app/src/main/res')
-rw-r--r--app/src/main/res/values/strings.xml12
-rw-r--r--app/src/main/res/xml/preferences.xml5
2 files changed, 7 insertions, 10 deletions
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c897e345..48030788 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -58,16 +58,16 @@
<string name="public_key_description">Public key</string>
<string name="restore_on_boot">Restore on boot</string>
<string name="restore_on_boot_summary">Restore previously enabled configurations on boot</string>
- <string name="install_cmd_line_tools">Install command line tools</string>
- <string name="install_cmd_line_tools_summary">Install optional tools for scripting into /system/xbin</string>
- <string name="install_cmd_line_tools_success">wg and wg-quick installed into /system/xbin</string>
- <string name="install_cmd_line_tools_progress">Installing wg and wg-quick into /system/xbin</string>
- <string name="install_cmd_line_tools_already">wg and wg-quick are already installed</string>
- <string name="install_cmd_line_tools_failure">Command line tools could not be installed</string>
<string name="save">Save</string>
<string name="settings">Settings</string>
<string name="status">Status</string>
<string name="toggle">Toggle</string>
+ <string name="tools_installer_already">wg and wg-quick are already installed</string>
+ <string name="tools_installer_failure">Command line tools could not be installed (no root?)</string>
+ <string name="tools_installer_initial">Install optional tools for scripting into the system partition</string>
+ <string name="tools_installer_success">wg and wg-quick installed into the system partition</string>
+ <string name="tools_installer_title">Install command line tools</string>
+ <string name="tools_installer_working">Installing wg and wg-quick into the system partition</string>
<string name="last_change">Last change</string>
<string name="never">never</string>
</resources>
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index e02572dd..290f7086 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -5,8 +5,5 @@
android:key="restore_on_boot"
android:summary="@string/restore_on_boot_summary"
android:title="@string/restore_on_boot" />
- <Preference
- android:key="install_cmd_line_tools"
- android:summary="@string/install_cmd_line_tools_summary"
- android:title="@string/install_cmd_line_tools" />
+ <com.wireguard.android.preference.ToolsInstallerPreference />
</PreferenceScreen>