mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-23 13:45:35 +03:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
This reverts commit 564bbf7bb8.
This commit is contained in:
masensio 2014-03-11 14:40:38 +01:00
parent 564bbf7bb8
commit 660f97baab
3 changed files with 2 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
owncloud-android-library

@ -1 +1 @@
Subproject commit a610dc3cd3eb9b1ddbf899476ea50d08e1674ca7
Subproject commit 1dbc9a121e8818d0202d3aaec31bce1335ee428b

1
res/values/strings.xml
View file

@ -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>

8
src/com/owncloud/android/authentication/AuthenticatorActivity.java
View file

@ -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.