From: masensio <masensio@solidgear.es>
Date: Thu, 20 Mar 2014 15:15:59 +0000 (+0100)
Subject: Changes from comments in PR#443
X-Git-Tag: oc-android-1.5.5~5^2~1^2~8
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/c6f0847866ab838ac845fc83f57bd00ae886d4f3?ds=inline

Changes from comments in PR#443
---

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 81d25815..2223c6e4 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -167,7 +167,7 @@
 	<string name="auth_unsupported_auth_method">The server does not support this authentication method</string>    
 	<string name="auth_unsupported_multiaccount">%1$s does not support multiple accounts</string>
 	<string name="auth_fail_get_user_name">Your server is not returning a correct user id, contact with your admin please</string>
-	<string name="auth_unsupported_basic_auth">Can not authenticate against this server</string>
+	<string name="auth_can_not_auth_against_server">Can not authenticate against this server</string>
     
     <string name="fd_keep_in_sync">Keep file up to date</string>
     <string name="common_rename">Rename</string>
diff --git a/src/com/owncloud/android/authentication/AuthenticatorActivity.java b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
index 60bec63a..178e1646 100644
--- a/src/com/owncloud/android/authentication/AuthenticatorActivity.java
+++ b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
@@ -176,7 +176,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
 
     public static String DIALOG_UNTRUSTED_CERT = "DIALOG_UNTRUSTED_CERT";
     
-    private boolean mTryEmptyAuthorization = false;
+    private boolean mDetectAuthorizationMethod = false;
 
 
     /**
@@ -905,7 +905,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
                 hideRefreshButton();
                 // Try to create an account with user and pass "", to know if it is a regular server
                 // Update connect button in the answer of this method
-                tryEmptyAuthorization();
+                detectAuthorizationMethod();
             } else {
                 showRefreshButton();
                 // Show server status
@@ -926,8 +926,8 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
     /**
      *  Try to access with  user/pass ""/"", to know if it is a regular server
      */
-    private void tryEmptyAuthorization() {
-        mTryEmptyAuthorization = true;
+    private void detectAuthorizationMethod() {
+        mDetectAuthorizationMethod = true;
         
         Log_OC.d(TAG, "Trying empty authorization to detect authentication method");
         
@@ -1149,7 +1149,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
     
     private void updateServerStatusIconNoRegularAuth(){
         mServerStatusIcon = R.drawable.common_error;
-        mServerStatusText = R.string.auth_unsupported_basic_auth;
+        mServerStatusText = R.string.auth_can_not_auth_against_server;
     }
     
     /**
@@ -1203,11 +1203,10 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
         }
         
         if (result.isSuccess()) {
-            
-            if (mTryEmptyAuthorization) {
-                //allow or not the user try to access the server
+            //allow or not the user try to access the server
+            if (mDetectAuthorizationMethod) {
                 mOkButton.setEnabled(false);
-                mTryEmptyAuthorization = false;
+                mDetectAuthorizationMethod = false;
                 mServerIsValid = false;
                 //show an alert message ( Server Status )
                 updateServerStatusIconNoRegularAuth();
@@ -1231,8 +1230,8 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
             }
 
         } else {
-            if (mTryEmptyAuthorization) {
-                mTryEmptyAuthorization = false;
+            if (mDetectAuthorizationMethod) {
+                mDetectAuthorizationMethod = false;
                 mOkButton.setEnabled(true);
                 
                 // Show server status