From 16fd6cebd7ebda1ff159abdc8a382e621fa358c4 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Sun, 27 Nov 2011 13:18:04 +0300
Subject: cleaner preference handling in ApiRequest make json data debugging
 optional

---
 res/values/strings.xml  |  3 +++
 res/xml/preferences.xml | 11 +++++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

(limited to 'res')

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 8e32a61c..9ffb5baf 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -9,6 +9,7 @@
     <string name="login_login">Log in</string>
     <string name="logout">Log out</string>
     <string name="login">Login</string>
+    <string name="debugging">Debugging</string>
     <string name="password">Password</string>
     <string name="default_url">http://example.domain/tt-rss/</string>
     <string name="authentication">Authentication</string>
@@ -20,6 +21,7 @@
     <string name="theme_dark">Dark</string>
     <string name="preferences">Preferences</string>
     <string name="theme_light">Light</string>
+    <string name="connection">Connection</string>
     <string name="login_api_disabled">Login failed: API disabled.</string>
     <string name="login_no_data">Login failed: no data received.</string>
     <string name="login_wrong_password">Login failed: username or password incorrect.</string>
@@ -42,4 +44,5 @@
     <string name="error_no_feeds">No feeds to display.</string>
     <string name="error_invalid_object">Error: invalid object received.</string>
     <string name="blank"></string>
+    <string name="transport_debugging">Log sent and received data</string>
 </resources>
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 1c102fb0..4fb2c5ec 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -3,14 +3,13 @@
 <PreferenceScreen
   xmlns:android="http://schemas.android.com/apk/res/android">
   
-   <PreferenceCategory android:title="@string/authentication">
+   <PreferenceCategory android:title="@string/connection">
         
         <EditTextPreference android:title="@string/login" android:key="login" android:singleLine="true"></EditTextPreference>
         <EditTextPreference android:title="@string/password" android:key="password" android:singleLine="true" android:password="true"></EditTextPreference>
         <EditTextPreference android:key="ttrss_url" android:title="@string/ttrss_url" android:singleLine="true" textUri="true" android:hint="@string/default_url"></EditTextPreference>
         <CheckBoxPreference android:defaultValue="false" android:title="@string/ssl_trust_any" android:key="ssl_trust_any" />                                              
-                
-    </PreferenceCategory>
+	</PreferenceCategory>
    
    <PreferenceCategory android:title="@string/look_and_feel">
       <ListPreference
@@ -22,5 +21,9 @@
       
       <CheckBoxPreference android:title="@string/sort_feeds_by_unread" android:key="sort_feeds_by_unread"/>
    </PreferenceCategory>
-  
+   
+   <PreferenceCategory android:title="@string/debugging">
+               <CheckBoxPreference android:defaultValue="false" android:title="@string/transport_debugging" android:key="transport_debugging" />
+   </PreferenceCategory>                                              
+       
 </PreferenceScreen>
\ No newline at end of file
-- 
cgit v1.2.3-54-g00ecf