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

This reverts commit 564bbf7bb832881ee56fe90ea520b5f4becf491d.

diff --git a/owncloud-android-library b/owncloud-android-library
index a610dc3..1dbc9a1 160000 (submodule)
--- 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 c8f370e..60e4eca 100644 (file)
--- 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_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>
     
     <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 e604a95..b59ac6e 100644 (file)
--- a/src/com/owncloud/android/authentication/AuthenticatorActivity.java
+++ b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
@@ -807,7 +807,6 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
     }\r
 \r
     private void onGetUserNameFinish(GetRemoteUserNameOperation operation, RemoteOperationResult result) {\r
     }\r
 \r
     private void onGetUserNameFinish(GetRemoteUserNameOperation operation, RemoteOperationResult result) {\r

-        \r

         if (result.isSuccess()) {\r
             boolean success = false;\r
             String username = operation.getUserName();\r
         if (result.isSuccess()) {\r
             boolean success = false;\r
             String username = operation.getUserName();\r


@@ -832,7 +831,7 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
             if (success)\r
                 finish();\r
         } else {\r
             if (success)\r
                 finish();\r
         } else {\r

-            updateStatusIconFailUserName();\r
+            updateAuthStatusIconAndText(result);\r

             showAuthStatus();\r
             Log_OC.e(TAG, "Access to user name failed: " + result.getLogMessage());\r
         }\r
             showAuthStatus();\r
             Log_OC.e(TAG, "Access to user name failed: " + result.getLogMessage());\r
         }\r


@@ -1105,11 +1104,6 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
     }\r
 \r
 \r
     }\r
 \r
 \r

-    private void updateStatusIconFailUserName(){\r
-        mAuthStatusIcon = android.R.drawable.ic_secure;\r
-        mAuthStatusText = R.string.auth_fail_get_user_name;\r
-    }\r
-    \r

     /**\r
      * Processes the result of the request for and access token send \r
      * to an OAuth authorization server.\r
     /**\r
      * Processes the result of the request for and access token send \r
      * to an OAuth authorization server.\r