|
@@ -189,6 +189,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
|
|
|
public static final String SUBDOMAIN_SERVER_INPUT_TYPE = "prefix";
|
|
|
public static final String DIRECTORY_SERVER_INPUT_TYPE = "suffix";
|
|
|
public static final int NO_ICON = 0;
|
|
|
+ public static final String EMPTY_STRING = "";
|
|
|
|
|
|
/// parameters from EXTRAs in starter Intent
|
|
|
private byte mAction;
|
|
@@ -208,7 +209,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
|
|
|
private TextView mServerStatusView;
|
|
|
|
|
|
private TextWatcher mHostUrlInputWatcher;
|
|
|
- private String mServerStatusText = "";
|
|
|
+ private String mServerStatusText = EMPTY_STRING;
|
|
|
private int mServerStatusIcon;
|
|
|
|
|
|
private boolean mServerIsChecked;
|
|
@@ -228,10 +229,10 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
|
|
|
|
|
|
private WebView mLoginWebView;
|
|
|
|
|
|
- private String mAuthStatusText = "";
|
|
|
+ private String mAuthStatusText = EMPTY_STRING;
|
|
|
private int mAuthStatusIcon;
|
|
|
|
|
|
- private String mAuthToken = "";
|
|
|
+ private String mAuthToken = EMPTY_STRING;
|
|
|
private AuthenticatorAsyncTask mAsyncTask;
|
|
|
|
|
|
private boolean mIsFirstAuthAttempt;
|
|
@@ -756,7 +757,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
|
|
|
if (mAuthStatusIcon != 0) {
|
|
|
Log_OC.d(TAG, "onTextChanged: hiding authentication status");
|
|
|
mAuthStatusIcon = 0;
|
|
|
- mAuthStatusText = "";
|
|
|
+ mAuthStatusText = EMPTY_STRING;
|
|
|
showAuthStatus();
|
|
|
}
|
|
|
}
|
|
@@ -817,7 +818,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
|
|
|
mUsernameInput.setEnabled(false);
|
|
|
mUsernameInput.setFocusable(false);
|
|
|
}
|
|
|
- mPasswordInput.setText(""); // clean password to avoid social hacking
|
|
|
+ mPasswordInput.setText(EMPTY_STRING); // clean password to avoid social hacking
|
|
|
if (isPasswordExposed) {
|
|
|
showPassword();
|
|
|
}
|
|
@@ -1181,7 +1182,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
|
|
|
}
|
|
|
|
|
|
} else {
|
|
|
- mServerStatusText = "";
|
|
|
+ mServerStatusText = EMPTY_STRING;
|
|
|
mServerStatusIcon = 0;
|
|
|
if (!webViewLoginMethod) {
|
|
|
showServerStatus();
|
|
@@ -1405,7 +1406,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
|
|
|
if (!webViewLoginMethod && !mUsernameInput.getText().toString().trim().equals(username)) {
|
|
|
// fail - not a new account, but an existing one; disallow
|
|
|
result = new RemoteOperationResult(ResultCode.ACCOUNT_NOT_THE_SAME);
|
|
|
- mAuthToken = "";
|
|
|
+ mAuthToken = EMPTY_STRING;
|
|
|
updateAuthStatusIconAndText(result);
|
|
|
showAuthStatus();
|
|
|
Log_OC.d(TAG, result.getLogMessage());
|
|
@@ -1624,7 +1625,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
|
|
|
mServerStatusText = getResources().getString(R.string.untrusted_domain);
|
|
|
break;
|
|
|
default:
|
|
|
- mServerStatusText = "";
|
|
|
+ mServerStatusText = EMPTY_STRING;
|
|
|
mServerStatusIcon = 0;
|
|
|
break;
|
|
|
}
|
|
@@ -1720,7 +1721,6 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-
|
|
|
/**
|
|
|
* Processes the result of the access check performed to try the user credentials.
|
|
|
*
|
|
@@ -1792,7 +1792,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
|
|
|
updateServerStatusIconAndText(result);
|
|
|
showServerStatus();
|
|
|
mAuthStatusIcon = 0;
|
|
|
- mAuthStatusText = "";
|
|
|
+ mAuthStatusText = EMPTY_STRING;
|
|
|
if (!webViewLoginMethod) {
|
|
|
showAuthStatus();
|
|
|
|
|
@@ -1825,7 +1825,6 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-
|
|
|
/**
|
|
|
* Updates the authentication token.
|
|
|
*
|
|
@@ -1875,7 +1874,6 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
|
|
|
|
|
|
}
|
|
|
|
|
|
-
|
|
|
/**
|
|
|
* Creates a new account through the Account Authenticator that started this activity.
|
|
|
*
|
|
@@ -1924,7 +1922,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
|
|
|
|
|
|
if (isOAuth || isSaml) {
|
|
|
// with external authorizations, the password is never input in the app
|
|
|
- mAccountMgr.addAccountExplicitly(mAccount, "", null);
|
|
|
+ mAccountMgr.addAccountExplicitly(mAccount, EMPTY_STRING, null);
|
|
|
} else {
|
|
|
if (!webViewLoginMethod) {
|
|
|
mAccountMgr.addAccountExplicitly(mAccount, mPasswordInput.getText().toString(), null);
|
|
@@ -1985,12 +1983,13 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ /**
|
|
|
/**
|
|
|
* Updates the content and visibility state of the icon and text associated
|
|
|
* to the last check on the ownCloud server.
|
|
|
*/
|
|
|
private void showServerStatus() {
|
|
|
- if (mServerStatusIcon == NO_ICON && "".equals(mServerStatusText)) {
|
|
|
+ if (mServerStatusIcon == NO_ICON && EMPTY_STRING.equals(mServerStatusText)) {
|
|
|
mServerStatusView.setVisibility(View.INVISIBLE);
|
|
|
} else {
|
|
|
mServerStatusView.setText(mServerStatusText);
|
|
@@ -1999,13 +1998,12 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-
|
|
|
/**
|
|
|
* Updates the content and visibility state of the icon and text associated
|
|
|
* to the interactions with the OAuth authorization server.
|
|
|
*/
|
|
|
private void showAuthStatus() {
|
|
|
- if (mAuthStatusIcon == NO_ICON && "".equals(mAuthStatusText)) {
|
|
|
+ if (mAuthStatusIcon == NO_ICON && EMPTY_STRING.equals(mAuthStatusText)) {
|
|
|
mAuthStatusView.setVisibility(View.INVISIBLE);
|
|
|
} else {
|
|
|
mAuthStatusView.setText(mAuthStatusText);
|
|
@@ -2014,7 +2012,6 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-
|
|
|
private void showRefreshButton(boolean show) {
|
|
|
if (webViewLoginMethod && mRefreshButton != null) {
|
|
|
if (show) {
|