From c8eb6f598f738074dd4e875c012591c4bece5e13 Mon Sep 17 00:00:00 2001
From: vanitasvitae <vanitasvitae@fsfe.org>
Date: Fri, 28 Oct 2016 19:19:48 +0200
Subject: [PATCH] Made proxy description more precise and made verbose logging
 depended from debugging

---
 app/src/main/res/values/strings-preferences.xml     | 2 +-
 app/src/main/res/xml/preferences__sub_debugging.xml | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/values/strings-preferences.xml b/app/src/main/res/values/strings-preferences.xml
index b6c43af8..cd51337a 100644
--- a/app/src/main/res/values/strings-preferences.xml
+++ b/app/src/main/res/values/strings-preferences.xml
@@ -113,7 +113,7 @@
     <string name="pref_title__sub_proxy">Proxy</string>
     <string name="pref_desc__sub_proxy" translatable="false">@string/pref_desc__http_proxy_enabled</string>
     <string name="pref_title__proxy_enabled">Enable Proxy</string>
-    <string name="pref_desc__http_proxy_enabled">Proxy Diaspora\'s traffic to circumvent firewalls.\nMay require restart</string>
+    <string name="pref_desc__http_proxy_enabled">Proxy Diaspora\'s traffic to circumvent firewalls.\nMay require restart. This might not work on some phones.</string>
     <string name="pref_title__http_proxy_host">Host</string>
     <string name="pref_title__http_proxy_port">Port</string>
     <string name="HTTP" translatable="false">HTTP</string>
diff --git a/app/src/main/res/xml/preferences__sub_debugging.xml b/app/src/main/res/xml/preferences__sub_debugging.xml
index 17ca7241..6cafda0c 100644
--- a/app/src/main/res/xml/preferences__sub_debugging.xml
+++ b/app/src/main/res/xml/preferences__sub_debugging.xml
@@ -11,6 +11,7 @@
         <com.github.dfa.diaspora_android.ui.theme.ThemedCheckBoxPreference
             android:defaultValue="false"
             android:key="@string/pref_key__logging_spam_enabled"
-            android:title="@string/pref_title__logging_spam_enabled"/>
+            android:title="@string/pref_title__logging_spam_enabled"
+            android:dependency="@string/pref_key__logging_enabled"/>
     </com.github.dfa.diaspora_android.ui.theme.ThemedPreferenceCategory>
 </PreferenceScreen>
\ No newline at end of file