projects
/
pub
/
Android
/
ownCloud.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "OC-3242: Add new error message for fail in GetUserName"
[pub/Android/ownCloud.git]
/
src
/
com
/
owncloud
/
android
/
authentication
/
AuthenticatorActivity.java
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
- update
StatusIconFailUserName(
);
\r
+ update
AuthStatusIconAndText(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