diff options
author | Andrew Dolgov <[email protected]> | 2012-09-25 13:47:04 +0400 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2012-09-25 13:47:04 +0400 |
commit | aa22d8f8f371ce962d4827e50bfd793c2ab689c3 (patch) | |
tree | f6fa701e7af6dec9223591114d37d5c269af4988 /res | |
parent | 53a1c5d5fe1c6e6e472988693066d98af2d88236 (diff) |
split SSL hostname verification to a separate option, do not call
trustAllHosts() on every API request, fix support for older tt-rss
versions which do not have getApiLevel call
Diffstat (limited to 'res')
-rw-r--r-- | res/values/strings.xml | 8 | ||||
-rw-r--r-- | res/xml/preferences.xml | 11 |
2 files changed, 17 insertions, 2 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 194de703..d57cae6f 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -28,7 +28,7 @@ <string name="share_article">Share article</string> <string name="catchup">Mark read</string> <string name="sort_feeds_by_unread">Sort feeds by unread count</string> - <string name="ssl_trust_any">Accept any SSL certificate</string> + <string name="ssl_trust_any">Accept any certificate</string> <string name="category_browse_feeds">Browse feeds</string> <string name="category_browse_articles">Browse articles</string> <string name="blank"></string> @@ -137,4 +137,10 @@ <string name="donate_thanks">Donation found, thank you for support!</string> <string name="use_volume_keys">Use volume buttons</string> <string name="use_volume_keys_long">Switch between articles with hardware volume buttons</string> + <string name="ssl_trust_any_host">No hostname verification</string> + <string name="error_api_unknown_method">Error: unknown API method</string> + <string name="ssl_trust_any_long">Accepts any SSL certificate without validation</string> + <string name="ssl_trust_any_host_long">Do not verify hostnames over SSL</string> + <string name="ssl">SSL</string> + <string name="error_ssl_hostname_rejected">Error: SSL hostname not verified</string> </resources>
\ No newline at end of file diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml index a98cd8ad..648114bb 100644 --- a/res/xml/preferences.xml +++ b/res/xml/preferences.xml @@ -22,11 +22,20 @@ android:summary="@string/ttrss_url_summary"
android:title="@string/ttrss_url" >
</EditTextPreference>
-
+ </PreferenceCategory>
+ <PreferenceCategory android:title="@string/ssl" android:summary="blah blah blah" >
<CheckBoxPreference
android:defaultValue="false"
android:key="ssl_trust_any"
+ android:summary="@string/ssl_trust_any_long"
android:title="@string/ssl_trust_any" />
+
+ <CheckBoxPreference
+ android:defaultValue="false"
+ android:key="ssl_trust_any_host"
+ android:summary="@string/ssl_trust_any_host_long"
+ android:title="@string/ssl_trust_any_host" />
+
</PreferenceCategory>
<PreferenceCategory android:title="@string/http_authentication" >
<EditTextPreference
|