diff options
| author | Adithya Abraham Philip <adithyaphilip@gmail.com> | 2015-06-06 15:26:22 +0530 |
|---|---|---|
| committer | Adithya Abraham Philip <adithyaphilip@gmail.com> | 2015-07-03 20:46:15 +0530 |
| commit | 3034db0f71f9dd8e2f4d8838c1803952702f7520 (patch) | |
| tree | cb13212845cc5159516a2a0e87b0f3439acfc5ec /OpenKeychain/src/main/res | |
| parent | f4f3a66d8c1d6a3b863eb7a7a6cb47a995609872 (diff) | |
| download | open-keychain-3034db0f71f9dd8e2f4d8838c1803952702f7520.tar.gz open-keychain-3034db0f71f9dd8e2f4d8838c1803952702f7520.tar.bz2 open-keychain-3034db0f71f9dd8e2f4d8838c1803952702f7520.zip | |
added proxy type
Diffstat (limited to 'OpenKeychain/src/main/res')
| -rw-r--r-- | OpenKeychain/src/main/res/values/arrays.xml | 8 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 14 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/xml/proxy_prefs.xml | 13 |
3 files changed, 28 insertions, 7 deletions
diff --git a/OpenKeychain/src/main/res/values/arrays.xml b/OpenKeychain/src/main/res/values/arrays.xml index 44bbe00cc..241f530d8 100644 --- a/OpenKeychain/src/main/res/values/arrays.xml +++ b/OpenKeychain/src/main/res/values/arrays.xml @@ -29,6 +29,14 @@ <item>28800</item> <item>-1</item> </string-array> + <string-array name="pref_proxy_type_entries" translatable="false"> + <item>@string/pref_proxy_type_choice_http</item> + <item>@string/pref_proxy_type_choice_socks</item> + </string-array> + <string-array name="pref_proxy_type_values" translatable="false"> + <item>@string/pref_proxy_type_value_http</item> + <item>@string/pref_proxy_type_value_socks</item> + </string-array> <string-array name="rsa_key_size_spinner_values" translatable="false"> <item>@string/key_size_2048</item> <item>@string/key_size_4096</item> diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index defa7d2a5..d8499ed06 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -174,14 +174,20 @@ <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_label">"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_label">"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_label">"Proxy Port"</string> <string name="pref_proxy_port_err_invalid">"Invalid port number entered"</string> + <string name="pref_proxy_type_label">"Proxy Type"</string> + + <!-- proxy type choices --> + <string name="pref_proxy_type_choice_http">"HTTP"</string> + <string name="pref_proxy_type_choice_socks">"SOCKS"</string> + <string name="pref_proxy_type_value_http">"proxyHttp"</string> + <string name="pref_proxy_type_value_socks">"proxySocks"</string> <string name="user_id_no_name">"<no name>"</string> <string name="none">"<none>"</string> diff --git a/OpenKeychain/src/main/res/xml/proxy_prefs.xml b/OpenKeychain/src/main/res/xml/proxy_prefs.xml index e77ac6d71..ab9c5a3e3 100644 --- a/OpenKeychain/src/main/res/xml/proxy_prefs.xml +++ b/OpenKeychain/src/main/res/xml/proxy_prefs.xml @@ -3,7 +3,7 @@ <CheckBoxPreference android:key="useTorProxy" android:persistent="true" - android:title="@string/pref_proxy_tor" + android:title="@string/pref_proxy_tor_label" android:summary="@string/pref_proxy_tor_summary" /> <CheckBoxPreference android:key="useNormalProxy" @@ -13,7 +13,7 @@ android:key="proxyHost" android:persistent="true" android:defaultValue="127.0.0.1" - android:title="@string/pref_proxy_host" + android:title="@string/pref_proxy_host_label" android:cursorVisible="true" android:textCursorDrawable="@null" android:inputType="textEmailAddress"/> @@ -21,7 +21,14 @@ android:key="proxyPort" android:defaultValue="8118" android:persistent="true" - android:title="@string/pref_proxy_port" + android:title="@string/pref_proxy_port_label" android:textCursorDrawable="@null" android:inputType="number" /> + <ListPreference + android:entries="@array/pref_proxy_type_entries" + android:entryValues="@array/pref_proxy_type_values" + android:defaultValue="@string/pref_proxy_type_value_http" + android:key="proxyType" + android:persistent="true" + android:title="@string/pref_proxy_type_label" /> </PreferenceScreen> |