From: masensio <masensio@solidgear.es>
Date: Wed, 19 Mar 2014 09:07:56 +0000 (+0100)
Subject: OC-3390: Shows message about 'not support authentication' under server address
X-Git-Tag: oc-android-1.5.5~5^2~1^2~12
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/71e049394eabbde1a8bd43c53a074750ee3c4be2?hp=--cc

OC-3390: Shows message about 'not support authentication' under server address
---

71e049394eabbde1a8bd43c53a074750ee3c4be2
diff --git a/res/values/strings.xml b/res/values/strings.xml
index de1c9690..84d9f0c6 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -261,5 +261,4 @@
 	<string name="copy_link">Copy link</string>	
 	<string name="clipboard_text_copied">Copied to clipboard</string>
 	
-	<string name="common_alert_title">Attention!</string>
 </resources>
diff --git a/src/com/owncloud/android/authentication/AuthenticatorActivity.java b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
index 16ce7558..33ddbf73 100644
--- a/src/com/owncloud/android/authentication/AuthenticatorActivity.java
+++ b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
@@ -897,6 +897,9 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
             mDiscoveredVersion = operation.getDiscoveredVersion();
             mHostBaseUrl = normalizeUrl(mHostUrlInput.getText().toString());
             
+            // Refresh server status, but don't show it
+            updateServerStatusIconAndText(result);
+            
             /// update status icon and text
             if (mServerIsValid) {
                 hideRefreshButton();
@@ -905,9 +908,9 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
                 tryEmptyAuthorization();
             } else {
                 showRefreshButton();
+                // Show server status
+                showServerStatus();
             }
-            updateServerStatusIconAndText(result);
-            showServerStatus();
 
             /// very special case (TODO: move to a common place for all the remote operations)
             if (result.getCode() == ResultCode.SSL_RECOVERABLE_PEER_UNVERIFIED) {
@@ -1140,12 +1143,12 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
 
 
     private void updateStatusIconFailUserName(){
-        mAuthStatusIcon = android.R.drawable.ic_secure;
+        mAuthStatusIcon = R.drawable.common_error;
         mAuthStatusText = R.string.auth_fail_get_user_name;
     }
     
     private void updateServerStatusIconNoRegularAuth(){
-        mServerStatusIcon = android.R.drawable.ic_secure;
+        mServerStatusIcon = R.drawable.common_error;
         mServerStatusText = R.string.auth_unsupported_auth_method;
     }
     
@@ -1206,7 +1209,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
                 mOkButton.setEnabled(false);
                 mTryEmptyAuthorization = false;
                 mServerIsValid = false;
-                //show an alert message
+                //show an alert message ( Server Status )
                 updateServerStatusIconNoRegularAuth();
                 showServerStatus();
                 
@@ -1231,7 +1234,10 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
             if (mTryEmptyAuthorization) {
                 mTryEmptyAuthorization = false;
                 mOkButton.setEnabled(true);
-
+                
+                // Show server status
+                showServerStatus();
+                
             } else if (result.isServerFail() || result.isException()) {
                 /// if server fail or exception in authorization, the UI is updated as when a server check failed
                 mServerIsChecked = true;