From b52f0484b4a2815f2373422bfc61beea2a985854 Mon Sep 17 00:00:00 2001
From: masensio <masensio@solidgear.es>
Date: Wed, 26 Jun 2013 18:50:08 +0200
Subject: [PATCH] OC-461: Add check server button. OC-394

---
 res/layout-land/account_setup.xml                  |  8 +++++++
 res/layout/account_setup.xml                       |  8 +++++++
 res/values/branding.xml                            |  2 +-
 res/values/strings.xml                             |  1 +
 .../authentication/AuthenticatorActivity.java      | 25 ++++++++++++++++++++++
 5 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/res/layout-land/account_setup.xml b/res/layout-land/account_setup.xml
index dea86cd9..5aa23e5c 100644
--- a/res/layout-land/account_setup.xml
+++ b/res/layout-land/account_setup.xml
@@ -54,6 +54,14 @@
 			    android:gravity="center"
 			    android:orientation="vertical"
 			    android:padding="8dp" >
+
+				<Button
+				    android:id="@+id/checkServerButton"
+				    android:layout_width="wrap_content"
+				    android:layout_height="wrap_content"
+				    android:layout_gravity="center_horizontal"
+				    android:text="@string/auth_check_server"
+				    android:visibility="gone" />
 		
 				<EditText
 					android:id="@+id/hostUrlInput"
diff --git a/res/layout/account_setup.xml b/res/layout/account_setup.xml
index a218fa97..b4c1b636 100644
--- a/res/layout/account_setup.xml
+++ b/res/layout/account_setup.xml
@@ -40,6 +40,14 @@
             android:layout_marginTop="10dp"
             android:src="@drawable/logo" />
 
+        <Button
+            android:id="@+id/checkServerButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:text="@string/auth_check_server"
+            android:visibility="gone" />
+
 		<EditText
 			android:id="@+id/hostUrlInput"
 			android:layout_width="match_parent"
diff --git a/res/values/branding.xml b/res/values/branding.xml
index 29343b75..9d6f54f6 100644
--- a/res/values/branding.xml
+++ b/res/values/branding.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="server_url">"http://beta.owncloud.com/owncloud/"</string>
+    <string name="server_url">"http://beta.owncloud.com/owncloud"</string>
     <bool name="show_server_url_input">false</bool>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 708fbfbb..d22c1b1f 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -48,6 +48,7 @@
     <string name="prefs_log_summary_history">This shows the recorded logs</string>
     <string name="prefs_log_delete_history_button">Delete History</string>
     
+    <string name="auth_check_server">Check Server</string>
     <string name="auth_host_url">Server address</string>
     <string name="auth_username">Username</string>
     <string name="auth_password">Password</string>
diff --git a/src/com/owncloud/android/authentication/AuthenticatorActivity.java b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
index ce704ca4..b6ead824 100644
--- a/src/com/owncloud/android/authentication/AuthenticatorActivity.java
+++ b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
@@ -54,6 +54,7 @@ import android.text.TextWatcher;
 import android.view.KeyEvent;
 import android.view.MotionEvent;
 import android.view.View;
+import android.view.View.OnClickListener;
 import android.view.View.OnFocusChangeListener;
 import android.view.View.OnTouchListener;
 import android.view.Window;
@@ -131,6 +132,7 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
     private byte mAction;
     private Account mAccount;
 
+    private Button mCheckServerButton;
     private EditText mHostUrlInput;
     private EditText mUsernameInput;
     private EditText mPasswordInput;
@@ -159,6 +161,7 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
 
         /// set view and get references to view elements
         setContentView(R.layout.account_setup);
+        mCheckServerButton = (Button) findViewById(R.id.checkServerButton);
         mHostUrlInput = (EditText) findViewById(R.id.hostUrlInput);
         mUsernameInput = (EditText) findViewById(R.id.account_username);
         mPasswordInput = (EditText) findViewById(R.id.account_password);
@@ -170,6 +173,7 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
         
         /// set Host Url Input Enabled
         mHostUrlInputEnabled = getResources().getBoolean(R.bool.show_server_url_input);
+        
 
         /// complete label for 'register account' button
         Button b = (Button) findViewById(R.id.account_register);
@@ -183,10 +187,23 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
         mAction = getIntent().getByteExtra(EXTRA_ACTION, ACTION_CREATE); 
         mAccount = null;
         mHostBaseUrl = "";
+        
+        // URL Branding
         if (!mHostUrlInputEnabled)
         {
             mHostUrlInput.setText(getString(R.string.server_url));
             mHostUrlInput.setVisibility(View.GONE);
+            
+            mCheckServerButton.setVisibility(View.VISIBLE);
+            mCheckServerButton.setOnClickListener(new OnClickListener() {
+                
+                @Override
+                public void onClick(View v) {
+                    checkOcServer();
+                    
+                }
+            });
+            
             checkOcServer();
         }
 
@@ -1212,11 +1229,19 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
     private void showRefreshButton() {
         mHostUrlInput.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.ic_action_refresh_black, 0);
         mRefreshButtonEnabled = true;
+        
+        if (!mHostUrlInputEnabled){
+           mCheckServerButton.setVisibility(View.VISIBLE); 
+        }
     }
 
     private void hideRefreshButton() {
         mHostUrlInput.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0);
         mRefreshButtonEnabled = false;
+        
+        if (!mHostUrlInputEnabled){
+            mCheckServerButton.setVisibility(View.INVISIBLE); 
+        }
     }
 
     /**
-- 
2.11.0