From: masensio <masensio@solidgear.es>
Date: Tue, 11 Mar 2014 13:40:38 +0000 (+0100)
Subject: Revert "OC-3242: Add new error message for fail in GetUserName"
X-Git-Tag: oc-android-1.5.5~17^2~1
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/660f97baabefe74aa64da790030855b54dcea59a?ds=inline;hp=-c

Revert "OC-3242: Add new error message for fail in GetUserName"

This reverts commit 564bbf7bb832881ee56fe90ea520b5f4becf491d.
---

660f97baabefe74aa64da790030855b54dcea59a
diff --git a/owncloud-android-library b/owncloud-android-library
index a610dc3c..1dbc9a12 160000
--- a/owncloud-android-library
+++ b/owncloud-android-library
@@ -1 +1 @@
-Subproject commit a610dc3cd3eb9b1ddbf899476ea50d08e1674ca7
+Subproject commit 1dbc9a121e8818d0202d3aaec31bce1335ee428b
diff --git a/res/values/strings.xml b/res/values/strings.xml
index c8f370e4..60e4ecab 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -166,7 +166,6 @@
 	<string name="auth_connecting_auth_server">Connecting to authentication server…</string>
 	<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="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 e604a954..b59ac6e7 100644
--- a/src/com/owncloud/android/authentication/AuthenticatorActivity.java
+++ b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
@@ -807,7 +807,6 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
     }
 
     private void onGetUserNameFinish(GetRemoteUserNameOperation operation, RemoteOperationResult result) {
-        
         if (result.isSuccess()) {
             boolean success = false;
             String username = operation.getUserName();
@@ -832,7 +831,7 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
             if (success)
                 finish();
         } else {
-            updateStatusIconFailUserName();
+            updateAuthStatusIconAndText(result);
             showAuthStatus();
             Log_OC.e(TAG, "Access to user name failed: " + result.getLogMessage());
         }
@@ -1105,11 +1104,6 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
     }
 
 
-    private void updateStatusIconFailUserName(){
-        mAuthStatusIcon = android.R.drawable.ic_secure;
-        mAuthStatusText = R.string.auth_fail_get_user_name;
-    }
-    
     /**
      * Processes the result of the request for and access token send 
      * to an OAuth authorization server.