From c321985a0bd21567aaa7279dcc434d096248c4c2 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 12 Jan 2012 21:50:33 +0530
Subject: [PATCH] Content server: Warn users about the password incompatibility
 with Android

---
 src/calibre/gui2/preferences/server.ui | 44 +++++++++++++++++++++-----
 1 file changed, 36 insertions(+), 8 deletions(-)

diff --git a/src/calibre/gui2/preferences/server.ui b/src/calibre/gui2/preferences/server.ui
index be68c2448f..4c8691500c 100644
--- a/src/calibre/gui2/preferences/server.ui
+++ b/src/calibre/gui2/preferences/server.ui
@@ -26,7 +26,7 @@
        </property>
       </widget>
      </item>
-     <item row="0" column="1">
+     <item row="0" column="1" colspan="2">
       <widget class="QSpinBox" name="opt_port">
        <property name="maximum">
         <number>65535</number>
@@ -46,7 +46,7 @@
        </property>
       </widget>
      </item>
-     <item row="1" column="1">
+     <item row="1" column="1" colspan="2">
       <widget class="QLineEdit" name="opt_username"/>
      </item>
      <item row="2" column="0">
@@ -62,11 +62,16 @@
      <item row="2" column="1">
       <widget class="QLineEdit" name="opt_password">
        <property name="toolTip">
-        <string>If you leave the password blank, anyone will be able to access your book collection using the web interface.</string>
+        <string>&lt;p&gt;If you leave the password blank, anyone will be able to
+ access your book collection using the web interface.
+&lt;br&gt;
+&lt;p&gt;Note that passwords do not work with Android devices. 
+Leave this blank if you intend to use the server with an
+ Android phone or tablet.</string>
        </property>
       </widget>
      </item>
-     <item row="4" column="1">
+     <item row="4" column="1" colspan="2">
       <widget class="QLineEdit" name="opt_max_cover">
        <property name="toolTip">
         <string>The maximum size (widthxheight) for displayed covers. Larger covers are resized. </string>
@@ -86,7 +91,7 @@
        </property>
       </widget>
      </item>
-     <item row="3" column="1">
+     <item row="3" column="1" colspan="2">
       <widget class="QCheckBox" name="show_server_password">
        <property name="text">
         <string>&amp;Show password</string>
@@ -103,7 +108,7 @@
        </property>
       </widget>
      </item>
-     <item row="5" column="1">
+     <item row="5" column="1" colspan="2">
       <widget class="QSpinBox" name="opt_max_opds_items">
        <property name="minimum">
         <number>10</number>
@@ -113,7 +118,7 @@
        </property>
       </widget>
      </item>
-     <item row="6" column="1">
+     <item row="6" column="1" colspan="2">
       <widget class="QSpinBox" name="opt_max_opds_ungrouped_items">
        <property name="minimum">
         <number>25</number>
@@ -140,7 +145,7 @@
        </property>
       </widget>
      </item>
-     <item row="7" column="1">
+     <item row="7" column="1" colspan="2">
       <widget class="QComboBox" name="opt_cs_restriction">
        <property name="toolTip">
         <string>This restriction (based on a saved search) will restrict the books the content server makes available to those matching the search. This setting is per library (i.e. you can have a different restriction per library).</string>
@@ -153,6 +158,29 @@
        </property>
       </widget>
      </item>
+     <item row="2" column="2">
+      <widget class="QLabel" name="label">
+       <property name="font">
+        <font>
+         <weight>50</weight>
+         <bold>false</bold>
+        </font>
+       </property>
+       <property name="toolTip">
+        <string>&lt;p&gt;Because of a bug in Google's Android, setting a password
+ will prevent the server from working with Android devices.
+&lt;br&gt;
+&lt;p&gt;Do not set a password if you plan to use the server with an
+ Android phone or tablet.</string>
+       </property>
+       <property name="styleSheet">
+        <string notr="true">QLabel {color:red}</string>
+       </property>
+       <property name="text">
+        <string>Password incompatible with Android devices</string>
+       </property>
+      </widget>
+     </item>
     </layout>
    </item>
    <item>