From aa22d8f8f371ce962d4827e50bfd793c2ab689c3 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Tue, 25 Sep 2012 13:47:04 +0400
Subject: 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

---
 res/values/strings.xml  |  8 +++++++-
 res/xml/preferences.xml | 11 ++++++++++-
 2 files changed, 17 insertions(+), 2 deletions(-)

(limited to 'res')

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
-- 
cgit v1.2.3-54-g00ecf