diff options
Diffstat (limited to 'OpenKeychain/src/main/res')
| -rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 20 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/xml/preference_headers.xml | 3 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/xml/proxy_prefs.xml | 27 |
3 files changed, 50 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index 5a43fda19..defa7d2a5 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -49,6 +49,7 @@ <string name="section_keys">"Subkeys"</string> <string name="section_cloud_search">"Cloud search"</string> <string name="section_passphrase_cache">"Password/PIN Handling"</string> + <string name="section_proxy_settings">"Proxy Settings"</string> <string name="section_certify">"Confirm"</string> <string name="section_actions">"Actions"</string> <string name="section_share_key">"Key"</string> @@ -172,6 +173,16 @@ <string name="pref_keybase">"keybase.io"</string> <string name="pref_keybase_summary">"Search keys on keybase.io"</string> + <!-- Proxy Preferences --> + <string name="pref_proxy_non">"Don't use a proxy"</string> + <string name="pref_proxy_tor">"Enable Tor"</string> + <string name="pref_proxy_tor_summary">"Requires Orbot to be installed"</string> + <string name="pref_proxy_normal">"Enable other proxy"</string> + <string name="pref_proxy_host">"Proxy Host"</string> + <string name="pref_proxy_host_err_invalid">"Proxy host cannot be empty"</string> + <string name="pref_proxy_port">"Proxy Port"</string> + <string name="pref_proxy_port_err_invalid">"Invalid port number entered"</string> + <string name="user_id_no_name">"<no name>"</string> <string name="none">"<none>"</string> @@ -187,6 +198,15 @@ <string name="secret_key">"Secret Key:"</string> + <!-- OrbotHelper strings --> + <string name="install_orbot_">"Install Orbot?"</string> + <string name="market_orbot">"market://search?q=pname:org.torproject.android"</string> + <string name="you_must_have_orbot">"You must have Orbot installed and activated to proxy traffic through it. Would you like to install it from Google Play?"</string> + <string name="orbot_yes">"Yes"</string> + <string name="orbot_no">"No"</string> + <string name="start_orbot_">"Start Orbot?"</string> + <string name="orbot_doesn_t_appear_to_be_running_would_you_like_to_start_it_up_and_connect_to_tor_">"Orbot doesn\'t appear to be running. Would you like to start it up and connect to Tor?"</string> + <!-- choice --> <string name="choice_none">"None"</string> <string name="choice_15secs">"15 secs"</string> diff --git a/OpenKeychain/src/main/res/xml/preference_headers.xml b/OpenKeychain/src/main/res/xml/preference_headers.xml index e3447ff48..70e400567 100644 --- a/OpenKeychain/src/main/res/xml/preference_headers.xml +++ b/OpenKeychain/src/main/res/xml/preference_headers.xml @@ -5,4 +5,7 @@ <header android:fragment="org.sufficientlysecure.keychain.ui.SettingsActivity$AdvancedPrefsFragment" android:title="@string/section_passphrase_cache" /> + <header + android:fragment="org.sufficientlysecure.keychain.ui.SettingsActivity$ProxyPrefsFragment" + android:title="@string/section_proxy_settings" /> </preference-headers> diff --git a/OpenKeychain/src/main/res/xml/proxy_prefs.xml b/OpenKeychain/src/main/res/xml/proxy_prefs.xml new file mode 100644 index 000000000..e77ac6d71 --- /dev/null +++ b/OpenKeychain/src/main/res/xml/proxy_prefs.xml @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="utf-8"?> +<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"> + <CheckBoxPreference + android:key="useTorProxy" + android:persistent="true" + android:title="@string/pref_proxy_tor" + android:summary="@string/pref_proxy_tor_summary" /> + <CheckBoxPreference + android:key="useNormalProxy" + android:persistent="true" + android:title="@string/pref_proxy_normal" /> + <EditTextPreference + android:key="proxyHost" + android:persistent="true" + android:defaultValue="127.0.0.1" + android:title="@string/pref_proxy_host" + android:cursorVisible="true" + android:textCursorDrawable="@null" + android:inputType="textEmailAddress"/> + <EditTextPreference + android:key="proxyPort" + android:defaultValue="8118" + android:persistent="true" + android:title="@string/pref_proxy_port" + android:textCursorDrawable="@null" + android:inputType="number" /> +</PreferenceScreen> |