From 50d77e8dc83da1f381e77efa48181090db1b7bcb Mon Sep 17 00:00:00 2001
From: "David A. Velasco" <dvelasco@solidgear.es>
Date: Fri, 10 May 2013 16:35:01 +0200
Subject: [PATCH 01/18] Review of login view layout optimizing the adaption to
 different screen sizes

---
 .../{owncloud_logo.png => logo.png}           | Bin
 .../{owncloud_logo.png => logo.png}           | Bin
 .../{owncloud_logo.png => logo.png}           | Bin
 res/layout-land/account_setup.xml             | 379 ++++++++----------
 res/layout/account_setup.xml                  | 375 +++++++----------
 res/layout/file_preview.xml                   |   2 +-
 res/values/strings.xml                        |   1 -
 .../authentication/AuthenticatorActivity.java |  13 +-
 8 files changed, 323 insertions(+), 447 deletions(-)
 rename res/drawable-hdpi/{owncloud_logo.png => logo.png} (100%)
 rename res/drawable-ldpi/{owncloud_logo.png => logo.png} (100%)
 rename res/drawable-mdpi/{owncloud_logo.png => logo.png} (100%)

diff --git a/res/drawable-hdpi/owncloud_logo.png b/res/drawable-hdpi/logo.png
similarity index 100%
rename from res/drawable-hdpi/owncloud_logo.png
rename to res/drawable-hdpi/logo.png
diff --git a/res/drawable-ldpi/owncloud_logo.png b/res/drawable-ldpi/logo.png
similarity index 100%
rename from res/drawable-ldpi/owncloud_logo.png
rename to res/drawable-ldpi/logo.png
diff --git a/res/drawable-mdpi/owncloud_logo.png b/res/drawable-mdpi/logo.png
similarity index 100%
rename from res/drawable-mdpi/owncloud_logo.png
rename to res/drawable-mdpi/logo.png
diff --git a/res/layout-land/account_setup.xml b/res/layout-land/account_setup.xml
index ce78ace595..f6a0280638 100644
--- a/res/layout-land/account_setup.xml
+++ b/res/layout-land/account_setup.xml
@@ -17,222 +17,179 @@
   You should have received a copy of the GNU General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:oc="http://schemas.android.com/apk/res/com.owncloud.android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="center|fill" 
+	android:padding="16dip"
     android:focusable="true"
-    android:gravity="center|fill"
-    android:orientation="vertical" >
+    >
 
-    <FrameLayout
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:layout_marginLeft="16dip"
-        android:layout_marginRight="16dip"
-        android:layout_weight="1" >
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent" >
-
-            <ImageView
-                android:id="@+id/imageView1"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_margin="7dp"
-                android:layout_weight="1"
-                android:src="@drawable/owncloud_logo" />
-
-            <LinearLayout
-                android:id="@+id/LinearLayout1"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:layout_weight="1"
-                android:orientation="vertical" >
-
-                <FrameLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1" >
-
-                    <EditText
-                        android:id="@+id/hostUrlInput"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:ems="10"
-                        android:hint="@string/auth_host_url"
-                        android:inputType="textNoSuggestions">
-                        <requestFocus />
-                    </EditText>
-
-                    <ImageView
-                        android:id="@+id/refreshButton"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="right|center_vertical"
-                        android:src="@drawable/ic_action_refresh_black"
-                    	android:onClick="onRefreshClick"
-                        android:visibility="invisible" />
-                </FrameLayout>
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="50dp"
-                    android:layout_weight="1" >
-
-                    <ImageView
-                        android:id="@+id/action_indicator"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginLeft="5dp"
-                        android:layout_marginRight="5dp"
-                        android:src="@android:drawable/stat_notify_sync"
-                        android:visibility="invisible" />
-
-                    <TextView
-                        android:id="@+id/status_text"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="TextView"
-                        android:visibility="invisible" />
-                </LinearLayout>
-
-                <CheckBox
-                    android:id="@+id/oauth_onOff_check"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:checked="false"
-                    android:onClick="onCheckClick"
-                    android:text="@string/oauth_check_onoff"
-                    android:textAppearance="?android:attr/textAppearanceSmall" />
-
-                <TextView
-                    android:id="@+id/textView2"
-                    android:layout_width="wrap_content"
-                    android:layout_height="0dp"
-                    android:layout_weight="1"
-                    android:text="@string/auth_login_details"
-                    android:textAppearance="?android:attr/textAppearanceSmall" />
-
-	            <EditText
-	                android:id="@+id/oAuthEntryPoint_1"
-	                android:layout_width="match_parent"
-	                android:layout_height="wrap_content"
-	                android:layout_weight="1"
-	                android:ems="10"
-                	android:enabled="false"
-	                android:text="@string/oauth2_url_endpoint_auth"
-	                android:singleLine="true"
-	                android:visibility="gone" >
-	
-	                <requestFocus />
-	            </EditText>            
-	
-	            <EditText
-	                android:id="@+id/oAuthEntryPoint_2"
-	                android:layout_width="match_parent"
-	                android:layout_height="wrap_content"
-	                android:layout_weight="1"
-	                android:ems="10"
-                	android:enabled="false"
-	                android:text="@string/oauth2_url_endpoint_access"
-	                android:singleLine="true"
-	                android:visibility="gone" >
-	
-	                <requestFocus />
-	            </EditText>            
-	
-                <EditText
-                    android:id="@+id/account_username"
-                    android:layout_width="match_parent"
-                    android:layout_height="0dp"
-                    android:layout_weight="1"
-                    android:ems="10"
-                    android:hint="@string/auth_username"
-                    android:inputType="textNoSuggestions" />
-
-                <FrameLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1" >
-
-                    <EditText
-                        android:id="@+id/account_password"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:ems="10"
-                        android:hint="@string/auth_password"
-                        android:inputType="textPassword"/>
-
-                    <ImageView
-                        android:id="@+id/viewPasswordButton"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="right|center_vertical"
-                        android:src="@android:drawable/ic_menu_view"
-						android:onClick="onViewPasswordClick"
-                        android:visibility="invisible" />
-                </FrameLayout>
-                
-	            <TextView
-	                android:id="@+id/auth_status_text"
-	                android:layout_width="match_parent"
-	                android:layout_height="wrap_content"
-	                android:layout_weight="1" 
-	                android:text="@string/text_placeholder"
-	                android:layout_marginLeft="5dp"
-	                android:layout_marginRight="5dp"
-					android:drawableLeft="@android:drawable/stat_notify_sync"
-	    			android:drawablePadding="5dip"
-	    			android:visibility="invisible"                
-	                />
-                
-            </LinearLayout>
-            
-        </LinearLayout>
-    </FrameLayout>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true" >
-
-        <LinearLayout
-            android:id="@+id/buttons_layout"        
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:weightSum="1">
-
-            <Button
-                android:id="@+id/buttonOK"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight=".5"
-                android:layout_marginLeft="16dip"
-		        android:layout_marginRight="16dip"
-                android:enabled="false"
-                android:onClick="onOkClick"
-                android:text="@string/setup_btn_connect"
-                android:textColor="@android:color/black" />
-            
-        </LinearLayout>
+		android:layout_alignParentTop="true"
+		android:layout_above="@+id/buttonOK"
+		android:orientation="horizontal" 
+        >
         
-		<Button
-			android:id="@+id/account_register"
+	<ImageView
+		android:id="@+id/imageView1"
+		android:layout_width="0dp"
+		android:layout_height="wrap_content"
+		android:layout_weight="1"
+		android:layout_gravity="center"
+		android:src="@drawable/logo" 
+		/>
+	
+	<LinearLayout
+		android:id="@+id/LinearLayout1"
+		android:layout_width="0dp"
+		android:layout_height="wrap_content"
+		android:layout_weight="1"
+		android:layout_gravity="center"
+		android:orientation="vertical" 
+		>
+
+		<FrameLayout
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+		>
+
+			<EditText
+				android:id="@+id/hostUrlInput"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:ems="10"
+				android:hint="@string/auth_host_url"
+				android:inputType="textUri"
+				>
+				<requestFocus />
+			</EditText>
+
+			<ImageView
+				android:id="@+id/refreshButton"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_gravity="right|center_vertical"
+				android:src="@drawable/ic_action_refresh_black"
+				android:onClick="onRefreshClick"
+				android:visibility="invisible" />
+			
+		</FrameLayout>
+
+		<TextView
+			android:id="@+id/server_status_text"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_marginBottom="10dp"
+			android:drawableLeft="@android:drawable/stat_notify_sync"
+			android:drawablePadding="5dp"
+			android:gravity="center_vertical"
+			android:text="@string/auth_testing_connection" />
+             
+		<CheckBox
+			android:id="@+id/oauth_onOff_check"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:layout_below="@id/buttons_layout"
-			android:layout_centerHorizontal="true"
-			android:onClick="onRegisterClick"
-			android:paddingTop="10dp"
-			android:paddingBottom="10dp"
-			android:textColor="#0000FF"
-			android:background="@android:color/transparent" />
-			<!-- android:text="@string/app_name @string/auth_register" /-->
-        
-    </RelativeLayout>
+			android:checked="false"
+			android:onClick="onCheckClick"
+			android:text="@string/oauth_check_onoff"
+			android:textAppearance="?android:attr/textAppearanceSmall"
+			android:visibility="gone"
+			/>
 
-</LinearLayout>
+		<EditText
+			android:id="@+id/oAuthEntryPoint_1"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:ems="10"
+			android:enabled="false"
+			android:text="@string/oauth2_url_endpoint_auth"
+			android:singleLine="true"
+			android:inputType="textUri"
+			android:visibility="gone" >
+			<requestFocus />
+		</EditText>            
+		
+		<EditText
+			android:id="@+id/oAuthEntryPoint_2"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:ems="10"
+			android:enabled="false"
+			android:text="@string/oauth2_url_endpoint_access"
+			android:singleLine="true"
+			android:inputType="textUri"
+			android:visibility="gone" >
+			<requestFocus />
+		</EditText>            
+
+		<EditText
+			android:id="@+id/account_username"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:ems="10"
+			android:hint="@string/auth_username"
+			android:inputType="textNoSuggestions" />
+
+		<FrameLayout
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			>
+			<EditText
+				android:id="@+id/account_password"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:ems="10"
+				android:hint="@string/auth_password"
+				android:inputType="textPassword"/>
+			
+			<ImageView
+				android:id="@+id/viewPasswordButton"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_gravity="right|center_vertical"
+				android:src="@android:drawable/ic_menu_view"
+				android:onClick="onViewPasswordClick"
+				android:visibility="invisible" />
+		</FrameLayout>
+     
+		<TextView
+			android:id="@+id/auth_status_text"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:gravity="center_vertical"
+			android:text="@string/auth_unauthorized"
+			android:drawableLeft="@android:drawable/stat_notify_sync"
+			android:drawablePadding="5dip"
+			/>
+	           
+	</LinearLayout>
+	</LinearLayout>
+       
+	<Button
+		android:id="@id/buttonOK"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_above="@id/account_register"
+		android:layout_centerHorizontal="true"
+		android:enabled="false"
+		android:onClick="onOkClick"
+		android:text="@string/setup_btn_connect"
+		/>
+
+	<Button
+		android:id="@+id/account_register"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_alignParentBottom="true"
+		android:layout_marginTop="10dp"
+		android:layout_centerHorizontal="true"
+		android:onClick="onRegisterClick"
+		android:textColor="#0000FF"
+		android:background="@android:color/transparent"
+		android:text="@string/auth_register" 
+		/>
+       
+</RelativeLayout>
diff --git a/res/layout/account_setup.xml b/res/layout/account_setup.xml
index d541c09931..7171133e2e 100644
--- a/res/layout/account_setup.xml
+++ b/res/layout/account_setup.xml
@@ -18,236 +18,157 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 
-
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical" >
+    android:layout_gravity="center"
+	android:padding="16dip"
+    android:fillViewport="true"
+    android:orientation="vertical"
+    >
 
-	<LinearLayout
-	    android:layout_width="match_parent"
-	    android:layout_height="wrap_content"
-	    android:layout_gravity="center"
-	    android:focusable="true"
-	    android:gravity="center"
-	    android:orientation="vertical" >
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:orientation="vertical" 
+        android:focusable="true"
+        >
 
-    	<FrameLayout
-			android:layout_width="match_parent"
-			android:layout_height="0dip"
-			android:layout_gravity="center"
-			android:layout_marginBottom="50dip"
-			android:layout_marginLeft="16dip"
-			android:layout_marginRight="16dip"
-			android:layout_weight="1" >
-		
-			<LinearLayout
-				android:id="@+id/LinearLayout1"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:layout_gravity="center"
-				android:orientation="vertical" >
-		
-				<ImageView
-					android:id="@+id/imageView1"
-					android:layout_width="match_parent"
-					android:layout_height="wrap_content"
-					android:layout_marginBottom="10dp"
-					android:layout_weight="1"
-					android:src="@drawable/owncloud_logo" />
-		
-	            <FrameLayout
-	                android:layout_width="match_parent"
-	                android:layout_height="wrap_content"
-	                android:layout_weight="1" >
-	
-	                <EditText
-	                    android:id="@+id/hostUrlInput"
-	                    android:layout_width="match_parent"
-	                    android:layout_height="wrap_content"
-	                    android:ems="10"
-	                    android:hint="@string/auth_host_url"
-	                    android:inputType="textNoSuggestions" >
-	                    <requestFocus />
-	                </EditText>
-	
-	                <ImageView
-	                    android:id="@+id/refreshButton"
-	                    android:layout_width="wrap_content"
-	                    android:layout_height="wrap_content"
-	                    android:src="@drawable/ic_action_refresh_black"
-	                    android:layout_gravity="right|center_vertical"
-	                    android:visibility="invisible" />
-	
-	            </FrameLayout>
-	
-	            <LinearLayout
-	                android:layout_width="match_parent"
-	                android:layout_height="50dp"
-	                android:layout_weight="1" >
-	
-	                <ImageView
-	                    android:id="@+id/action_indicator"
-	                    android:layout_width="wrap_content"
-	                    android:layout_height="wrap_content"
-	                    android:layout_marginLeft="5dp"
-	                    android:layout_marginRight="5dp"
-	                    android:src="@android:drawable/stat_notify_sync"
-	                    android:visibility="invisible" />
-	
-	                <TextView
-	                    android:id="@+id/status_text"
-	                    android:layout_width="wrap_content"
-	                    android:layout_height="wrap_content"
-	                    android:text="TextView"
-	                    android:visibility="invisible" />
-	
-	            </LinearLayout>
-	
-	            <CheckBox
-	                android:id="@+id/oauth_onOff_check"
-	                android:layout_width="wrap_content"
-	                android:layout_height="wrap_content"
-	                android:checked="false"
-	                android:onClick="onCheckClick"
-	                android:text="@string/oauth_check_onoff"
-	                android:textAppearance="?android:attr/textAppearanceSmall" />
-	
-				<TextView
-	                android:id="@+id/textView2"
-	                android:layout_width="wrap_content"
-	                android:layout_height="0dp"
-	                android:layout_weight="1"
-	                android:text="@string/auth_login_details"
-	                android:textAppearance="?android:attr/textAppearanceSmall" />
-	
-	            <EditText
-	                android:id="@+id/oAuthEntryPoint_1"
-	                android:layout_width="match_parent"
-	                android:layout_height="wrap_content"
-	                android:layout_weight="1"
-	                android:ems="10"
-	                android:text="@string/oauth2_url_endpoint_auth"
-	                android:singleLine="true"
-	                android:visibility="gone" >
-	
-	                <requestFocus />
-	            </EditText>            
-	
-	            <EditText
-	                android:id="@+id/oAuthEntryPoint_2"
-	                android:layout_width="match_parent"
-	                android:layout_height="wrap_content"
-	                android:layout_weight="1"
-	                android:ems="10"
-		            android:text="@string/oauth2_url_endpoint_access"
-	                android:singleLine="true"
-	                android:visibility="gone" >
-	
-	                <requestFocus />
-	            </EditText>            
-	
-				<EditText
-	                android:id="@+id/account_username"
-	                android:layout_width="match_parent"
-	                android:layout_height="0dp"
-	                android:layout_weight="1"
-	                android:ems="10"
-	                android:hint="@string/auth_username"
-	                android:inputType="textNoSuggestions" />
-	
-	            <FrameLayout
-	                android:layout_width="match_parent"
-	                android:layout_height="wrap_content"
-	                android:layout_weight="1" >
-	
-	                <EditText
-	                    android:id="@+id/account_password"
-	                    android:layout_width="match_parent"
-	                    android:layout_height="wrap_content"
-	                    android:ems="10"
-	                    android:hint="@string/auth_password"
-	                    android:inputType="textPassword"/>
-	
-	                <ImageView
-	                    android:id="@+id/viewPasswordButton"
-	                    android:layout_width="wrap_content"
-	                    android:layout_height="wrap_content"
-	                    android:layout_gravity="right|center_vertical"
-	                    android:src="@android:drawable/ic_menu_view"
-						android:onClick="onViewPasswordClick"
-	                    android:visibility="invisible" />
-	
-	            </FrameLayout>
-		
-	            <TextView
-	                android:id="@+id/auth_status_text"
-	                android:layout_width="match_parent"
-	                android:layout_height="wrap_content"
-	                android:layout_weight="1" 
-	                android:text="@string/text_placeholder"
-	                android:layout_marginLeft="5dp"
-	                android:layout_marginRight="5dp"
-					android:drawableLeft="@android:drawable/stat_notify_sync"
-	    			android:drawablePadding="5dip"
-	    			android:visibility="invisible"                
-	                />
-	                    
-	           </LinearLayout>
-	
-	    </FrameLayout>
-	
-	    <RelativeLayout
-	        android:layout_width="match_parent"
-	        android:layout_height="wrap_content">
-	
-	        <LinearLayout
-	            android:id="@+id/buttons_layout"
-	            android:layout_width="match_parent"
-	            android:layout_height="wrap_content"
-	            android:weightSum="1">
-	
-	            <Button
-	                android:id="@+id/buttonOK"
-	                android:layout_width="match_parent"
-	                android:layout_height="wrap_content"
-		            android:layout_gravity="center_horizontal"
-		           	android:layout_marginLeft="16dip"
-		            android:layout_marginRight="16dip"
-	                android:enabled="false"
-	                android:onClick="onOkClick"
-	                android:text="@string/setup_btn_connect"
-	                android:textColor="@android:color/black" />
-	
-	        </LinearLayout>
-	        
-			<Button
-				android:id="@+id/account_register"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_below="@id/buttons_layout"
-				android:layout_centerHorizontal="true"
-				android:onClick="onRegisterClick"
-				android:paddingTop="10dp"
-				android:paddingBottom="10dp"
-				android:textColor="#0000FF"
-				android:background="@android:color/transparent" />
-			
-			<Button
-				android:id="@+id/account_register"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_below="@id/buttons_layout"
-				android:layout_centerHorizontal="true"
-				android:onClick="onRegisterClick"
-				android:paddingTop="10dp"
-				android:paddingBottom="10dp"
-				android:textColor="#0000FF"
-				android:background="@android:color/transparent" />
-				<!-- android:text="@string/app_name @string/auth_register" /-->
-	        
-	    </RelativeLayout>
+        <ImageView
+            android:id="@+id/imageView1"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="10dp"
+            android:layout_marginTop="10dp"
+            android:src="@drawable/logo" />
 
-	</LinearLayout>
-			
-</ScrollView>
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" >
+
+            <EditText
+                android:id="@+id/hostUrlInput"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:ems="10"
+                android:hint="@string/auth_host_url"
+                android:inputType="textUri" >
+
+                <requestFocus />
+            </EditText>
+
+            <ImageView
+                android:id="@+id/refreshButton"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="right|center_vertical"
+                android:src="@drawable/ic_action_refresh_black"
+                android:visibility="invisible" />
+        </FrameLayout>
+
+        <TextView
+            android:id="@+id/server_status_text"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="10dp"
+            android:drawableLeft="@android:drawable/stat_notify_sync"
+            android:drawablePadding="5dp"
+            android:gravity="center_vertical"
+            android:text="@string/auth_testing_connection" />
+
+        <CheckBox
+            android:id="@+id/oauth_onOff_check"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:checked="false"
+            android:onClick="onCheckClick"
+            android:text="@string/oauth_check_onoff"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:visibility="gone" />
+
+        <EditText
+            android:id="@+id/oAuthEntryPoint_1"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:ems="10"
+            android:inputType="textUri"
+            android:singleLine="true"
+            android:text="@string/oauth2_url_endpoint_auth"
+            android:visibility="gone" >
+        </EditText>
+
+        <EditText
+            android:id="@+id/oAuthEntryPoint_2"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:ems="10"
+            android:inputType="textUri"
+            android:singleLine="true"
+            android:text="@string/oauth2_url_endpoint_access"
+            android:visibility="gone" />
+
+        <EditText
+            android:id="@+id/account_username"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:ems="10"
+            android:hint="@string/auth_username"
+            android:inputType="textNoSuggestions" />
+
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" >
+
+            <EditText
+                android:id="@+id/account_password"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:ems="10"
+                android:hint="@string/auth_password"
+                android:inputType="textPassword" />
+
+            <ImageView
+                android:id="@+id/viewPasswordButton"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="right|center_vertical"
+                android:onClick="onViewPasswordClick"
+                android:src="@android:drawable/ic_menu_view"
+                android:visibility="invisible" />
+        </FrameLayout>
+
+        <TextView
+            android:id="@+id/auth_status_text"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="10dp"
+            android:drawableLeft="@android:drawable/stat_notify_sync"
+            android:drawablePadding="5dp"
+            android:gravity="center_vertical"
+            android:text="@string/auth_unauthorized" />
+
+        <Button
+            android:id="@+id/buttonOK"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:enabled="false"
+            android:onClick="onOkClick"
+            android:text="@string/setup_btn_connect"
+            android:textColor="@android:color/black" />
+
+        <Button
+            android:id="@+id/account_register"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="@android:color/transparent"
+            android:onClick="onRegisterClick"
+            android:paddingBottom="10dp"
+            android:paddingTop="10dp"
+            android:text="@string/auth_register"
+            android:textColor="#0000FF" />
+    </LinearLayout>
+
+</ScrollView>
\ No newline at end of file
diff --git a/res/layout/file_preview.xml b/res/layout/file_preview.xml
index 22528a789e..ec69fe7dd2 100644
--- a/res/layout/file_preview.xml
+++ b/res/layout/file_preview.xml
@@ -42,7 +42,7 @@
 	        android:layout_margin="16dp"
 	        android:layout_gravity="center"
 	        android:contentDescription="@string/preview_image_description"
-	        android:src="@drawable/owncloud_logo" />
+	        android:src="@drawable/logo" />
 	    
 	   	<VideoView  
 	   	    android:id="@+id/video_preview"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 7520dc6024..2d6de4b619 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -200,7 +200,6 @@
     <string name="auth_bad_oc_version_title">Unrecognized server version</string>
     <string name="auth_wrong_connection_title">Couldn\'t establish connection</string>
     <string name="auth_secure_connection">Secure connection established</string>
-    <string name="auth_login_details">Login details</string>
     <string name="auth_unauthorized">Invalid credentials</string>
 	<string name="auth_oauth_error">Unsuccessful authorization</string>
 	<string name="auth_oauth_error_access_denied">Access denied by authorization server</string>
diff --git a/src/com/owncloud/android/authentication/AuthenticatorActivity.java b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
index ef5c21b51f..e4787fb4e8 100644
--- a/src/com/owncloud/android/authentication/AuthenticatorActivity.java
+++ b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
@@ -178,6 +178,8 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
             mStatusText = mStatusIcon = 0;
             mStatusCorrect = false;
             mIsSslConn = false;
+            updateConnStatus();
+            updateAuthStatus();
             
             /// retrieve extras from intent
             String tokenType = getIntent().getExtras().getString(AccountAuthenticator.KEY_AUTH_TOKEN_TYPE);
@@ -270,7 +272,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
         updateConnStatus();
         
         /// UI settings depending upon connection
-        mOkButton.setEnabled(mStatusCorrect);   // TODO really necessary?
+        mOkButton.setEnabled(mStatusCorrect);  
         if (!mStatusCorrect)
             mRefreshButton.setVisibility(View.VISIBLE); // seems that setting visibility is necessary
         else
@@ -347,7 +349,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
 
         /// GET ACCESS TOKEN to the oAuth server 
         RemoteOperation operation = new OAuth2GetAccessToken(   getString(R.string.oauth2_client_id), 
-                                                                getString(R.string.oauth2_redirect_uri), // TODO check - necessary here?      
+                                                                getString(R.string.oauth2_redirect_uri),       
                                                                 getString(R.string.oauth2_grant_type),
                                                                 queryParameters);
         //WebdavClient client = OwnCloudClientUtils.createOwnCloudClient(Uri.parse(getString(R.string.oauth2_url_endpoint_access)), getApplicationContext());
@@ -964,16 +966,13 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
      * to the last check on the ownCloud server.
      */
     private void updateConnStatus() {
-        ImageView iv = (ImageView) findViewById(R.id.action_indicator);
-        TextView tv = (TextView) findViewById(R.id.status_text);
+        TextView tv = (TextView) findViewById(R.id.server_status_text);
 
         if (mStatusIcon == 0 && mStatusText == 0) {
-            iv.setVisibility(View.INVISIBLE);
             tv.setVisibility(View.INVISIBLE);
         } else {
-            iv.setImageResource(mStatusIcon);
             tv.setText(mStatusText);
-            iv.setVisibility(View.VISIBLE);
+            tv.setCompoundDrawablesWithIntrinsicBounds(mStatusIcon, 0, 0, 0);
             tv.setVisibility(View.VISIBLE);
         }
     }

From 00166fe5a81f78f502b0b7e07acc0c55db290aa0 Mon Sep 17 00:00:00 2001
From: "David A. Velasco" <dvelasco@solidgear.es>
Date: Tue, 14 May 2013 11:06:18 +0200
Subject: [PATCH 02/18] Better position for scroll bar in portrait login view

---
 res/layout/account_setup.xml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/res/layout/account_setup.xml b/res/layout/account_setup.xml
index 7171133e2e..972849125f 100644
--- a/res/layout/account_setup.xml
+++ b/res/layout/account_setup.xml
@@ -23,7 +23,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:layout_gravity="center"
-	android:padding="16dip"
+	android:padding="8dip"
     android:fillViewport="true"
     android:orientation="vertical"
     >
@@ -31,6 +31,7 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+		android:layout_margin="8dip"
         android:gravity="center"
         android:orientation="vertical" 
         android:focusable="true"
@@ -165,8 +166,8 @@
             android:layout_height="wrap_content"
             android:background="@android:color/transparent"
             android:onClick="onRegisterClick"
-            android:paddingBottom="10dp"
-            android:paddingTop="10dp"
+            android:paddingBottom="5dp"
+            android:paddingTop="5dp"
             android:text="@string/auth_register"
             android:textColor="#0000FF" />
     </LinearLayout>

From d7c7ccd99b6761b95f48e98b3ce8b6c9a91824b1 Mon Sep 17 00:00:00 2001
From: "David A. Velasco" <dvelasco@solidgear.es>
Date: Tue, 14 May 2013 11:20:48 +0200
Subject: [PATCH 03/18] Added scroll to login view in landscape

---
 res/layout-land/account_setup.xml | 284 ++++++++++++++++--------------
 res/layout/account_setup.xml      |   4 +-
 2 files changed, 151 insertions(+), 137 deletions(-)

diff --git a/res/layout-land/account_setup.xml b/res/layout-land/account_setup.xml
index f6a0280638..0427dfd23a 100644
--- a/res/layout-land/account_setup.xml
+++ b/res/layout-land/account_setup.xml
@@ -21,7 +21,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:gravity="center|fill" 
-	android:padding="16dip"
+	android:padding="8dip"
     android:focusable="true"
     >
 
@@ -33,139 +33,152 @@
 		android:orientation="horizontal" 
         >
         
-	<ImageView
-		android:id="@+id/imageView1"
-		android:layout_width="0dp"
-		android:layout_height="wrap_content"
-		android:layout_weight="1"
-		android:layout_gravity="center"
-		android:src="@drawable/logo" 
-		/>
-	
-	<LinearLayout
-		android:id="@+id/LinearLayout1"
-		android:layout_width="0dp"
-		android:layout_height="wrap_content"
-		android:layout_weight="1"
-		android:layout_gravity="center"
-		android:orientation="vertical" 
-		>
-
-		<FrameLayout
-			android:layout_width="match_parent"
+		<ImageView
+			android:id="@+id/imageView1"
+			android:layout_width="0dp"
 			android:layout_height="wrap_content"
-		>
-
-			<EditText
-				android:id="@+id/hostUrlInput"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:ems="10"
-				android:hint="@string/auth_host_url"
-				android:inputType="textUri"
-				>
-				<requestFocus />
-			</EditText>
-
-			<ImageView
-				android:id="@+id/refreshButton"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_gravity="right|center_vertical"
-				android:src="@drawable/ic_action_refresh_black"
-				android:onClick="onRefreshClick"
-				android:visibility="invisible" />
-			
-		</FrameLayout>
-
-		<TextView
-			android:id="@+id/server_status_text"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:layout_marginBottom="10dp"
-			android:drawableLeft="@android:drawable/stat_notify_sync"
-			android:drawablePadding="5dp"
-			android:gravity="center_vertical"
-			android:text="@string/auth_testing_connection" />
-             
-		<CheckBox
-			android:id="@+id/oauth_onOff_check"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:checked="false"
-			android:onClick="onCheckClick"
-			android:text="@string/oauth_check_onoff"
-			android:textAppearance="?android:attr/textAppearanceSmall"
-			android:visibility="gone"
+			android:layout_weight="1"
+			android:layout_gravity="center"
+			android:src="@drawable/logo" 
 			/>
-
-		<EditText
-			android:id="@+id/oAuthEntryPoint_1"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:ems="10"
-			android:enabled="false"
-			android:text="@string/oauth2_url_endpoint_auth"
-			android:singleLine="true"
-			android:inputType="textUri"
-			android:visibility="gone" >
-			<requestFocus />
-		</EditText>            
 		
-		<EditText
-			android:id="@+id/oAuthEntryPoint_2"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:ems="10"
-			android:enabled="false"
-			android:text="@string/oauth2_url_endpoint_access"
-			android:singleLine="true"
-			android:inputType="textUri"
-			android:visibility="gone" >
-			<requestFocus />
-		</EditText>            
-
-		<EditText
-			android:id="@+id/account_username"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:ems="10"
-			android:hint="@string/auth_username"
-			android:inputType="textNoSuggestions" />
-
-		<FrameLayout
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			>
-			<EditText
-				android:id="@+id/account_password"
+		<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+		    xmlns:tools="http://schemas.android.com/tools"
+		    android:layout_width="0dp"
+		    android:layout_height="match_parent"
+			android:layout_weight="1"
+		    android:layout_gravity="center"
+		    android:fillViewport="true"
+		    android:orientation="vertical"
+		    >
+						
+			<LinearLayout
+				android:id="@+id/LinearLayout1"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
-				android:ems="10"
-				android:hint="@string/auth_password"
-				android:inputType="textPassword"/>
-			
-			<ImageView
-				android:id="@+id/viewPasswordButton"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_gravity="right|center_vertical"
-				android:src="@android:drawable/ic_menu_view"
-				android:onClick="onViewPasswordClick"
-				android:visibility="invisible" />
-		</FrameLayout>
-     
-		<TextView
-			android:id="@+id/auth_status_text"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:gravity="center_vertical"
-			android:text="@string/auth_unauthorized"
-			android:drawableLeft="@android:drawable/stat_notify_sync"
-			android:drawablePadding="5dip"
-			/>
-	           
-	</LinearLayout>
+				android:layout_gravity="center"
+				android:layout_margin="8dp"
+				android:orientation="vertical" 
+				>
+		
+				<FrameLayout
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+				>
+		
+					<EditText
+						android:id="@+id/hostUrlInput"
+						android:layout_width="match_parent"
+						android:layout_height="wrap_content"
+						android:ems="10"
+						android:hint="@string/auth_host_url"
+						android:inputType="textUri"
+						>
+						<requestFocus />
+					</EditText>
+		
+					<ImageView
+						android:id="@+id/refreshButton"
+						android:layout_width="wrap_content"
+						android:layout_height="wrap_content"
+						android:layout_gravity="right|center_vertical"
+						android:src="@drawable/ic_action_refresh_black"
+						android:onClick="onRefreshClick"
+						android:visibility="invisible" />
+					
+				</FrameLayout>
+		
+				<TextView
+					android:id="@+id/server_status_text"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:layout_marginBottom="10dp"
+					android:drawableLeft="@android:drawable/stat_notify_sync"
+					android:drawablePadding="5dp"
+					android:gravity="center_vertical"
+					android:text="@string/auth_testing_connection" />
+		             
+				<CheckBox
+					android:id="@+id/oauth_onOff_check"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:checked="false"
+					android:onClick="onCheckClick"
+					android:text="@string/oauth_check_onoff"
+					android:textAppearance="?android:attr/textAppearanceSmall"
+					android:visibility="gone"
+					/>
+		
+				<EditText
+					android:id="@+id/oAuthEntryPoint_1"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:ems="10"
+					android:enabled="false"
+					android:text="@string/oauth2_url_endpoint_auth"
+					android:singleLine="true"
+					android:inputType="textUri"
+					android:visibility="gone" >
+					<requestFocus />
+				</EditText>            
+				
+				<EditText
+					android:id="@+id/oAuthEntryPoint_2"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:ems="10"
+					android:enabled="false"
+					android:text="@string/oauth2_url_endpoint_access"
+					android:singleLine="true"
+					android:inputType="textUri"
+					android:visibility="gone" >
+					<requestFocus />
+				</EditText>            
+		
+				<EditText
+					android:id="@+id/account_username"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:ems="10"
+					android:hint="@string/auth_username"
+					android:inputType="textNoSuggestions" />
+		
+				<FrameLayout
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					>
+					<EditText
+						android:id="@+id/account_password"
+						android:layout_width="match_parent"
+						android:layout_height="wrap_content"
+						android:ems="10"
+						android:hint="@string/auth_password"
+						android:inputType="textPassword"/>
+					
+					<ImageView
+						android:id="@+id/viewPasswordButton"
+						android:layout_width="wrap_content"
+						android:layout_height="wrap_content"
+						android:layout_gravity="right|center_vertical"
+						android:src="@android:drawable/ic_menu_view"
+						android:onClick="onViewPasswordClick"
+						android:visibility="invisible" />
+				</FrameLayout>
+		     
+				<TextView
+					android:id="@+id/auth_status_text"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:gravity="center_vertical"
+					android:text="@string/auth_unauthorized"
+					android:drawableLeft="@android:drawable/stat_notify_sync"
+					android:drawablePadding="5dip"
+					/>
+
+			</LinearLayout>
+		
+		</ScrollView>
+						           
 	</LinearLayout>
        
 	<Button
@@ -181,15 +194,16 @@
 
 	<Button
 		android:id="@+id/account_register"
-		android:layout_width="match_parent"
+		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:layout_alignParentBottom="true"
-		android:layout_marginTop="10dp"
 		android:layout_centerHorizontal="true"
-		android:onClick="onRegisterClick"
-		android:textColor="#0000FF"
+		android:layout_alignParentBottom="true"
 		android:background="@android:color/transparent"
+		android:textColor="#0000FF"
+		android:onClick="onRegisterClick"
+		android:paddingTop="5dp"
+		android:paddingBottom="5dp"
 		android:text="@string/auth_register" 
 		/>
-       
+	
 </RelativeLayout>
diff --git a/res/layout/account_setup.xml b/res/layout/account_setup.xml
index 972849125f..35449cd771 100644
--- a/res/layout/account_setup.xml
+++ b/res/layout/account_setup.xml
@@ -19,7 +19,6 @@
 -->
 
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:layout_gravity="center"
@@ -165,11 +164,12 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:background="@android:color/transparent"
+            android:textColor="#0000FF" 
             android:onClick="onRegisterClick"
             android:paddingBottom="5dp"
             android:paddingTop="5dp"
             android:text="@string/auth_register"
-            android:textColor="#0000FF" />
+            />
     </LinearLayout>
 
 </ScrollView>
\ No newline at end of file

From 842f46d7caed7de94c5e230321a5ea675857f320 Mon Sep 17 00:00:00 2001
From: "David A. Velasco" <dvelasco@solidgear.es>
Date: Tue, 14 May 2013 13:18:21 +0200
Subject: [PATCH 04/18] Try authorization when 'enter' is pressed in the touch
 keyboard

---
 .../authentication/AuthenticatorActivity.java | 24 ++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/src/com/owncloud/android/authentication/AuthenticatorActivity.java b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
index e4787fb4e8..dd3b4a0ed7 100644
--- a/src/com/owncloud/android/authentication/AuthenticatorActivity.java
+++ b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
@@ -47,15 +47,18 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.preference.PreferenceManager;
 import android.text.InputType;
+import android.view.KeyEvent;
 import android.view.View;
 import android.view.View.OnFocusChangeListener;
 import android.view.Window;
+import android.view.inputmethod.EditorInfo;
 import android.widget.CheckBox;
 import android.widget.EditText;
 import android.widget.Button;
 import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
+import android.widget.TextView.OnEditorActionListener;
 
 import com.owncloud.android.R;
 
@@ -68,7 +71,7 @@ import eu.alefzero.webdav.WebdavClient;
  * @author David A. Velasco
  */
 public class AuthenticatorActivity extends AccountAuthenticatorActivity
-        implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeListener {
+        implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeListener, OnEditorActionListener {
 
     private static final String TAG = AuthenticatorActivity.class.getSimpleName();
 
@@ -166,6 +169,8 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
         /// bind view elements to listeners
         mHostUrlInput.setOnFocusChangeListener(this);
         mPasswordInput.setOnFocusChangeListener(this);
+        mPasswordInput.setImeOptions(EditorInfo.IME_ACTION_DONE);
+        mPasswordInput.setOnEditorActionListener(this);
         
         /// initialization
         mAccountMgr = AccountManager.get(this);
@@ -1081,4 +1086,21 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
         showDialog(DIALOG_CERT_NOT_SAVED);
     }
 
+
+    /**
+     *  Called when the 'action' button in an IME is pressed ('enter' in software keyboard).
+     * 
+     *  Used to trigger the authorization check when the user presses 'enter' after writing the password.
+     */
+    @Override
+    public boolean onEditorAction(TextView inputField, int actionId, KeyEvent event) {
+        if (inputField != null && inputField.equals(mPasswordInput) && 
+                actionId == EditorInfo.IME_ACTION_DONE) {
+            if (mOkButton.isEnabled()) {
+                mOkButton.performClick();
+            }
+        }
+        return false;   // always return false to grant that the software keyboard is hidden anyway
+    }
+
 }

From 3eb602f81a7a0becf84f24a4a2b246536dd84ab9 Mon Sep 17 00:00:00 2001
From: "David A. Velasco" <dvelasco@solidgear.es>
Date: Tue, 14 May 2013 13:39:09 +0200
Subject: [PATCH 05/18] Fixed unlinked refresh button for the server connection
 check

---
 res/layout/account_setup.xml                                    | 1 +
 .../owncloud/android/authentication/AuthenticatorActivity.java  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/res/layout/account_setup.xml b/res/layout/account_setup.xml
index 35449cd771..2258304500 100644
--- a/res/layout/account_setup.xml
+++ b/res/layout/account_setup.xml
@@ -65,6 +65,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="right|center_vertical"
                 android:src="@drawable/ic_action_refresh_black"
+            	android:onClick="onRefreshClick"
                 android:visibility="invisible" />
         </FrameLayout>
 
diff --git a/src/com/owncloud/android/authentication/AuthenticatorActivity.java b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
index dd3b4a0ed7..ca2c1a8d92 100644
--- a/src/com/owncloud/android/authentication/AuthenticatorActivity.java
+++ b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
@@ -1006,7 +1006,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
      * @param view      Refresh 'button'
      */
     public void onRefreshClick(View view) {
-        onFocusChange(mRefreshButton, false);
+        onFocusChange(mHostUrlInput, false);
     }
     
     

From 4f524a2043b5946791586d1408226f8de33115c0 Mon Sep 17 00:00:00 2001
From: "David A. Velasco" <dvelasco@solidgear.es>
Date: Tue, 14 May 2013 15:19:43 +0200
Subject: [PATCH 06/18] Grant that 'refresh' button embedded in the URL input
 field does not hide the text in the field

---
 res/layout-land/account_setup.xml             | 33 +++------
 res/layout/account_setup.xml                  | 35 +++-------
 .../authentication/AuthenticatorActivity.java | 68 ++++++++++++++++---
 3 files changed, 77 insertions(+), 59 deletions(-)

diff --git a/res/layout-land/account_setup.xml b/res/layout-land/account_setup.xml
index 0427dfd23a..41fa06e1be 100644
--- a/res/layout-land/account_setup.xml
+++ b/res/layout-land/account_setup.xml
@@ -61,32 +61,17 @@
 				android:orientation="vertical" 
 				>
 		
-				<FrameLayout
+				<EditText
+					android:id="@+id/hostUrlInput"
 					android:layout_width="match_parent"
 					android:layout_height="wrap_content"
-				>
-		
-					<EditText
-						android:id="@+id/hostUrlInput"
-						android:layout_width="match_parent"
-						android:layout_height="wrap_content"
-						android:ems="10"
-						android:hint="@string/auth_host_url"
-						android:inputType="textUri"
-						>
-						<requestFocus />
-					</EditText>
-		
-					<ImageView
-						android:id="@+id/refreshButton"
-						android:layout_width="wrap_content"
-						android:layout_height="wrap_content"
-						android:layout_gravity="right|center_vertical"
-						android:src="@drawable/ic_action_refresh_black"
-						android:onClick="onRefreshClick"
-						android:visibility="invisible" />
-					
-				</FrameLayout>
+					android:ems="10"
+					android:hint="@string/auth_host_url"
+					android:inputType="textUri"
+					android:drawablePadding="5dp"
+					>
+					<requestFocus />
+				</EditText>
 		
 				<TextView
 					android:id="@+id/server_status_text"
diff --git a/res/layout/account_setup.xml b/res/layout/account_setup.xml
index 2258304500..65237a8b2b 100644
--- a/res/layout/account_setup.xml
+++ b/res/layout/account_setup.xml
@@ -44,30 +44,17 @@
             android:layout_marginTop="10dp"
             android:src="@drawable/logo" />
 
-        <FrameLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content" >
-
-            <EditText
-                android:id="@+id/hostUrlInput"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:ems="10"
-                android:hint="@string/auth_host_url"
-                android:inputType="textUri" >
-
-                <requestFocus />
-            </EditText>
-
-            <ImageView
-                android:id="@+id/refreshButton"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="right|center_vertical"
-                android:src="@drawable/ic_action_refresh_black"
-            	android:onClick="onRefreshClick"
-                android:visibility="invisible" />
-        </FrameLayout>
+		<EditText
+			android:id="@+id/hostUrlInput"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:ems="10"
+			android:hint="@string/auth_host_url"
+			android:inputType="textUri"
+			android:drawablePadding="5dp"
+			>
+			<requestFocus />
+		</EditText>
 
         <TextView
             android:id="@+id/server_status_text"
diff --git a/src/com/owncloud/android/authentication/AuthenticatorActivity.java b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
index ca2c1a8d92..141cd54b6e 100644
--- a/src/com/owncloud/android/authentication/AuthenticatorActivity.java
+++ b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
@@ -42,14 +42,18 @@ import android.content.ContentResolver;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
+import android.graphics.Rect;
+import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
 import android.preference.PreferenceManager;
 import android.text.InputType;
 import android.view.KeyEvent;
+import android.view.MotionEvent;
 import android.view.View;
 import android.view.View.OnFocusChangeListener;
+import android.view.View.OnTouchListener;
 import android.view.Window;
 import android.view.inputmethod.EditorInfo;
 import android.widget.CheckBox;
@@ -123,7 +127,6 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
     private byte mAction;
     private Account mAccount;
     
-    private ImageView mRefreshButton;
     private ImageView mViewPasswordButton;
     private EditText mHostUrlInput;
     private EditText mUsernameInput;
@@ -149,7 +152,6 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
         
         /// set view and get references to view elements
         setContentView(R.layout.account_setup);
-        mRefreshButton = (ImageView) findViewById(R.id.refreshButton);
         mViewPasswordButton = (ImageView) findViewById(R.id.viewPasswordButton);
         mHostUrlInput = (EditText) findViewById(R.id.hostUrlInput);
         mUsernameInput = (EditText) findViewById(R.id.account_username);
@@ -168,6 +170,13 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
 
         /// bind view elements to listeners
         mHostUrlInput.setOnFocusChangeListener(this);
+        mHostUrlInput.setOnTouchListener(new RightDrawableOnTouchListener() {
+            @Override
+            public boolean onDrawableTouch(final MotionEvent event) {
+                AuthenticatorActivity.this.onRefreshClick(mHostUrlInput);
+                return true;
+            }
+        });
         mPasswordInput.setOnFocusChangeListener(this);
         mPasswordInput.setImeOptions(EditorInfo.IME_ACTION_DONE);
         mPasswordInput.setOnEditorActionListener(this);
@@ -278,10 +287,11 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
         
         /// UI settings depending upon connection
         mOkButton.setEnabled(mStatusCorrect);  
-        if (!mStatusCorrect)
-            mRefreshButton.setVisibility(View.VISIBLE); // seems that setting visibility is necessary
-        else
-            mRefreshButton.setVisibility(View.INVISIBLE);
+        if (!mStatusCorrect) {
+            mHostUrlInput.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.ic_action_refresh_black, 0);
+        } else {
+            mHostUrlInput.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0);
+        }
         
         /// server data
         String ocVersion = savedInstanceState.getString(KEY_OC_VERSION);
@@ -416,7 +426,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
             mDiscoveredVersion = null;
             mOperationThread = mOcServerChkOperation.execute(client, this, mHandler);
         } else {
-            mRefreshButton.setVisibility(View.INVISIBLE);
+            mHostUrlInput.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0);
             mStatusText = 0;
             mStatusIcon = 0;
             updateConnStatus();
@@ -589,10 +599,11 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
         }
         
         /// update the visibility of the 'retry connection' button
-        if (!mStatusCorrect)
-            mRefreshButton.setVisibility(View.VISIBLE);
-        else
-            mRefreshButton.setVisibility(View.INVISIBLE);
+        if (!mStatusCorrect) {
+            mHostUrlInput.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.ic_action_refresh_black, 0);
+        } else {
+            mHostUrlInput.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0);
+        }
         
         /// retrieve discovered version and normalize server URL
         mDiscoveredVersion = operation.getDiscoveredVersion();
@@ -1103,4 +1114,39 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
         return false;   // always return false to grant that the software keyboard is hidden anyway
     }
 
+    
+    private abstract static class RightDrawableOnTouchListener implements OnTouchListener  {
+
+        private int fuzz = 10;
+        
+        /**
+         * {@inheritDoc}
+         */
+        @Override
+        public boolean onTouch(View view, MotionEvent event) {
+            if (event.getAction() == MotionEvent.ACTION_DOWN) {
+                Drawable rightDrawable = null;
+                if (view instanceof TextView) {
+                    Drawable[] drawables = ((TextView)view).getCompoundDrawables();
+                    if (drawables.length > 2) {
+                        rightDrawable = drawables[2];
+                    }
+                }
+                if (rightDrawable != null) {
+                    final int x = (int) event.getX();
+                    final int y = (int) event.getY();
+                    final Rect bounds = rightDrawable.getBounds();
+                    if (x >= (view.getRight() - bounds.width() - fuzz) && x <= (view.getRight() - view.getPaddingRight() + fuzz)
+                        && y >= (view.getPaddingTop() - fuzz) && y <= (view.getHeight() - view.getPaddingBottom()) + fuzz) {
+                        
+                        return onDrawableTouch(event);
+                    }
+                }
+            }
+            return false;
+        }
+        
+        public abstract boolean onDrawableTouch(final MotionEvent event);
+    }
+    
 }

From b8fbf38c560aeda33973e939e0d34eaae42c4694 Mon Sep 17 00:00:00 2001
From: "David A. Velasco" <dvelasco@solidgear.es>
Date: Wed, 15 May 2013 17:21:43 +0200
Subject: [PATCH 07/18] Fixed form gravity in login view, in landscape

---
 res/layout-land/account_setup.xml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/res/layout-land/account_setup.xml b/res/layout-land/account_setup.xml
index 41fa06e1be..59ec23381c 100644
--- a/res/layout-land/account_setup.xml
+++ b/res/layout-land/account_setup.xml
@@ -20,9 +20,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:gravity="center|fill" 
 	android:padding="8dip"
-    android:focusable="true"
     >
 
     <LinearLayout
@@ -42,8 +40,7 @@
 			android:src="@drawable/logo" 
 			/>
 		
-		<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-		    xmlns:tools="http://schemas.android.com/tools"
+		<ScrollView
 		    android:layout_width="0dp"
 		    android:layout_height="match_parent"
 			android:layout_weight="1"
@@ -58,7 +55,9 @@
 				android:layout_height="wrap_content"
 				android:layout_gravity="center"
 				android:layout_margin="8dp"
-				android:orientation="vertical" 
+				android:gravity="center"
+				android:orientation="vertical"
+				android:focusable="true" 
 				>
 		
 				<EditText

From 17776812eef33657e94549c36a751066af81b4be Mon Sep 17 00:00:00 2001
From: "David A. Velasco" <dvelasco@solidgear.es>
Date: Thu, 16 May 2013 12:30:37 +0200
Subject: [PATCH 08/18] Prevented server check due to orientation change in
 login view

---
 .../authentication/AuthenticatorActivity.java | 465 ++++++++++--------
 1 file changed, 248 insertions(+), 217 deletions(-)

diff --git a/src/com/owncloud/android/authentication/AuthenticatorActivity.java b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
index 141cd54b6e..120fbde115 100644
--- a/src/com/owncloud/android/authentication/AuthenticatorActivity.java
+++ b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
@@ -48,7 +48,9 @@ import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
 import android.preference.PreferenceManager;
+import android.text.Editable;
 import android.text.InputType;
+import android.text.TextWatcher;
 import android.view.KeyEvent;
 import android.view.MotionEvent;
 import android.view.View;
@@ -87,12 +89,13 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
     private static final String KEY_HOST_URL_TEXT = "HOST_URL_TEXT";
     private static final String KEY_OC_VERSION = "OC_VERSION";
     private static final String KEY_ACCOUNT = "ACCOUNT";
-    private static final String KEY_STATUS_TEXT = "STATUS_TEXT";
-    private static final String KEY_STATUS_ICON = "STATUS_ICON";
-    private static final String KEY_STATUS_CORRECT = "STATUS_CORRECT";
+    private static final String KEY_SERVER_CHECKED_AND_VALID = "SERVER_CHECKED_AND_VALID";
+    private static final String KEY_SERVER_CHECK_IN_PROGRESS = "SERVER_CHECK_IN_PROGRESS"; 
+    private static final String KEY_SERVER_STATUS_TEXT = "SERVER_STATUS_TEXT";
+    private static final String KEY_SERVER_STATUS_ICON = "SERVER_STATUS_ICON";
     private static final String KEY_IS_SSL_CONN = "IS_SSL_CONN";
-    private static final String KEY_OAUTH2_STATUS_TEXT = "OAUTH2_STATUS_TEXT";
-    private static final String KEY_OAUTH2_STATUS_ICON = "OAUTH2_STATUS_ICON";
+    private static final String KEY_AUTH_STATUS_TEXT = "AUTH_STATUS_TEXT";
+    private static final String KEY_AUTH_STATUS_ICON = "AUTH_STATUS_ICON";
     
     private static final String OAUTH_MODE_ON = "on";
     private static final String OAUTH_MODE_OFF = "off";
@@ -110,9 +113,9 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
     private String mHostBaseUrl;
     private OwnCloudVersion mDiscoveredVersion;
     
-    private int mStatusText, mStatusIcon;
-    private boolean mStatusCorrect, mIsSslConn;
-    private int mOAuth2StatusText, mOAuth2StatusIcon;    
+    private int mServerStatusText, mServerStatusIcon;
+    private boolean mServerCheckedAndValid, mIsSslConn;
+    private int mAuthStatusText, mAuthStatusIcon;    
     
     private final Handler mHandler = new Handler();
     private Thread mOperationThread;
@@ -138,6 +141,8 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
     
     private TextView mOAuthAuthEndpointText;
     private TextView mOAuthTokenEndpointText;
+
+    private HostUrlWatcher mHostUrlChangedListener;
     
     
     /**
@@ -168,6 +173,86 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
             b.setText(String.format(getString(R.string.auth_register), getString(R.string.app_name)));
         }
 
+        /// initialization
+        mAccountMgr = AccountManager.get(this);
+        mNewCapturedUriFromOAuth2Redirection = null;
+        mAction = getIntent().getByteExtra(EXTRA_ACTION, ACTION_CREATE); 
+        mAccount = null;
+        mHostBaseUrl = "";
+
+        if (savedInstanceState == null) {
+            /// connection state and info
+            mServerStatusText = mServerStatusIcon = 0;
+            mServerCheckedAndValid = false;
+            mIsSslConn = false;
+            mAuthStatusText = mAuthStatusIcon = 0;
+            
+            /// retrieve extras from intent
+            String tokenType = getIntent().getExtras().getString(AccountAuthenticator.KEY_AUTH_TOKEN_TYPE);
+            boolean oAuthRequired = AccountAuthenticator.AUTH_TOKEN_TYPE_ACCESS_TOKEN.equals(tokenType) || OAUTH_MODE_ON.equals(getString(R.string.oauth2_mode));
+            
+            mAccount = getIntent().getExtras().getParcelable(EXTRA_ACCOUNT);
+            if (mAccount != null) {
+                String ocVersion = mAccountMgr.getUserData(mAccount, AccountAuthenticator.KEY_OC_VERSION);
+                if (ocVersion != null) {
+                    mDiscoveredVersion = new OwnCloudVersion(ocVersion);
+                }
+                mHostBaseUrl = normalizeUrl(mAccountMgr.getUserData(mAccount, AccountAuthenticator.KEY_OC_BASE_URL));
+                mHostUrlInput.setText(mHostBaseUrl);
+                String userName = mAccount.name.substring(0, mAccount.name.lastIndexOf('@'));
+                mUsernameInput.setText(userName);
+                oAuthRequired = (mAccountMgr.getUserData(mAccount, AccountAuthenticator.KEY_SUPPORTS_OAUTH2) != null);
+            }
+            mOAuth2Check.setChecked(oAuthRequired);
+            changeViewByOAuth2Check(oAuthRequired);
+            
+
+        } else {
+            /// connection state and info
+            mServerCheckedAndValid = savedInstanceState.getBoolean(KEY_SERVER_CHECKED_AND_VALID);
+            mServerStatusText = savedInstanceState.getInt(KEY_SERVER_STATUS_TEXT);
+            mServerStatusIcon = savedInstanceState.getInt(KEY_SERVER_STATUS_ICON);
+            mIsSslConn = savedInstanceState.getBoolean(KEY_IS_SSL_CONN);
+            mAuthStatusText = savedInstanceState.getInt(KEY_AUTH_STATUS_TEXT);
+            mAuthStatusIcon = savedInstanceState.getInt(KEY_AUTH_STATUS_ICON);
+            
+            /// server data
+            String ocVersion = savedInstanceState.getString(KEY_OC_VERSION);
+            if (ocVersion != null) {
+                mDiscoveredVersion = new OwnCloudVersion(ocVersion);
+            }
+            mHostBaseUrl = savedInstanceState.getString(KEY_HOST_URL_TEXT);
+            
+            // account data, if updating
+            mAccount = savedInstanceState.getParcelable(KEY_ACCOUNT);
+            
+            // check if server check was interrupted by a configuration change
+            if (savedInstanceState.getBoolean(KEY_SERVER_CHECK_IN_PROGRESS, false)) {
+                checkOcServer();
+            }
+            
+        }
+        
+        showServerStatus();
+        showAuthStatus();
+        
+        if (!OAUTH_MODE_OPTIONAL.equals(getString(R.string.oauth2_mode))) {
+            mOAuth2Check.setVisibility(View.GONE);
+        }
+        
+        if (mAction == ACTION_UPDATE_TOKEN) {
+            /// lock things that should not change
+            mHostUrlInput.setEnabled(false);
+            mUsernameInput.setEnabled(false);
+            mOAuth2Check.setVisibility(View.GONE);
+            if (!mServerCheckedAndValid && mOcServerChkOperation == null) {
+                checkOcServer(); 
+            }
+        }
+        
+        mPasswordInput.setText("");     // clean password to avoid social hacking (disadvantage: password in removed if the device is turned aside)
+        mJustCreated = true;
+        
         /// bind view elements to listeners
         mHostUrlInput.setOnFocusChangeListener(this);
         mHostUrlInput.setOnTouchListener(new RightDrawableOnTouchListener() {
@@ -180,61 +265,21 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
         mPasswordInput.setOnFocusChangeListener(this);
         mPasswordInput.setImeOptions(EditorInfo.IME_ACTION_DONE);
         mPasswordInput.setOnEditorActionListener(this);
-        
-        /// initialization
-        mAccountMgr = AccountManager.get(this);
-        mNewCapturedUriFromOAuth2Redirection = null;
-        mAction = getIntent().getByteExtra(EXTRA_ACTION, ACTION_CREATE); 
-        mAccount = null;
-
-        if (savedInstanceState == null) {
-            /// connection state and info
-            mStatusText = mStatusIcon = 0;
-            mStatusCorrect = false;
-            mIsSslConn = false;
-            updateConnStatus();
-            updateAuthStatus();
-            
-            /// retrieve extras from intent
-            String tokenType = getIntent().getExtras().getString(AccountAuthenticator.KEY_AUTH_TOKEN_TYPE);
-            boolean oAuthRequired = AccountAuthenticator.AUTH_TOKEN_TYPE_ACCESS_TOKEN.equals(tokenType) || OAUTH_MODE_ON.equals(getString(R.string.oauth2_mode));
-            
-            mAccount = getIntent().getExtras().getParcelable(EXTRA_ACCOUNT);
-            if (mAccount != null) {
-                String ocVersion = mAccountMgr.getUserData(mAccount, AccountAuthenticator.KEY_OC_VERSION);
-                if (ocVersion != null) {
-                    mDiscoveredVersion = new OwnCloudVersion(ocVersion);
-                }
-                mHostBaseUrl = mAccountMgr.getUserData(mAccount, AccountAuthenticator.KEY_OC_BASE_URL);
-                mHostUrlInput.setText(mHostBaseUrl);
-                String userName = mAccount.name.substring(0, mAccount.name.lastIndexOf('@'));
-                mUsernameInput.setText(userName);
-                oAuthRequired = (mAccountMgr.getUserData(mAccount, AccountAuthenticator.KEY_SUPPORTS_OAUTH2) != null);
-            }
-            mOAuth2Check.setChecked(oAuthRequired);
-            changeViewByOAuth2Check(oAuthRequired);
-            
-
-        } else {
-            loadSavedInstanceState(savedInstanceState);
-        }
-        
-        if (!OAUTH_MODE_OPTIONAL.equals(getString(R.string.oauth2_mode))) {
-            mOAuth2Check.setVisibility(View.GONE);
-        }
-        
-        if (mAction == ACTION_UPDATE_TOKEN) {
-            /// lock things that should not change
-            mHostUrlInput.setEnabled(false);
-            mUsernameInput.setEnabled(false);
-            mOAuth2Check.setVisibility(View.GONE);
-            checkOcServer(); 
-        }
-        
-        mPasswordInput.setText("");     // clean password to avoid social hacking (disadvantage: password in removed if the device is turned aside)
-        mJustCreated = true;
+    }
+    
+    @Override
+    protected void onStart() {
+        super.onStart();
+        //mHostUrlChangedListener = new  HostUrlWatcher();
+        //mHostUrlInput.addTextChangedListener(mHostUrlChangedListener);    
     }
 
+    @Override
+    protected void onStop() {
+        super.onStop();
+        mHostUrlInput.removeTextChangedListener(mHostUrlChangedListener);
+    }
+    
 
     /**
      * Saves relevant state before {@link #onPause()}
@@ -249,66 +294,28 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
         super.onSaveInstanceState(outState);
         
         /// connection state and info
-        outState.putInt(KEY_STATUS_TEXT, mStatusText);
-        outState.putInt(KEY_STATUS_ICON, mStatusIcon);
-        outState.putBoolean(KEY_STATUS_CORRECT, mStatusCorrect);
+        outState.putInt(KEY_SERVER_STATUS_TEXT, mServerStatusText);
+        outState.putInt(KEY_SERVER_STATUS_ICON, mServerStatusIcon);
+        outState.putBoolean(KEY_SERVER_CHECKED_AND_VALID, mServerCheckedAndValid);
+        outState.putBoolean(KEY_SERVER_CHECK_IN_PROGRESS, (!mServerCheckedAndValid && mOcServerChkOperation != null));
         outState.putBoolean(KEY_IS_SSL_CONN, mIsSslConn);
-
+        outState.putInt(KEY_AUTH_STATUS_ICON, mAuthStatusIcon);
+        outState.putInt(KEY_AUTH_STATUS_TEXT, mAuthStatusText);
+        
         /// server data
-        if (mDiscoveredVersion != null) 
+        if (mDiscoveredVersion != null) {
             outState.putString(KEY_OC_VERSION, mDiscoveredVersion.toString());
+        }
         outState.putString(KEY_HOST_URL_TEXT, mHostBaseUrl);
         
         /// account data, if updating
-        if (mAccount != null)
+        if (mAccount != null) {
             outState.putParcelable(KEY_ACCOUNT, mAccount);
-        
-        // Saving the state of oAuth2 components.
-        outState.putInt(KEY_OAUTH2_STATUS_ICON, mOAuth2StatusIcon);
-        outState.putInt(KEY_OAUTH2_STATUS_TEXT, mOAuth2StatusText);
-        
-    }
-
-
-    /**
-     * Loads saved state
-     * 
-     * See {@link #onSaveInstanceState(Bundle)}.
-     * 
-     * @param savedInstanceState    Saved state, as received in {@link #onCreate(Bundle)}.
-     */
-    private void loadSavedInstanceState(Bundle savedInstanceState) {
-        /// connection state and info
-        mStatusCorrect = savedInstanceState.getBoolean(KEY_STATUS_CORRECT);
-        mIsSslConn = savedInstanceState.getBoolean(KEY_IS_SSL_CONN);
-        mStatusText = savedInstanceState.getInt(KEY_STATUS_TEXT);
-        mStatusIcon = savedInstanceState.getInt(KEY_STATUS_ICON);
-        updateConnStatus();
-        
-        /// UI settings depending upon connection
-        mOkButton.setEnabled(mStatusCorrect);  
-        if (!mStatusCorrect) {
-            mHostUrlInput.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.ic_action_refresh_black, 0);
-        } else {
-            mHostUrlInput.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0);
         }
         
-        /// server data
-        String ocVersion = savedInstanceState.getString(KEY_OC_VERSION);
-        if (ocVersion != null)
-            mDiscoveredVersion = new OwnCloudVersion(ocVersion);
-        mHostBaseUrl = savedInstanceState.getString(KEY_HOST_URL_TEXT);
-        
-        // account data, if updating
-        mAccount = savedInstanceState.getParcelable(KEY_ACCOUNT);
-        
-        // state of oAuth2 components
-        mOAuth2StatusIcon = savedInstanceState.getInt(KEY_OAUTH2_STATUS_ICON);
-        mOAuth2StatusText = savedInstanceState.getInt(KEY_OAUTH2_STATUS_TEXT);
-        // END of getting the state of oAuth2 components.
     }
 
-    
+
     /**
      * The redirection triggered by the OAuth authentication server as response to the GET AUTHORIZATION request
      * is caught here.
@@ -378,8 +385,8 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
      * Handles the change of focus on the text inputs for the server URL and the password
      */
     public void onFocusChange(View view, boolean hasFocus) {
-        if (view.getId() == R.id.hostUrlInput) {
-            onUrlInputFocusChanged((TextView) view, hasFocus);
+        if (view.getId() == R.id.hostUrlInput && !hasFocus) {
+            onUrlInputFocusLost((TextView) view);
             
         } else if (view.getId() == R.id.account_password) {
             onPasswordFocusChanged((TextView) view, hasFocus);
@@ -397,15 +404,10 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
      * When hasFocus:    user 'comes back' to write again the server URL.
      * 
      * @param hostInput     TextView with the URL input field receiving the change of focus.
-     * @param hasFocus      'True' if focus is received, 'false' if is lost
      */
-    private void onUrlInputFocusChanged(TextView hostInput, boolean hasFocus) {
-        if (!hasFocus) {
+    private void onUrlInputFocusLost(TextView hostInput) {
+        if (!mHostBaseUrl.equals(normalizeUrl(mHostUrlInput.getText().toString()))) {
             checkOcServer();
-            
-        } else {
-            // avoids that the 'connect' button can be clicked if the test was previously passed
-            mOkButton.setEnabled(false); 
         }
     }
 
@@ -413,23 +415,20 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
     private void checkOcServer() {
         String uri = mHostUrlInput.getText().toString().trim();
         if (uri.length() != 0) {
-            mStatusText = R.string.auth_testing_connection;
-            mStatusIcon = R.drawable.progress_small;
-            updateConnStatus();
-            /** TODO cancel previous connection check if the user tries to ammend a wrong URL  
-            if(mConnChkOperation != null) {
-                mConnChkOperation.cancel();
-            } */
+            mServerCheckedAndValid = false;
+            mOkButton.setEnabled(false);
+            mServerStatusText = R.string.auth_testing_connection;
+            mServerStatusIcon = R.drawable.progress_small;
+            showServerStatus();
             mOcServerChkOperation = new  OwnCloudServerCheckOperation(uri, this);
             WebdavClient client = OwnCloudClientUtils.createOwnCloudClient(Uri.parse(uri), this);
-            mHostBaseUrl = "";
             mDiscoveredVersion = null;
             mOperationThread = mOcServerChkOperation.execute(client, this, mHandler);
         } else {
             mHostUrlInput.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0);
-            mStatusText = 0;
-            mStatusIcon = 0;
-            updateConnStatus();
+            mServerStatusText = 0;
+            mServerStatusIcon = 0;
+            showServerStatus();
         }
     }
 
@@ -489,9 +488,9 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
     public void onOkClick(View view) {
         // this check should be unnecessary
         if (mDiscoveredVersion == null || !mDiscoveredVersion.isVersionValid()  || mHostBaseUrl == null || mHostBaseUrl.length() == 0) {
-            mStatusIcon = R.drawable.common_error;
-            mStatusText = R.string.auth_wtf_reenter_URL;
-            updateConnStatus();
+            mServerStatusIcon = R.drawable.common_error;
+            mServerStatusText = R.string.auth_wtf_reenter_URL;
+            showServerStatus();
             mOkButton.setEnabled(false);
             Log_OC.wtf(TAG,  "The user was allowed to click 'connect' to an unchecked server!!");
             return;
@@ -535,9 +534,9 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
      */
     private void startOauthorization() {
         // be gentle with the user
-        mStatusIcon = R.drawable.progress_small;
-        mStatusText = R.string.oauth_login_connection;
-        updateAuthStatus();
+        mServerStatusIcon = R.drawable.progress_small;
+        mServerStatusText = R.string.oauth_login_connection;
+        showAuthStatus();
         
         // GET AUTHORIZATION request
         //Uri uri = Uri.parse(getString(R.string.oauth2_url_endpoint_auth));
@@ -584,132 +583,144 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
      * @param result        Result of the check.
      */
     private void onOcServerCheckFinish(OwnCloudServerCheckOperation operation, RemoteOperationResult result) {
-        /// update status icon and text
-        updateStatusIconAndText(result);
-        updateConnStatus();
-
-        /// save result state
-        mStatusCorrect = result.isSuccess();
-        mIsSslConn = (result.getCode() == ResultCode.OK_SSL);
-        
-        /// very special case (TODO: move to a common place for all the remote operations)
-        if (result.getCode() == ResultCode.SSL_RECOVERABLE_PEER_UNVERIFIED) {
-            mLastSslUntrustedServerResult = result;
-            showDialog(DIALOG_SSL_VALIDATOR); 
-        }
-        
-        /// update the visibility of the 'retry connection' button
-        if (!mStatusCorrect) {
-            mHostUrlInput.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.ic_action_refresh_black, 0);
-        } else {
-            mHostUrlInput.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0);
-        }
-        
-        /// retrieve discovered version and normalize server URL
-        mDiscoveredVersion = operation.getDiscoveredVersion();
-        mHostBaseUrl = mHostUrlInput.getText().toString().trim();
-        if (!mHostBaseUrl.toLowerCase().startsWith("http://") &&
-            !mHostBaseUrl.toLowerCase().startsWith("https://")) {
+        if (operation.equals(mOcServerChkOperation)) {
+            /// save result state
+            mServerCheckedAndValid = result.isSuccess();
+            mIsSslConn = (result.getCode() == ResultCode.OK_SSL);
+            mOcServerChkOperation = null;
             
-            if (mIsSslConn) {
-                mHostBaseUrl = "https://" + mHostBaseUrl;
-            } else {
-                mHostBaseUrl = "http://" + mHostBaseUrl;
+            /// update status icon and text
+            updateStatusIconAndText(result);
+            showServerStatus();
+    
+            /// very special case (TODO: move to a common place for all the remote operations)
+            if (result.getCode() == ResultCode.SSL_RECOVERABLE_PEER_UNVERIFIED) {
+                mLastSslUntrustedServerResult = result;
+                showDialog(DIALOG_SSL_VALIDATOR); 
             }
             
-        }
-        if (mHostBaseUrl.endsWith("/"))
-            mHostBaseUrl = mHostBaseUrl.substring(0, mHostBaseUrl.length() - 1);
-        
-        /// allow or not the user try to access the server
-        mOkButton.setEnabled(mStatusCorrect);
+            /// update the visibility of the 'retry connection' button
+            if (!mServerCheckedAndValid) {
+                mHostUrlInput.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.ic_action_refresh_black, 0);
+            } else {
+                mHostUrlInput.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0);
+            }
+            
+            /// retrieve discovered version and normalize server URL
+            mDiscoveredVersion = operation.getDiscoveredVersion();
+            mHostBaseUrl = normalizeUrl(mHostUrlInput.getText().toString());
+            
+            /// allow or not the user try to access the server
+            mOkButton.setEnabled(mServerCheckedAndValid);
+            
+        }   // else nothing ; only the last check operation is considered; 
+            // multiple can be triggered if the user amends a URL before a previous check can be triggered
     }
 
 
+    private String normalizeUrl(String url) {
+        if (url != null && url.length() > 0) {
+            url = url.trim();
+            if (!url.toLowerCase().startsWith("http://") &&
+                    !url.toLowerCase().startsWith("https://")) {
+                if (mIsSslConn) {
+                    url = "https://" + url;
+                } else {
+                    url = "http://" + url;
+                }
+                
+            }
+            if (url.endsWith("/")) {
+                url = url.substring(0, url.length() - 1);
+            }
+        }
+        return url;
+    }
+
     /**
      * Chooses the right icon and text to show to the user for the received operation result.
      * 
      * @param result    Result of a remote operation performed in this activity
      */
     private void updateStatusIconAndText(RemoteOperationResult result) {
-        mStatusText = mStatusIcon = 0;
+        mServerStatusText = mServerStatusIcon = 0;
 
         switch (result.getCode()) {
         case OK_SSL:
-            mStatusIcon = android.R.drawable.ic_secure;
-            mStatusText = R.string.auth_secure_connection;
+            mServerStatusIcon = android.R.drawable.ic_secure;
+            mServerStatusText = R.string.auth_secure_connection;
             break;
             
         case OK_NO_SSL:
         case OK:
             if (mHostUrlInput.getText().toString().trim().toLowerCase().startsWith("http://") ) {
-                mStatusText = R.string.auth_connection_established;
-                mStatusIcon = R.drawable.ic_ok;
+                mServerStatusText = R.string.auth_connection_established;
+                mServerStatusIcon = R.drawable.ic_ok;
             } else {
-                mStatusText = R.string.auth_nossl_plain_ok_title;
-                mStatusIcon = android.R.drawable.ic_partial_secure;
+                mServerStatusText = R.string.auth_nossl_plain_ok_title;
+                mServerStatusIcon = android.R.drawable.ic_partial_secure;
             }
             break;
             
         case SSL_RECOVERABLE_PEER_UNVERIFIED:
-            mStatusIcon = R.drawable.common_error;
-            mStatusText = R.string.auth_ssl_unverified_server_title;
+            mServerStatusIcon = R.drawable.common_error;
+            mServerStatusText = R.string.auth_ssl_unverified_server_title;
             break;
                 
         case BAD_OC_VERSION:
-            mStatusIcon = R.drawable.common_error;
-            mStatusText = R.string.auth_bad_oc_version_title;
+            mServerStatusIcon = R.drawable.common_error;
+            mServerStatusText = R.string.auth_bad_oc_version_title;
             break;
         case WRONG_CONNECTION:
-            mStatusIcon = R.drawable.common_error;
-            mStatusText = R.string.auth_wrong_connection_title;
+            mServerStatusIcon = R.drawable.common_error;
+            mServerStatusText = R.string.auth_wrong_connection_title;
             break;
         case TIMEOUT:
-            mStatusIcon = R.drawable.common_error;
-            mStatusText = R.string.auth_timeout_title;
+            mServerStatusIcon = R.drawable.common_error;
+            mServerStatusText = R.string.auth_timeout_title;
             break;
         case INCORRECT_ADDRESS:
-            mStatusIcon = R.drawable.common_error;
-            mStatusText = R.string.auth_incorrect_address_title;
+            mServerStatusIcon = R.drawable.common_error;
+            mServerStatusText = R.string.auth_incorrect_address_title;
             break;
             
         case SSL_ERROR:
-            mStatusIcon = R.drawable.common_error;
-            mStatusText = R.string.auth_ssl_general_error_title;
+            mServerStatusIcon = R.drawable.common_error;
+            mServerStatusText = R.string.auth_ssl_general_error_title;
             break;
             
         case UNAUTHORIZED:
-            mStatusIcon = R.drawable.common_error;
-            mStatusText = R.string.auth_unauthorized;
+            mServerStatusIcon = R.drawable.common_error;
+            mServerStatusText = R.string.auth_unauthorized;
             break;
         case HOST_NOT_AVAILABLE:
-            mStatusIcon = R.drawable.common_error;
-            mStatusText = R.string.auth_unknown_host_title;
+            mServerStatusIcon = R.drawable.common_error;
+            mServerStatusText = R.string.auth_unknown_host_title;
             break;
         case NO_NETWORK_CONNECTION:
-            mStatusIcon = R.drawable.no_network;
-            mStatusText = R.string.auth_no_net_conn_title;
+            mServerStatusIcon = R.drawable.no_network;
+            mServerStatusText = R.string.auth_no_net_conn_title;
             break;
         case INSTANCE_NOT_CONFIGURED:
-            mStatusIcon = R.drawable.common_error;
-            mStatusText = R.string.auth_not_configured_title;
+            mServerStatusIcon = R.drawable.common_error;
+            mServerStatusText = R.string.auth_not_configured_title;
             break;
         case FILE_NOT_FOUND:
-            mStatusIcon = R.drawable.common_error;
-            mStatusText = R.string.auth_incorrect_path_title;
+            mServerStatusIcon = R.drawable.common_error;
+            mServerStatusText = R.string.auth_incorrect_path_title;
             break;
         case OAUTH2_ERROR:
-            mStatusIcon = R.drawable.common_error;
-            mStatusText = R.string.auth_oauth_error;
+            mServerStatusIcon = R.drawable.common_error;
+            mServerStatusText = R.string.auth_oauth_error;
             break;
         case OAUTH2_ERROR_ACCESS_DENIED:
-            mStatusIcon = R.drawable.common_error;
-            mStatusText = R.string.auth_oauth_error_access_denied;
+            mServerStatusIcon = R.drawable.common_error;
+            mServerStatusText = R.string.auth_oauth_error_access_denied;
             break;
         case UNHANDLED_HTTP_CODE:
         case UNKNOWN_ERROR:
-            mStatusIcon = R.drawable.common_error;
-            mStatusText = R.string.auth_unknown_error_title;
+            mServerStatusIcon = R.drawable.common_error;
+            mServerStatusText = R.string.auth_unknown_error_title;
             break;
             
         default:
@@ -747,7 +758,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
             
         } else {
             updateStatusIconAndText(result);
-            updateAuthStatus();
+            showAuthStatus();
             Log_OC.d(TAG, "Access failed: " + result.getLogMessage());
         }
     }
@@ -782,7 +793,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
             
         } else {
             updateStatusIconAndText(result);
-            updateAuthStatus();
+            showAuthStatus();
             Log_OC.d(TAG, "Access failed: " + result.getLogMessage());
         }
     }
@@ -981,14 +992,14 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
      * Updates the content and visibility state of the icon and text associated
      * to the last check on the ownCloud server.
      */
-    private void updateConnStatus() {
+    private void showServerStatus() {
         TextView tv = (TextView) findViewById(R.id.server_status_text);
 
-        if (mStatusIcon == 0 && mStatusText == 0) {
+        if (mServerStatusIcon == 0 && mServerStatusText == 0) {
             tv.setVisibility(View.INVISIBLE);
         } else {
-            tv.setText(mStatusText);
-            tv.setCompoundDrawablesWithIntrinsicBounds(mStatusIcon, 0, 0, 0);
+            tv.setText(mServerStatusText);
+            tv.setCompoundDrawablesWithIntrinsicBounds(mServerStatusIcon, 0, 0, 0);
             tv.setVisibility(View.VISIBLE);
         }
     }
@@ -998,12 +1009,12 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
      * Updates the content and visibility state of the icon and text associated
      * to the interactions with the OAuth authorization server.
      */
-    private void updateAuthStatus() {
-        if (mStatusIcon == 0 && mStatusText == 0) {
+    private void showAuthStatus() {
+        if (mServerStatusIcon == 0 && mServerStatusText == 0) {
             mAuthStatusLayout.setVisibility(View.INVISIBLE);
         } else {
-            mAuthStatusLayout.setText(mStatusText);
-            mAuthStatusLayout.setCompoundDrawablesWithIntrinsicBounds(mStatusIcon, 0, 0, 0);
+            mAuthStatusLayout.setText(mServerStatusText);
+            mAuthStatusLayout.setCompoundDrawablesWithIntrinsicBounds(mServerStatusIcon, 0, 0, 0);
             mAuthStatusLayout.setVisibility(View.VISIBLE);
         }
     }     
@@ -1149,4 +1160,24 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
         public abstract boolean onDrawableTouch(final MotionEvent event);
     }
     
+    
+    private class HostUrlWatcher implements TextWatcher {
+
+        @Override
+        public void afterTextChanged(Editable s) {
+        }
+
+        @Override
+        public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+        }
+
+        @Override
+        public void onTextChanged(CharSequence s, int start, int before, int count) {
+            if (mServerCheckedAndValid) {
+                mServerCheckedAndValid = false;
+                mOkButton.setEnabled(false);    // avoids that the 'connect' button can be clicked if the test was previously passed
+            }
+        }
+        
+    }
 }

From 9fe217ea4a329f3de125e207f839bcbf509c0b98 Mon Sep 17 00:00:00 2001
From: "David A. Velasco" <dvelasco@solidgear.es>
Date: Thu, 16 May 2013 12:42:11 +0200
Subject: [PATCH 09/18] Fixed authorization status message

---
 .../android/authentication/AuthenticatorActivity.java       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/com/owncloud/android/authentication/AuthenticatorActivity.java b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
index 120fbde115..1487aee833 100644
--- a/src/com/owncloud/android/authentication/AuthenticatorActivity.java
+++ b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
@@ -1010,11 +1010,11 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
      * to the interactions with the OAuth authorization server.
      */
     private void showAuthStatus() {
-        if (mServerStatusIcon == 0 && mServerStatusText == 0) {
+        if (mAuthStatusIcon == 0 && mAuthStatusText == 0) {
             mAuthStatusLayout.setVisibility(View.INVISIBLE);
         } else {
-            mAuthStatusLayout.setText(mServerStatusText);
-            mAuthStatusLayout.setCompoundDrawablesWithIntrinsicBounds(mServerStatusIcon, 0, 0, 0);
+            mAuthStatusLayout.setText(mAuthStatusText);
+            mAuthStatusLayout.setCompoundDrawablesWithIntrinsicBounds(mAuthStatusIcon, 0, 0, 0);
             mAuthStatusLayout.setVisibility(View.VISIBLE);
         }
     }     

From fe1b334ce6b23d495f10ba0240ab3892793fa0bc Mon Sep 17 00:00:00 2001
From: "David A. Velasco" <dvelasco@solidgear.es>
Date: Thu, 16 May 2013 12:48:13 +0200
Subject: [PATCH 10/18] Fixed problem after erasing URL in login view and
 changing to next field

---
 .../android/authentication/AuthenticatorActivity.java     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/com/owncloud/android/authentication/AuthenticatorActivity.java b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
index 1487aee833..07c9d537f1 100644
--- a/src/com/owncloud/android/authentication/AuthenticatorActivity.java
+++ b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
@@ -414,15 +414,15 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
 
     private void checkOcServer() {
         String uri = mHostUrlInput.getText().toString().trim();
+        mServerCheckedAndValid = false;
+        mOkButton.setEnabled(false);
+        mDiscoveredVersion = null;
         if (uri.length() != 0) {
-            mServerCheckedAndValid = false;
-            mOkButton.setEnabled(false);
             mServerStatusText = R.string.auth_testing_connection;
             mServerStatusIcon = R.drawable.progress_small;
             showServerStatus();
             mOcServerChkOperation = new  OwnCloudServerCheckOperation(uri, this);
             WebdavClient client = OwnCloudClientUtils.createOwnCloudClient(Uri.parse(uri), this);
-            mDiscoveredVersion = null;
             mOperationThread = mOcServerChkOperation.execute(client, this, mHandler);
         } else {
             mHostUrlInput.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0);
@@ -1028,7 +1028,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
      * @param view      Refresh 'button'
      */
     public void onRefreshClick(View view) {
-        onFocusChange(mHostUrlInput, false);
+        checkOcServer();
     }
     
     

From 16403b27226058d3dbdc0ecd4813f2fe1770e54a Mon Sep 17 00:00:00 2001
From: "David A. Velasco" <dvelasco@solidgear.es>
Date: Thu, 16 May 2013 16:42:13 +0200
Subject: [PATCH 11/18] Fixed visibility of button for server checking

---
 .../authentication/AuthenticatorActivity.java | 183 ++++++++++++------
 1 file changed, 127 insertions(+), 56 deletions(-)

diff --git a/src/com/owncloud/android/authentication/AuthenticatorActivity.java b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
index 07c9d537f1..b79e3d1712 100644
--- a/src/com/owncloud/android/authentication/AuthenticatorActivity.java
+++ b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
@@ -417,6 +417,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
         mServerCheckedAndValid = false;
         mOkButton.setEnabled(false);
         mDiscoveredVersion = null;
+        hideRefreshButton();
         if (uri.length() != 0) {
             mServerStatusText = R.string.auth_testing_connection;
             mServerStatusIcon = R.drawable.progress_small;
@@ -425,7 +426,6 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
             WebdavClient client = OwnCloudClientUtils.createOwnCloudClient(Uri.parse(uri), this);
             mOperationThread = mOcServerChkOperation.execute(client, this, mHandler);
         } else {
-            mHostUrlInput.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0);
             mServerStatusText = 0;
             mServerStatusIcon = 0;
             showServerStatus();
@@ -534,8 +534,8 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
      */
     private void startOauthorization() {
         // be gentle with the user
-        mServerStatusIcon = R.drawable.progress_small;
-        mServerStatusText = R.string.oauth_login_connection;
+        mAuthStatusIcon = R.drawable.progress_small;
+        mAuthStatusText = R.string.oauth_login_connection;
         showAuthStatus();
         
         // GET AUTHORIZATION request
@@ -590,7 +590,12 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
             mOcServerChkOperation = null;
             
             /// update status icon and text
-            updateStatusIconAndText(result);
+            if (mServerCheckedAndValid) {
+                hideRefreshButton();
+            } else {
+                showRefreshButton();
+            }
+            updateServerStatusIconAndText(result);
             showServerStatus();
     
             /// very special case (TODO: move to a common place for all the remote operations)
@@ -599,13 +604,6 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
                 showDialog(DIALOG_SSL_VALIDATOR); 
             }
             
-            /// update the visibility of the 'retry connection' button
-            if (!mServerCheckedAndValid) {
-                mHostUrlInput.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.ic_action_refresh_black, 0);
-            } else {
-                mHostUrlInput.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0);
-            }
-            
             /// retrieve discovered version and normalize server URL
             mDiscoveredVersion = operation.getDiscoveredVersion();
             mHostBaseUrl = normalizeUrl(mHostUrlInput.getText().toString());
@@ -642,8 +640,8 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
      * 
      * @param result    Result of a remote operation performed in this activity
      */
-    private void updateStatusIconAndText(RemoteOperationResult result) {
-        mServerStatusText = mServerStatusIcon = 0;
+    private void updateServerStatusIconAndText(RemoteOperationResult result) {
+        mServerStatusIcon = R.drawable.common_error;    // the most common case in the switch below
 
         switch (result.getCode()) {
         case OK_SSL:
@@ -662,69 +660,131 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
             }
             break;
             
-        case SSL_RECOVERABLE_PEER_UNVERIFIED:
-            mServerStatusIcon = R.drawable.common_error;
-            mServerStatusText = R.string.auth_ssl_unverified_server_title;
-            break;
-                
-        case BAD_OC_VERSION:
-            mServerStatusIcon = R.drawable.common_error;
-            mServerStatusText = R.string.auth_bad_oc_version_title;
-            break;
-        case WRONG_CONNECTION:
-            mServerStatusIcon = R.drawable.common_error;
-            mServerStatusText = R.string.auth_wrong_connection_title;
-            break;
-        case TIMEOUT:
-            mServerStatusIcon = R.drawable.common_error;
-            mServerStatusText = R.string.auth_timeout_title;
-            break;
-        case INCORRECT_ADDRESS:
-            mServerStatusIcon = R.drawable.common_error;
-            mServerStatusText = R.string.auth_incorrect_address_title;
-            break;
-            
-        case SSL_ERROR:
-            mServerStatusIcon = R.drawable.common_error;
-            mServerStatusText = R.string.auth_ssl_general_error_title;
-            break;
-            
-        case UNAUTHORIZED:
-            mServerStatusIcon = R.drawable.common_error;
-            mServerStatusText = R.string.auth_unauthorized;
-            break;
-        case HOST_NOT_AVAILABLE:
-            mServerStatusIcon = R.drawable.common_error;
-            mServerStatusText = R.string.auth_unknown_host_title;
-            break;
         case NO_NETWORK_CONNECTION:
             mServerStatusIcon = R.drawable.no_network;
             mServerStatusText = R.string.auth_no_net_conn_title;
             break;
+            
+        case SSL_RECOVERABLE_PEER_UNVERIFIED:
+            mServerStatusText = R.string.auth_ssl_unverified_server_title;
+            break;
+        case BAD_OC_VERSION:
+            mServerStatusText = R.string.auth_bad_oc_version_title;
+            break;
+        case WRONG_CONNECTION:
+            mServerStatusText = R.string.auth_wrong_connection_title;
+            break;
+        case TIMEOUT:
+            mServerStatusText = R.string.auth_timeout_title;
+            break;
+        case INCORRECT_ADDRESS:
+            mServerStatusText = R.string.auth_incorrect_address_title;
+            break;
+        case SSL_ERROR:
+            mServerStatusText = R.string.auth_ssl_general_error_title;
+            break;
+        case UNAUTHORIZED:
+            mServerStatusText = R.string.auth_unauthorized;
+            break;
+        case HOST_NOT_AVAILABLE:
+            mServerStatusText = R.string.auth_unknown_host_title;
+            break;
         case INSTANCE_NOT_CONFIGURED:
-            mServerStatusIcon = R.drawable.common_error;
             mServerStatusText = R.string.auth_not_configured_title;
             break;
         case FILE_NOT_FOUND:
-            mServerStatusIcon = R.drawable.common_error;
             mServerStatusText = R.string.auth_incorrect_path_title;
             break;
         case OAUTH2_ERROR:
-            mServerStatusIcon = R.drawable.common_error;
             mServerStatusText = R.string.auth_oauth_error;
             break;
         case OAUTH2_ERROR_ACCESS_DENIED:
-            mServerStatusIcon = R.drawable.common_error;
             mServerStatusText = R.string.auth_oauth_error_access_denied;
             break;
         case UNHANDLED_HTTP_CODE:
         case UNKNOWN_ERROR:
-            mServerStatusIcon = R.drawable.common_error;
             mServerStatusText = R.string.auth_unknown_error_title;
             break;
-            
         default:
+            mServerStatusText = 0;
+            mServerStatusIcon = 0;
+        }
+    }
+
+
+    /**
+     * Chooses the right icon and text to show to the user for the received operation result.
+     * 
+     * @param result    Result of a remote operation performed in this activity
+     */
+    private void updateAuthStatusIconAndText(RemoteOperationResult result) {
+        mAuthStatusIcon = R.drawable.common_error;    // the most common case in the switch below
+
+        switch (result.getCode()) {
+        case OK_SSL:
+            mAuthStatusIcon = android.R.drawable.ic_secure;
+            mAuthStatusText = R.string.auth_secure_connection;
             break;
+            
+        case OK_NO_SSL:
+        case OK:
+            if (mHostUrlInput.getText().toString().trim().toLowerCase().startsWith("http://") ) {
+                mAuthStatusText = R.string.auth_connection_established;
+                mAuthStatusIcon = R.drawable.ic_ok;
+            } else {
+                mAuthStatusText = R.string.auth_nossl_plain_ok_title;
+                mAuthStatusIcon = android.R.drawable.ic_partial_secure;
+            }
+            break;
+            
+        case NO_NETWORK_CONNECTION:
+            mAuthStatusIcon = R.drawable.no_network;
+            mAuthStatusText = R.string.auth_no_net_conn_title;
+            break;
+            
+        case SSL_RECOVERABLE_PEER_UNVERIFIED:
+            mAuthStatusText = R.string.auth_ssl_unverified_server_title;
+            break;
+        case BAD_OC_VERSION:
+            mAuthStatusText = R.string.auth_bad_oc_version_title;
+            break;
+        case WRONG_CONNECTION:
+            mAuthStatusText = R.string.auth_wrong_connection_title;
+            break;
+        case TIMEOUT:
+            mAuthStatusText = R.string.auth_timeout_title;
+            break;
+        case INCORRECT_ADDRESS:
+            mAuthStatusText = R.string.auth_incorrect_address_title;
+            break;
+        case SSL_ERROR:
+            mAuthStatusText = R.string.auth_ssl_general_error_title;
+            break;
+        case UNAUTHORIZED:
+            mAuthStatusText = R.string.auth_unauthorized;
+            break;
+        case HOST_NOT_AVAILABLE:
+            mAuthStatusText = R.string.auth_unknown_host_title;
+            break;
+        case INSTANCE_NOT_CONFIGURED:
+            mAuthStatusText = R.string.auth_not_configured_title;
+            break;
+        case FILE_NOT_FOUND:
+            mAuthStatusText = R.string.auth_incorrect_path_title;
+            break;
+        case OAUTH2_ERROR:
+            mAuthStatusText = R.string.auth_oauth_error;
+            break;
+        case OAUTH2_ERROR_ACCESS_DENIED:
+            mAuthStatusText = R.string.auth_oauth_error_access_denied;
+            break;
+        case UNHANDLED_HTTP_CODE:
+        case UNKNOWN_ERROR:
+            mAuthStatusText = R.string.auth_unknown_error_title;
+            break;
+        default:
+            mAuthStatusText = 0;
+            mAuthStatusIcon = 0;
         }
     }
 
@@ -757,7 +817,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
             mAuthCheckOperation.execute(client, this, mHandler);
             
         } else {
-            updateStatusIconAndText(result);
+            updateAuthStatusIconAndText(result);
             showAuthStatus();
             Log_OC.d(TAG, "Access failed: " + result.getLogMessage());
         }
@@ -792,7 +852,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
             finish();
             
         } else {
-            updateStatusIconAndText(result);
+            updateAuthStatusIconAndText(result);
             showAuthStatus();
             Log_OC.d(TAG, "Access failed: " + result.getLogMessage());
         }
@@ -997,11 +1057,13 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
 
         if (mServerStatusIcon == 0 && mServerStatusText == 0) {
             tv.setVisibility(View.INVISIBLE);
+            
         } else {
             tv.setText(mServerStatusText);
             tv.setCompoundDrawablesWithIntrinsicBounds(mServerStatusIcon, 0, 0, 0);
             tv.setVisibility(View.VISIBLE);
         }
+        
     }
     
     
@@ -1012,6 +1074,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
     private void showAuthStatus() {
         if (mAuthStatusIcon == 0 && mAuthStatusText == 0) {
             mAuthStatusLayout.setVisibility(View.INVISIBLE);
+            
         } else {
             mAuthStatusLayout.setText(mAuthStatusText);
             mAuthStatusLayout.setCompoundDrawablesWithIntrinsicBounds(mAuthStatusIcon, 0, 0, 0);
@@ -1020,6 +1083,14 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
     }     
 
     
+    private void showRefreshButton() {
+        mHostUrlInput.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.ic_action_refresh_black, 0);
+    }
+    
+    private void hideRefreshButton() {
+        mHostUrlInput.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0);
+    }
+    
     /**
      * Called when the refresh button in the input field for ownCloud host is clicked.
      * 

From 4d67655bbedbc250ccd796cebab09aed52ecccb0 Mon Sep 17 00:00:00 2001
From: "David A. Velasco" <dvelasco@solidgear.es>
Date: Thu, 16 May 2013 17:10:41 +0200
Subject: [PATCH 12/18] Removed unused code

---
 .../authentication/AuthenticatorActivity.java | 38 -------------------
 1 file changed, 38 deletions(-)

diff --git a/src/com/owncloud/android/authentication/AuthenticatorActivity.java b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
index b79e3d1712..bf888378db 100644
--- a/src/com/owncloud/android/authentication/AuthenticatorActivity.java
+++ b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
@@ -48,9 +48,7 @@ import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
 import android.preference.PreferenceManager;
-import android.text.Editable;
 import android.text.InputType;
-import android.text.TextWatcher;
 import android.view.KeyEvent;
 import android.view.MotionEvent;
 import android.view.View;
@@ -142,8 +140,6 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
     private TextView mOAuthAuthEndpointText;
     private TextView mOAuthTokenEndpointText;
 
-    private HostUrlWatcher mHostUrlChangedListener;
-    
     
     /**
      * {@inheritDoc}
@@ -267,20 +263,6 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
         mPasswordInput.setOnEditorActionListener(this);
     }
     
-    @Override
-    protected void onStart() {
-        super.onStart();
-        //mHostUrlChangedListener = new  HostUrlWatcher();
-        //mHostUrlInput.addTextChangedListener(mHostUrlChangedListener);    
-    }
-
-    @Override
-    protected void onStop() {
-        super.onStop();
-        mHostUrlInput.removeTextChangedListener(mHostUrlChangedListener);
-    }
-    
-
     /**
      * Saves relevant state before {@link #onPause()}
      * 
@@ -1231,24 +1213,4 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
         public abstract boolean onDrawableTouch(final MotionEvent event);
     }
     
-    
-    private class HostUrlWatcher implements TextWatcher {
-
-        @Override
-        public void afterTextChanged(Editable s) {
-        }
-
-        @Override
-        public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-        }
-
-        @Override
-        public void onTextChanged(CharSequence s, int start, int before, int count) {
-            if (mServerCheckedAndValid) {
-                mServerCheckedAndValid = false;
-                mOkButton.setEnabled(false);    // avoids that the 'connect' button can be clicked if the test was previously passed
-            }
-        }
-        
-    }
 }

From 1331b80015875d1fdc3a08fea86e685d12d7ec6d Mon Sep 17 00:00:00 2001
From: "David A. Velasco" <dvelasco@solidgear.es>
Date: Thu, 16 May 2013 19:07:44 +0200
Subject: [PATCH 13/18] Fixed visibility of server-check button on orientation
 changes when check was previously passed

---
 .../authentication/AuthenticatorActivity.java | 30 ++++++++++++-------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/src/com/owncloud/android/authentication/AuthenticatorActivity.java b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
index bf888378db..80cf894a00 100644
--- a/src/com/owncloud/android/authentication/AuthenticatorActivity.java
+++ b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
@@ -87,7 +87,8 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
     private static final String KEY_HOST_URL_TEXT = "HOST_URL_TEXT";
     private static final String KEY_OC_VERSION = "OC_VERSION";
     private static final String KEY_ACCOUNT = "ACCOUNT";
-    private static final String KEY_SERVER_CHECKED_AND_VALID = "SERVER_CHECKED_AND_VALID";
+    private static final String KEY_SERVER_VALID = "SERVER_VALID";
+    private static final String KEY_SERVER_CHECKED = "SERVER_CHECKED";
     private static final String KEY_SERVER_CHECK_IN_PROGRESS = "SERVER_CHECK_IN_PROGRESS"; 
     private static final String KEY_SERVER_STATUS_TEXT = "SERVER_STATUS_TEXT";
     private static final String KEY_SERVER_STATUS_ICON = "SERVER_STATUS_ICON";
@@ -112,7 +113,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
     private OwnCloudVersion mDiscoveredVersion;
     
     private int mServerStatusText, mServerStatusIcon;
-    private boolean mServerCheckedAndValid, mIsSslConn;
+    private boolean mServerIsChecked, mServerIsValid, mIsSslConn;
     private int mAuthStatusText, mAuthStatusIcon;    
     
     private final Handler mHandler = new Handler();
@@ -179,7 +180,8 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
         if (savedInstanceState == null) {
             /// connection state and info
             mServerStatusText = mServerStatusIcon = 0;
-            mServerCheckedAndValid = false;
+            mServerIsValid = false;
+            mServerIsChecked = false;
             mIsSslConn = false;
             mAuthStatusText = mAuthStatusIcon = 0;
             
@@ -205,7 +207,8 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
 
         } else {
             /// connection state and info
-            mServerCheckedAndValid = savedInstanceState.getBoolean(KEY_SERVER_CHECKED_AND_VALID);
+            mServerIsValid = savedInstanceState.getBoolean(KEY_SERVER_VALID);
+            mServerIsChecked = savedInstanceState.getBoolean(KEY_SERVER_CHECKED);
             mServerStatusText = savedInstanceState.getInt(KEY_SERVER_STATUS_TEXT);
             mServerStatusIcon = savedInstanceState.getInt(KEY_SERVER_STATUS_ICON);
             mIsSslConn = savedInstanceState.getBoolean(KEY_IS_SSL_CONN);
@@ -231,6 +234,8 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
         
         showServerStatus();
         showAuthStatus();
+        if (mServerIsChecked && !mServerIsValid) showRefreshButton();
+        mOkButton.setEnabled(mServerIsValid); // state not automatically recovered in configuration changes
         
         if (!OAUTH_MODE_OPTIONAL.equals(getString(R.string.oauth2_mode))) {
             mOAuth2Check.setVisibility(View.GONE);
@@ -241,7 +246,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
             mHostUrlInput.setEnabled(false);
             mUsernameInput.setEnabled(false);
             mOAuth2Check.setVisibility(View.GONE);
-            if (!mServerCheckedAndValid && mOcServerChkOperation == null) {
+            if (!mServerIsValid && mOcServerChkOperation == null) {
                 checkOcServer(); 
             }
         }
@@ -278,8 +283,9 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
         /// connection state and info
         outState.putInt(KEY_SERVER_STATUS_TEXT, mServerStatusText);
         outState.putInt(KEY_SERVER_STATUS_ICON, mServerStatusIcon);
-        outState.putBoolean(KEY_SERVER_CHECKED_AND_VALID, mServerCheckedAndValid);
-        outState.putBoolean(KEY_SERVER_CHECK_IN_PROGRESS, (!mServerCheckedAndValid && mOcServerChkOperation != null));
+        outState.putBoolean(KEY_SERVER_VALID, mServerIsValid);
+        outState.putBoolean(KEY_SERVER_CHECKED, mServerIsChecked);
+        outState.putBoolean(KEY_SERVER_CHECK_IN_PROGRESS, (!mServerIsValid && mOcServerChkOperation != null));
         outState.putBoolean(KEY_IS_SSL_CONN, mIsSslConn);
         outState.putInt(KEY_AUTH_STATUS_ICON, mAuthStatusIcon);
         outState.putInt(KEY_AUTH_STATUS_TEXT, mAuthStatusText);
@@ -396,7 +402,8 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
 
     private void checkOcServer() {
         String uri = mHostUrlInput.getText().toString().trim();
-        mServerCheckedAndValid = false;
+        mServerIsValid = false;
+        mServerIsChecked = false;
         mOkButton.setEnabled(false);
         mDiscoveredVersion = null;
         hideRefreshButton();
@@ -567,12 +574,13 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
     private void onOcServerCheckFinish(OwnCloudServerCheckOperation operation, RemoteOperationResult result) {
         if (operation.equals(mOcServerChkOperation)) {
             /// save result state
-            mServerCheckedAndValid = result.isSuccess();
+            mServerIsChecked = true;
+            mServerIsValid = result.isSuccess();
             mIsSslConn = (result.getCode() == ResultCode.OK_SSL);
             mOcServerChkOperation = null;
             
             /// update status icon and text
-            if (mServerCheckedAndValid) {
+            if (mServerIsValid) {
                 hideRefreshButton();
             } else {
                 showRefreshButton();
@@ -591,7 +599,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
             mHostBaseUrl = normalizeUrl(mHostUrlInput.getText().toString());
             
             /// allow or not the user try to access the server
-            mOkButton.setEnabled(mServerCheckedAndValid);
+            mOkButton.setEnabled(mServerIsValid);
             
         }   // else nothing ; only the last check operation is considered; 
             // multiple can be triggered if the user amends a URL before a previous check can be triggered

From 8bc9a0c86dff265ebf07a0163090794c0cf24fd3 Mon Sep 17 00:00:00 2001
From: "David A. Velasco" <dvelasco@solidgear.es>
Date: Thu, 16 May 2013 19:43:10 +0200
Subject: [PATCH 14/18] Fixed scroll view in landscape: full content is
 scrollable when software keyboard is shown

---
 res/layout-land/account_setup.xml | 29 ++++++++++++-----------------
 1 file changed, 12 insertions(+), 17 deletions(-)

diff --git a/res/layout-land/account_setup.xml b/res/layout-land/account_setup.xml
index 59ec23381c..a4b5a5e41a 100644
--- a/res/layout-land/account_setup.xml
+++ b/res/layout-land/account_setup.xml
@@ -26,10 +26,9 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-		android:layout_alignParentTop="true"
-		android:layout_above="@+id/buttonOK"
-		android:orientation="horizontal" 
-        >
+        android:layout_above="@id/buttonOK"
+        android:layout_alignParentTop="true"
+        android:orientation="horizontal" >
         
 		<ImageView
 			android:id="@+id/imageView1"
@@ -43,22 +42,18 @@
 		<ScrollView
 		    android:layout_width="0dp"
 		    android:layout_height="match_parent"
-			android:layout_weight="1"
-		    android:layout_gravity="center"
+		    android:layout_weight="1"
 		    android:fillViewport="true"
-		    android:orientation="vertical"
-		    >
+		    android:orientation="vertical" >
 						
 			<LinearLayout
-				android:id="@+id/LinearLayout1"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:layout_gravity="center"
-				android:layout_margin="8dp"
-				android:gravity="center"
-				android:orientation="vertical"
-				android:focusable="true" 
-				>
+			    android:id="@+id/LinearLayout1"
+			    android:layout_width="match_parent"
+			    android:layout_height="wrap_content"
+			    android:layout_margin="8dp"
+			    android:focusable="true"
+			    android:gravity="center"
+			    android:orientation="vertical" >
 		
 				<EditText
 					android:id="@+id/hostUrlInput"

From ac32e8411a1ad9fef2681842b059f6d1820a9f43 Mon Sep 17 00:00:00 2001
From: "David A. Velasco" <dvelasco@solidgear.es>
Date: Mon, 20 May 2013 13:22:17 +0200
Subject: [PATCH 15/18] Fixed alignment of login fields in Androd 3.x devices

---
 res/layout-land/account_setup.xml |  4 ++--
 res/layout/account_setup.xml      | 12 ++++--------
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/res/layout-land/account_setup.xml b/res/layout-land/account_setup.xml
index a4b5a5e41a..b8b8b5344e 100644
--- a/res/layout-land/account_setup.xml
+++ b/res/layout-land/account_setup.xml
@@ -50,10 +50,10 @@
 			    android:id="@+id/LinearLayout1"
 			    android:layout_width="match_parent"
 			    android:layout_height="wrap_content"
-			    android:layout_margin="8dp"
 			    android:focusable="true"
 			    android:gravity="center"
-			    android:orientation="vertical" >
+			    android:orientation="vertical"
+			    android:padding="8dp" >
 		
 				<EditText
 					android:id="@+id/hostUrlInput"
diff --git a/res/layout/account_setup.xml b/res/layout/account_setup.xml
index 65237a8b2b..83238eb6c3 100644
--- a/res/layout/account_setup.xml
+++ b/res/layout/account_setup.xml
@@ -17,24 +17,20 @@
   You should have received a copy of the GNU General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
-
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:layout_gravity="center"
-	android:padding="8dip"
     android:fillViewport="true"
-    android:orientation="vertical"
-    >
+    android:orientation="vertical" >
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-		android:layout_margin="8dip"
-        android:gravity="center"
-        android:orientation="vertical" 
         android:focusable="true"
-        >
+        android:gravity="center"
+        android:orientation="vertical"
+        android:padding="8dp" >
 
         <ImageView
             android:id="@+id/imageView1"

From 4eb80934182f94e781c3e7bc8984293f1c8e66b1 Mon Sep 17 00:00:00 2001
From: "David A. Velasco" <dvelasco@solidgear.es>
Date: Mon, 20 May 2013 13:54:04 +0200
Subject: [PATCH 16/18] 'Connect' button is disabled in login view any time the
 URL is modified, to prevent situations where the user can connect to a server
 introduced before the modifciation

---
 .../authentication/AuthenticatorActivity.java  | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/src/com/owncloud/android/authentication/AuthenticatorActivity.java b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
index 80cf894a00..3df4c46777 100644
--- a/src/com/owncloud/android/authentication/AuthenticatorActivity.java
+++ b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
@@ -48,7 +48,9 @@ import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
 import android.preference.PreferenceManager;
+import android.text.Editable;
 import android.text.InputType;
+import android.text.TextWatcher;
 import android.view.KeyEvent;
 import android.view.MotionEvent;
 import android.view.View;
@@ -263,6 +265,20 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
                 return true;
             }
         });
+        mHostUrlInput.addTextChangedListener(new TextWatcher() {
+
+            @Override
+            public void afterTextChanged(Editable s) {
+                mOkButton.setEnabled(false);
+            }
+
+            @Override
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) {}
+
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count) {}
+            
+        });
         mPasswordInput.setOnFocusChangeListener(this);
         mPasswordInput.setImeOptions(EditorInfo.IME_ACTION_DONE);
         mPasswordInput.setOnEditorActionListener(this);
@@ -396,6 +412,8 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
     private void onUrlInputFocusLost(TextView hostInput) {
         if (!mHostBaseUrl.equals(normalizeUrl(mHostUrlInput.getText().toString()))) {
             checkOcServer();
+        } else {
+            mOkButton.setEnabled(mServerIsValid);
         }
     }
 

From 5a488a8adad689d0a14b1bd14eace28931d76a33 Mon Sep 17 00:00:00 2001
From: "David A. Velasco" <dvelasco@solidgear.es>
Date: Tue, 21 May 2013 13:49:42 +0200
Subject: [PATCH 17/18] Fixed look of disabled connect button in portrait, no
 more drawn as enabled

---
 res/layout/account_setup.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/layout/account_setup.xml b/res/layout/account_setup.xml
index 83238eb6c3..45efab1687 100644
--- a/res/layout/account_setup.xml
+++ b/res/layout/account_setup.xml
@@ -141,7 +141,7 @@
             android:enabled="false"
             android:onClick="onOkClick"
             android:text="@string/setup_btn_connect"
-            android:textColor="@android:color/black" />
+            />
 
         <Button
             android:id="@+id/account_register"

From a4bd86cf14e9054040eeac5f7b65631d8489c007 Mon Sep 17 00:00:00 2001
From: "David A. Velasco" <dvelasco@solidgear.es>
Date: Tue, 21 May 2013 14:25:08 +0200
Subject: [PATCH 18/18] Fixed 'connect' button disabling with change of
 orientation when focus is in the URL field

---
 .../android/authentication/AuthenticatorActivity.java       | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/com/owncloud/android/authentication/AuthenticatorActivity.java b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
index 3df4c46777..375ef3b1bd 100644
--- a/src/com/owncloud/android/authentication/AuthenticatorActivity.java
+++ b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
@@ -269,7 +269,9 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
 
             @Override
             public void afterTextChanged(Editable s) {
-                mOkButton.setEnabled(false);
+                if (!mHostBaseUrl.equals(normalizeUrl(mHostUrlInput.getText().toString()))) {
+                    mOkButton.setEnabled(false);
+                }
             }
 
             @Override
@@ -640,7 +642,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
                 url = url.substring(0, url.length() - 1);
             }
         }
-        return url;
+        return (url != null ? url : "");
     }
 
     /**