X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/fe1b334ce6b23d495f10ba0240ab3892793fa0bc..a957efbd3df9bc957b078f3a12b47ca3258cb699:/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 07c9d537..6eae48f0 100644 --- a/src/com/owncloud/android/authentication/AuthenticatorActivity.java +++ b/src/com/owncloud/android/authentication/AuthenticatorActivity.java @@ -18,7 +18,6 @@ package com.owncloud.android.authentication; -import com.owncloud.android.AccountUtils; import com.owncloud.android.Log_OC; import com.owncloud.android.ui.dialog.SslValidatorDialog; import com.owncloud.android.ui.dialog.SslValidatorDialog.OnSslValidatorListener; @@ -61,7 +60,6 @@ import android.view.inputmethod.EditorInfo; import android.widget.CheckBox; import android.widget.EditText; import android.widget.Button; -import android.widget.ImageView; import android.widget.TextView; import android.widget.Toast; import android.widget.TextView.OnEditorActionListener; @@ -77,7 +75,7 @@ import eu.alefzero.webdav.WebdavClient; * @author David A. Velasco */ public class AuthenticatorActivity extends AccountAuthenticatorActivity - implements OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeListener, OnEditorActionListener { +implements OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeListener, OnEditorActionListener { private static final String TAG = AuthenticatorActivity.class.getSimpleName(); @@ -85,18 +83,21 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity public static final String EXTRA_USER_NAME = "USER_NAME"; public static final String EXTRA_HOST_NAME = "HOST_NAME"; public static final String EXTRA_ACTION = "ACTION"; - + private static final String KEY_HOST_URL_TEXT = "HOST_URL_TEXT"; private static final String KEY_OC_VERSION = "OC_VERSION"; private static final String KEY_ACCOUNT = "ACCOUNT"; - private static final String KEY_SERVER_CHECKED_AND_VALID = "SERVER_CHECKED_AND_VALID"; + private static final String KEY_SERVER_VALID = "SERVER_VALID"; + private static final String KEY_SERVER_CHECKED = "SERVER_CHECKED"; private static final String KEY_SERVER_CHECK_IN_PROGRESS = "SERVER_CHECK_IN_PROGRESS"; private static final String KEY_SERVER_STATUS_TEXT = "SERVER_STATUS_TEXT"; private static final String KEY_SERVER_STATUS_ICON = "SERVER_STATUS_ICON"; private static final String KEY_IS_SSL_CONN = "IS_SSL_CONN"; + private static final String KEY_PASSWORD_VISIBLE = "PASSWORD_VISIBLE"; private static final String KEY_AUTH_STATUS_TEXT = "AUTH_STATUS_TEXT"; private static final String KEY_AUTH_STATUS_ICON = "AUTH_STATUS_ICON"; - + private static final String KEY_REFRESH_BUTTON_ENABLED = "KEY_REFRESH_BUTTON_ENABLED"; + private static final String OAUTH_MODE_ON = "on"; private static final String OAUTH_MODE_OFF = "off"; private static final String OAUTH_MODE_OPTIONAL = "optional"; @@ -108,15 +109,14 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity public static final byte ACTION_CREATE = 0; public static final byte ACTION_UPDATE_TOKEN = 1; - private String mHostBaseUrl; private OwnCloudVersion mDiscoveredVersion; - + private int mServerStatusText, mServerStatusIcon; - private boolean mServerCheckedAndValid, mIsSslConn; + private boolean mServerIsChecked, mServerIsValid, mIsSslConn; private int mAuthStatusText, mAuthStatusIcon; - + private final Handler mHandler = new Handler(); private Thread mOperationThread; private OwnCloudServerCheckOperation mOcServerChkOperation; @@ -124,13 +124,12 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity private RemoteOperationResult mLastSslUntrustedServerResult; private Uri mNewCapturedUriFromOAuth2Redirection; - + private AccountManager mAccountMgr; private boolean mJustCreated; private byte mAction; private Account mAccount; - - private ImageView mViewPasswordButton; + private EditText mHostUrlInput; private EditText mUsernameInput; private EditText mPasswordInput; @@ -138,13 +137,13 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity private String mOAuthAccessToken; private View mOkButton; private TextView mAuthStatusLayout; - + private TextView mOAuthAuthEndpointText; private TextView mOAuthTokenEndpointText; - - private HostUrlWatcher mHostUrlChangedListener; - + private boolean mRefreshButtonEnabled; + + /** * {@inheritDoc} * @@ -154,10 +153,9 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); getWindow().requestFeature(Window.FEATURE_NO_TITLE); - + /// set view and get references to view elements setContentView(R.layout.account_setup); - mViewPasswordButton = (ImageView) findViewById(R.id.viewPasswordButton); mHostUrlInput = (EditText) findViewById(R.id.hostUrlInput); mUsernameInput = (EditText) findViewById(R.id.account_username); mPasswordInput = (EditText) findViewById(R.id.account_password); @@ -166,7 +164,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity mOAuth2Check = (CheckBox) findViewById(R.id.oauth_onOff_check); mOkButton = findViewById(R.id.buttonOK); mAuthStatusLayout = (TextView) findViewById(R.id.auth_status_text); - + /// complete label for 'register account' button Button b = (Button) findViewById(R.id.account_register); if (b != null) { @@ -183,14 +181,15 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity if (savedInstanceState == null) { /// connection state and info mServerStatusText = mServerStatusIcon = 0; - mServerCheckedAndValid = false; + mServerIsValid = false; + mServerIsChecked = false; mIsSslConn = false; mAuthStatusText = mAuthStatusIcon = 0; - + /// retrieve extras from intent String tokenType = getIntent().getExtras().getString(AccountAuthenticator.KEY_AUTH_TOKEN_TYPE); boolean oAuthRequired = AccountAuthenticator.AUTH_TOKEN_TYPE_ACCESS_TOKEN.equals(tokenType) || OAUTH_MODE_ON.equals(getString(R.string.oauth2_mode)); - + mAccount = getIntent().getExtras().getParcelable(EXTRA_ACCOUNT); if (mAccount != null) { String ocVersion = mAccountMgr.getUserData(mAccount, AccountAuthenticator.KEY_OC_VERSION); @@ -205,16 +204,20 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity } mOAuth2Check.setChecked(oAuthRequired); changeViewByOAuth2Check(oAuthRequired); - + } else { /// connection state and info - mServerCheckedAndValid = savedInstanceState.getBoolean(KEY_SERVER_CHECKED_AND_VALID); + mServerIsValid = savedInstanceState.getBoolean(KEY_SERVER_VALID); + mServerIsChecked = savedInstanceState.getBoolean(KEY_SERVER_CHECKED); mServerStatusText = savedInstanceState.getInt(KEY_SERVER_STATUS_TEXT); mServerStatusIcon = savedInstanceState.getInt(KEY_SERVER_STATUS_ICON); mIsSslConn = savedInstanceState.getBoolean(KEY_IS_SSL_CONN); mAuthStatusText = savedInstanceState.getInt(KEY_AUTH_STATUS_TEXT); mAuthStatusIcon = savedInstanceState.getInt(KEY_AUTH_STATUS_ICON); + if (savedInstanceState.getBoolean(KEY_PASSWORD_VISIBLE, false)) { + showPassword(); + } /// server data String ocVersion = savedInstanceState.getString(KEY_OC_VERSION); @@ -222,64 +225,82 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity mDiscoveredVersion = new OwnCloudVersion(ocVersion); } mHostBaseUrl = savedInstanceState.getString(KEY_HOST_URL_TEXT); - + // account data, if updating mAccount = savedInstanceState.getParcelable(KEY_ACCOUNT); - + // check if server check was interrupted by a configuration change if (savedInstanceState.getBoolean(KEY_SERVER_CHECK_IN_PROGRESS, false)) { checkOcServer(); - } + } + // refresh button enabled + mRefreshButtonEnabled = savedInstanceState.getBoolean(KEY_REFRESH_BUTTON_ENABLED); + } - + showServerStatus(); showAuthStatus(); - + if (mServerIsChecked && !mServerIsValid && mRefreshButtonEnabled) showRefreshButton(); + mOkButton.setEnabled(mServerIsValid); // state not automatically recovered in configuration changes + if (!OAUTH_MODE_OPTIONAL.equals(getString(R.string.oauth2_mode))) { mOAuth2Check.setVisibility(View.GONE); } - + if (mAction == ACTION_UPDATE_TOKEN) { /// lock things that should not change mHostUrlInput.setEnabled(false); mUsernameInput.setEnabled(false); mOAuth2Check.setVisibility(View.GONE); - if (!mServerCheckedAndValid && mOcServerChkOperation == null) { + if (!mServerIsValid && mOcServerChkOperation == null) { checkOcServer(); } } - + mPasswordInput.setText(""); // clean password to avoid social hacking (disadvantage: password in removed if the device is turned aside) mJustCreated = true; - + /// bind view elements to listeners mHostUrlInput.setOnFocusChangeListener(this); mHostUrlInput.setOnTouchListener(new RightDrawableOnTouchListener() { @Override public boolean onDrawableTouch(final MotionEvent event) { - AuthenticatorActivity.this.onRefreshClick(mHostUrlInput); + if (event.getAction() == MotionEvent.ACTION_UP) { + AuthenticatorActivity.this.onRefreshClick(); + } return true; } }); + mHostUrlInput.addTextChangedListener(new TextWatcher() { + + @Override + public void afterTextChanged(Editable s) { + if (!mHostBaseUrl.equals(normalizeUrl(mHostUrlInput.getText().toString()))) { + mOkButton.setEnabled(false); + } + } + + @Override + public void beforeTextChanged(CharSequence s, int start, int count, int after) {} + + @Override + public void onTextChanged(CharSequence s, int start, int before, int count) {} + + }); mPasswordInput.setOnFocusChangeListener(this); mPasswordInput.setImeOptions(EditorInfo.IME_ACTION_DONE); - mPasswordInput.setOnEditorActionListener(this); - } - - @Override - protected void onStart() { - super.onStart(); - //mHostUrlChangedListener = new HostUrlWatcher(); - //mHostUrlInput.addTextChangedListener(mHostUrlChangedListener); - } - - @Override - protected void onStop() { - super.onStop(); - mHostUrlInput.removeTextChangedListener(mHostUrlChangedListener); + mPasswordInput.setOnEditorActionListener(this); + mPasswordInput.setOnTouchListener(new RightDrawableOnTouchListener() { + @Override + public boolean onDrawableTouch(final MotionEvent event) { + if (event.getAction() == MotionEvent.ACTION_UP) { + AuthenticatorActivity.this.onViewPasswordClick(); + } + return true; + } + }); } - /** * Saves relevant state before {@link #onPause()} @@ -292,27 +313,32 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity @Override protected void onSaveInstanceState(Bundle outState) { super.onSaveInstanceState(outState); - + /// connection state and info outState.putInt(KEY_SERVER_STATUS_TEXT, mServerStatusText); outState.putInt(KEY_SERVER_STATUS_ICON, mServerStatusIcon); - outState.putBoolean(KEY_SERVER_CHECKED_AND_VALID, mServerCheckedAndValid); - outState.putBoolean(KEY_SERVER_CHECK_IN_PROGRESS, (!mServerCheckedAndValid && mOcServerChkOperation != null)); + outState.putBoolean(KEY_SERVER_VALID, mServerIsValid); + outState.putBoolean(KEY_SERVER_CHECKED, mServerIsChecked); + outState.putBoolean(KEY_SERVER_CHECK_IN_PROGRESS, (!mServerIsValid && mOcServerChkOperation != null)); outState.putBoolean(KEY_IS_SSL_CONN, mIsSslConn); + outState.putBoolean(KEY_PASSWORD_VISIBLE, isPasswordVisible()); outState.putInt(KEY_AUTH_STATUS_ICON, mAuthStatusIcon); outState.putInt(KEY_AUTH_STATUS_TEXT, mAuthStatusText); - + /// server data if (mDiscoveredVersion != null) { outState.putString(KEY_OC_VERSION, mDiscoveredVersion.toString()); } outState.putString(KEY_HOST_URL_TEXT, mHostBaseUrl); - + /// account data, if updating if (mAccount != null) { outState.putParcelable(KEY_ACCOUNT, mAccount); } + // refresh button enabled + outState.putBoolean(KEY_REFRESH_BUTTON_ENABLED, mRefreshButtonEnabled); + } @@ -332,7 +358,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity } } - + /** * The redirection triggered by the OAuth authentication server as response to the GET AUTHORIZATION, and * deferred in {@link #onNewIntent(Intent)}, is processed here. @@ -348,15 +374,15 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity else Toast.makeText(this, R.string.auth_expired_basic_auth_toast, Toast.LENGTH_LONG).show(); } - + if (mNewCapturedUriFromOAuth2Redirection != null) { getOAuth2AccessTokenFromCapturedRedirection(); } - + mJustCreated = false; } - - + + /** * Parses the redirection with the response to the GET AUTHORIZATION request to the * oAuth server and requests for the access token (GET ACCESS TOKEN) @@ -365,34 +391,42 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity /// Parse data from OAuth redirection String queryParameters = mNewCapturedUriFromOAuth2Redirection.getQuery(); mNewCapturedUriFromOAuth2Redirection = null; - + /// Showing the dialog with instructions for the user. showDialog(DIALOG_OAUTH2_LOGIN_PROGRESS); /// GET ACCESS TOKEN to the oAuth server RemoteOperation operation = new OAuth2GetAccessToken( getString(R.string.oauth2_client_id), - getString(R.string.oauth2_redirect_uri), - getString(R.string.oauth2_grant_type), - queryParameters); + getString(R.string.oauth2_redirect_uri), + getString(R.string.oauth2_grant_type), + queryParameters); //WebdavClient client = OwnCloudClientUtils.createOwnCloudClient(Uri.parse(getString(R.string.oauth2_url_endpoint_access)), getApplicationContext()); WebdavClient client = OwnCloudClientUtils.createOwnCloudClient(Uri.parse(mOAuthTokenEndpointText.getText().toString().trim()), getApplicationContext()); operation.execute(client, this, mHandler); } - - + + /** * Handles the change of focus on the text inputs for the server URL and the password */ public void onFocusChange(View view, boolean hasFocus) { - if (view.getId() == R.id.hostUrlInput && !hasFocus) { - onUrlInputFocusLost((TextView) view); - + if (view.getId() == R.id.hostUrlInput) { + if (!hasFocus) { + onUrlInputFocusLost((TextView) view); + if (!mServerIsValid) { + showRefreshButton(); + } + } + else { + hideRefreshButton(); + } + } else if (view.getId() == R.id.account_password) { onPasswordFocusChanged((TextView) view, hasFocus); } } - + /** * Handles changes in focus on the text input for the server URL. @@ -408,15 +442,19 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity private void onUrlInputFocusLost(TextView hostInput) { if (!mHostBaseUrl.equals(normalizeUrl(mHostUrlInput.getText().toString()))) { checkOcServer(); + } else { + mOkButton.setEnabled(mServerIsValid); } } private void checkOcServer() { - String uri = mHostUrlInput.getText().toString().trim(); - mServerCheckedAndValid = false; + String uri = trimUrlWebdav(mHostUrlInput.getText().toString().trim()); + mServerIsValid = false; + mServerIsChecked = false; mOkButton.setEnabled(false); mDiscoveredVersion = null; + hideRefreshButton(); if (uri.length() != 0) { mServerStatusText = R.string.auth_testing_connection; mServerStatusIcon = R.drawable.progress_small; @@ -425,7 +463,6 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity WebdavClient client = OwnCloudClientUtils.createOwnCloudClient(Uri.parse(uri), this); mOperationThread = mOcServerChkOperation.execute(client, this, mHandler); } else { - mHostUrlInput.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0); mServerStatusText = 0; mServerStatusIcon = 0; showServerStatus(); @@ -445,15 +482,42 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity */ private void onPasswordFocusChanged(TextView passwordInput, boolean hasFocus) { if (hasFocus) { - mViewPasswordButton.setVisibility(View.VISIBLE); + showViewPasswordButton(); } else { - int input_type = InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD; - passwordInput.setInputType(input_type); - mViewPasswordButton.setVisibility(View.INVISIBLE); + hidePassword(); + hidePasswordButton(); } } + private void showViewPasswordButton() { + //int drawable = android.R.drawable.ic_menu_view; + int drawable = R.drawable.ic_view; + if (isPasswordVisible()) { + //drawable = android.R.drawable.ic_secure; + drawable = R.drawable.ic_hide; + } + mPasswordInput.setCompoundDrawablesWithIntrinsicBounds(0, 0, drawable, 0); + } + + private boolean isPasswordVisible() { + return ((mPasswordInput.getInputType() & InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD) == InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD); + } + + private void hidePasswordButton() { + mPasswordInput.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0); + } + + private void showPassword() { + mPasswordInput.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD); + showViewPasswordButton(); + } + + private void hidePassword() { + mPasswordInput.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD); + showViewPasswordButton(); + } + /** * Cancels the authenticator activity @@ -468,9 +532,9 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity setResult(RESULT_CANCELED); // TODO review how is this related to AccountAuthenticator (debugging) finish(); } - - - + + + /** * Checks the credentials of the user in the root of the ownCloud server * before creating a new local account. @@ -495,16 +559,16 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity Log_OC.wtf(TAG, "The user was allowed to click 'connect' to an unchecked server!!"); return; } - + if (mOAuth2Check.isChecked()) { startOauthorization(); - + } else { checkBasicAuthorization(); } } - - + + /** * Tests the credentials entered by the user performing a check of existence on * the root folder of the ownCloud server. @@ -512,14 +576,14 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity private void checkBasicAuthorization() { /// get the path to the root folder through WebDAV from the version server String webdav_path = AccountUtils.getWebdavPath(mDiscoveredVersion, false); - + /// get basic credentials entered by user String username = mUsernameInput.getText().toString(); String password = mPasswordInput.getText().toString(); - + /// be gentle with the user showDialog(DIALOG_LOGIN_PROGRESS); - + /// test credentials accessing the root folder mAuthCheckOperation = new ExistenceCheckOperation("", this, false); WebdavClient client = OwnCloudClientUtils.createOwnCloudClient(Uri.parse(mHostBaseUrl + webdav_path), this); @@ -534,10 +598,10 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity */ private void startOauthorization() { // be gentle with the user - mServerStatusIcon = R.drawable.progress_small; - mServerStatusText = R.string.oauth_login_connection; + mAuthStatusIcon = R.drawable.progress_small; + mAuthStatusText = R.string.oauth_login_connection; showAuthStatus(); - + // GET AUTHORIZATION request //Uri uri = Uri.parse(getString(R.string.oauth2_url_endpoint_auth)); Uri uri = Uri.parse(mOAuthAuthEndpointText.getText().toString().trim()); @@ -553,7 +617,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity startActivity(i); } - + /** * Callback method invoked when a RemoteOperation executed by this Activity finishes. * @@ -564,16 +628,16 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity if (operation instanceof OwnCloudServerCheckOperation) { onOcServerCheckFinish((OwnCloudServerCheckOperation) operation, result); - + } else if (operation instanceof OAuth2GetAccessToken) { onGetOAuthAccessTokenFinish((OAuth2GetAccessToken)operation, result); - + } else if (operation instanceof ExistenceCheckOperation) { onAuthorizationCheckFinish((ExistenceCheckOperation)operation, result); - + } } - + /** * Processes the result of the server check performed when the user finishes the enter of the @@ -585,36 +649,35 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity private void onOcServerCheckFinish(OwnCloudServerCheckOperation operation, RemoteOperationResult result) { if (operation.equals(mOcServerChkOperation)) { /// save result state - mServerCheckedAndValid = result.isSuccess(); + mServerIsChecked = true; + mServerIsValid = result.isSuccess(); mIsSslConn = (result.getCode() == ResultCode.OK_SSL); mOcServerChkOperation = null; - + /// update status icon and text - updateStatusIconAndText(result); + if (mServerIsValid) { + hideRefreshButton(); + } else { + showRefreshButton(); + } + updateServerStatusIconAndText(result); showServerStatus(); - + /// very special case (TODO: move to a common place for all the remote operations) if (result.getCode() == ResultCode.SSL_RECOVERABLE_PEER_UNVERIFIED) { mLastSslUntrustedServerResult = result; showDialog(DIALOG_SSL_VALIDATOR); } - - /// update the visibility of the 'retry connection' button - if (!mServerCheckedAndValid) { - mHostUrlInput.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.ic_action_refresh_black, 0); - } else { - mHostUrlInput.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0); - } - + /// retrieve discovered version and normalize server URL mDiscoveredVersion = operation.getDiscoveredVersion(); mHostBaseUrl = normalizeUrl(mHostUrlInput.getText().toString()); - + /// allow or not the user try to access the server - mOkButton.setEnabled(mServerCheckedAndValid); - + mOkButton.setEnabled(mServerIsValid); + } // else nothing ; only the last check operation is considered; - // multiple can be triggered if the user amends a URL before a previous check can be triggered + // multiple can be triggered if the user amends a URL before a previous check can be triggered } @@ -628,29 +691,47 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity } else { url = "http://" + url; } - } + + // OC-208: Add suffix remote.php/webdav to normalize (OC-34) + url = trimUrlWebdav(url); + if (url.endsWith("/")) { url = url.substring(0, url.length() - 1); } + } - return url; + Log_OC.d(TAG, "URL Normalize " + url); + return (url != null ? url : ""); } + + private String trimUrlWebdav(String url){ + if(url.toLowerCase().endsWith(AccountUtils.WEBDAV_PATH_4_0)){ + url = url.substring(0, url.length() - AccountUtils.WEBDAV_PATH_4_0.length()); + } else if(url.toLowerCase().endsWith(AccountUtils.WEBDAV_PATH_2_0)){ + url = url.substring(0, url.length() - AccountUtils.WEBDAV_PATH_2_0.length()); + } else if (url.toLowerCase().endsWith(AccountUtils.WEBDAV_PATH_1_2)){ + url = url.substring(0, url.length() - AccountUtils.WEBDAV_PATH_1_2.length()); + } + return (url != null ? url : ""); + } + + /** * Chooses the right icon and text to show to the user for the received operation result. * * @param result Result of a remote operation performed in this activity */ - private void updateStatusIconAndText(RemoteOperationResult result) { - mServerStatusText = mServerStatusIcon = 0; + private void updateServerStatusIconAndText(RemoteOperationResult result) { + mServerStatusIcon = R.drawable.common_error; // the most common case in the switch below switch (result.getCode()) { case OK_SSL: mServerStatusIcon = android.R.drawable.ic_secure; mServerStatusText = R.string.auth_secure_connection; break; - + case OK_NO_SSL: case OK: if (mHostUrlInput.getText().toString().trim().toLowerCase().startsWith("http://") ) { @@ -661,70 +742,132 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity mServerStatusIcon = android.R.drawable.ic_partial_secure; } break; - + + case NO_NETWORK_CONNECTION: + mServerStatusIcon = R.drawable.no_network; + mServerStatusText = R.string.auth_no_net_conn_title; + break; + case SSL_RECOVERABLE_PEER_UNVERIFIED: - mServerStatusIcon = R.drawable.common_error; mServerStatusText = R.string.auth_ssl_unverified_server_title; break; - case BAD_OC_VERSION: - mServerStatusIcon = R.drawable.common_error; mServerStatusText = R.string.auth_bad_oc_version_title; break; case WRONG_CONNECTION: - mServerStatusIcon = R.drawable.common_error; mServerStatusText = R.string.auth_wrong_connection_title; break; case TIMEOUT: - mServerStatusIcon = R.drawable.common_error; mServerStatusText = R.string.auth_timeout_title; break; case INCORRECT_ADDRESS: - mServerStatusIcon = R.drawable.common_error; mServerStatusText = R.string.auth_incorrect_address_title; break; - case SSL_ERROR: - mServerStatusIcon = R.drawable.common_error; mServerStatusText = R.string.auth_ssl_general_error_title; break; - case UNAUTHORIZED: - mServerStatusIcon = R.drawable.common_error; mServerStatusText = R.string.auth_unauthorized; break; case HOST_NOT_AVAILABLE: - mServerStatusIcon = R.drawable.common_error; mServerStatusText = R.string.auth_unknown_host_title; break; - case NO_NETWORK_CONNECTION: - mServerStatusIcon = R.drawable.no_network; - mServerStatusText = R.string.auth_no_net_conn_title; - break; case INSTANCE_NOT_CONFIGURED: - mServerStatusIcon = R.drawable.common_error; mServerStatusText = R.string.auth_not_configured_title; break; case FILE_NOT_FOUND: - mServerStatusIcon = R.drawable.common_error; mServerStatusText = R.string.auth_incorrect_path_title; break; case OAUTH2_ERROR: - mServerStatusIcon = R.drawable.common_error; mServerStatusText = R.string.auth_oauth_error; break; case OAUTH2_ERROR_ACCESS_DENIED: - mServerStatusIcon = R.drawable.common_error; mServerStatusText = R.string.auth_oauth_error_access_denied; break; case UNHANDLED_HTTP_CODE: case UNKNOWN_ERROR: - mServerStatusIcon = R.drawable.common_error; mServerStatusText = R.string.auth_unknown_error_title; break; - default: + mServerStatusText = 0; + mServerStatusIcon = 0; + } + } + + + /** + * Chooses the right icon and text to show to the user for the received operation result. + * + * @param result Result of a remote operation performed in this activity + */ + private void updateAuthStatusIconAndText(RemoteOperationResult result) { + mAuthStatusIcon = R.drawable.common_error; // the most common case in the switch below + + switch (result.getCode()) { + case OK_SSL: + mAuthStatusIcon = android.R.drawable.ic_secure; + mAuthStatusText = R.string.auth_secure_connection; + break; + + case OK_NO_SSL: + case OK: + if (mHostUrlInput.getText().toString().trim().toLowerCase().startsWith("http://") ) { + mAuthStatusText = R.string.auth_connection_established; + mAuthStatusIcon = R.drawable.ic_ok; + } else { + mAuthStatusText = R.string.auth_nossl_plain_ok_title; + mAuthStatusIcon = android.R.drawable.ic_partial_secure; + } break; + + case NO_NETWORK_CONNECTION: + mAuthStatusIcon = R.drawable.no_network; + mAuthStatusText = R.string.auth_no_net_conn_title; + break; + + case SSL_RECOVERABLE_PEER_UNVERIFIED: + mAuthStatusText = R.string.auth_ssl_unverified_server_title; + break; + case BAD_OC_VERSION: + mAuthStatusText = R.string.auth_bad_oc_version_title; + break; + case WRONG_CONNECTION: + mAuthStatusText = R.string.auth_wrong_connection_title; + break; + case TIMEOUT: + mAuthStatusText = R.string.auth_timeout_title; + break; + case INCORRECT_ADDRESS: + mAuthStatusText = R.string.auth_incorrect_address_title; + break; + case SSL_ERROR: + mAuthStatusText = R.string.auth_ssl_general_error_title; + break; + case UNAUTHORIZED: + mAuthStatusText = R.string.auth_unauthorized; + break; + case HOST_NOT_AVAILABLE: + mAuthStatusText = R.string.auth_unknown_host_title; + break; + case INSTANCE_NOT_CONFIGURED: + mAuthStatusText = R.string.auth_not_configured_title; + break; + case FILE_NOT_FOUND: + mAuthStatusText = R.string.auth_incorrect_path_title; + break; + case OAUTH2_ERROR: + mAuthStatusText = R.string.auth_oauth_error; + break; + case OAUTH2_ERROR_ACCESS_DENIED: + mAuthStatusText = R.string.auth_oauth_error_access_denied; + break; + case UNHANDLED_HTTP_CODE: + case UNKNOWN_ERROR: + mAuthStatusText = R.string.auth_unknown_error_title; + break; + default: + mAuthStatusText = 0; + mAuthStatusIcon = 0; } } @@ -747,7 +890,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity if (result.isSuccess() && webdav_path != null) { /// be gentle with the user showDialog(DIALOG_LOGIN_PROGRESS); - + /// time to test the retrieved access token on the ownCloud server mOAuthAccessToken = ((OAuth2GetAccessToken)operation).getResultTokenMap().get(OAuth2Constants.KEY_ACCESS_TOKEN); Log_OC.d(TAG, "Got ACCESS TOKEN: " + mOAuthAccessToken); @@ -755,15 +898,15 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity WebdavClient client = OwnCloudClientUtils.createOwnCloudClient(Uri.parse(mHostBaseUrl + webdav_path), this); client.setBearerCredentials(mOAuthAccessToken); mAuthCheckOperation.execute(client, this, mHandler); - + } else { - updateStatusIconAndText(result); + updateAuthStatusIconAndText(result); showAuthStatus(); Log_OC.d(TAG, "Access failed: " + result.getLogMessage()); } } - + /** * Processes the result of the access check performed to try the user credentials. * @@ -778,27 +921,53 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity } catch (IllegalArgumentException e) { // NOTHING TO DO ; can't find out what situation that leads to the exception in this code, but user logs signal that it happens } - + if (result.isSuccess()) { Log_OC.d(TAG, "Successful access - time to save the account"); if (mAction == ACTION_CREATE) { createAccount(); - + } else { updateToken(); } - + finish(); + + } else if (result.isServerFail() || result.isException()) { + /// if server fail or exception in authorization, the UI is updated as when a server check failed + mServerIsChecked = true; + mServerIsValid = false; + mIsSslConn = false; + mOcServerChkOperation = null; + mDiscoveredVersion = null; + mHostBaseUrl = normalizeUrl(mHostUrlInput.getText().toString()); + + // update status icon and text + updateServerStatusIconAndText(result); + showServerStatus(); + mAuthStatusIcon = 0; + mAuthStatusText = 0; + showAuthStatus(); - } else { - updateStatusIconAndText(result); + // update input controls state + showRefreshButton(); + mOkButton.setEnabled(false); + + // very special case (TODO: move to a common place for all the remote operations) (dangerous here?) + if (result.getCode() == ResultCode.SSL_RECOVERABLE_PEER_UNVERIFIED) { + mLastSslUntrustedServerResult = result; + showDialog(DIALOG_SSL_VALIDATOR); + } + + } else { // authorization fail due to client side - probably wrong credentials + updateAuthStatusIconAndText(result); showAuthStatus(); Log_OC.d(TAG, "Access failed: " + result.getLogMessage()); } } - + /** * Sets the proper response to get that the Account Authenticator that started this activity saves * a new authorization token for mAccount. @@ -830,7 +999,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity private void createAccount() { /// create and save new ownCloud account boolean isOAuth = mOAuth2Check.isChecked(); - + Uri uri = Uri.parse(mHostBaseUrl); String username = mUsernameInput.getText().toString().trim(); if (isOAuth) { @@ -872,10 +1041,10 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity mAccountMgr.setUserData(mAccount, AccountAuthenticator.KEY_OC_BASE_URL, mHostBaseUrl); if (isOAuth) mAccountMgr.setUserData(mAccount, AccountAuthenticator.KEY_SUPPORTS_OAUTH2, "TRUE"); // TODO this flag should be unnecessary - + setAccountAuthenticatorResult(intent.getExtras()); setResult(RESULT_OK, intent); - + /// immediately request for the synchronization of the new account Bundle bundle = new Bundle(); bundle.putBoolean(ContentResolver.SYNC_EXTRAS_MANUAL, true); @@ -906,7 +1075,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity } } - + /** * {@inheritDoc} */ @@ -921,17 +1090,17 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity working_dialog.setIndeterminate(true); working_dialog.setCancelable(true); working_dialog - .setOnCancelListener(new DialogInterface.OnCancelListener() { - @Override - public void onCancel(DialogInterface dialog) { - /// TODO study if this is enough - Log_OC.i(TAG, "Login canceled"); - if (mOperationThread != null) { - mOperationThread.interrupt(); - finish(); - } - } - }); + .setOnCancelListener(new DialogInterface.OnCancelListener() { + @Override + public void onCancel(DialogInterface dialog) { + /// TODO study if this is enough + Log_OC.i(TAG, "Login canceled"); + if (mOperationThread != null) { + mOperationThread.interrupt(); + finish(); + } + } + }); dialog = working_dialog; break; } @@ -961,11 +1130,11 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity builder.setMessage(getResources().getString(R.string.ssl_validator_not_saved)); builder.setCancelable(false); builder.setPositiveButton(R.string.common_ok, new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - dialog.dismiss(); - }; - }); + @Override + public void onClick(DialogInterface dialog, int which) { + dialog.dismiss(); + }; + }); dialog = builder.create(); break; } @@ -975,7 +1144,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity return dialog; } - + /** * Starts and activity to open the 'new account' page in the ownCloud web site * @@ -987,7 +1156,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity startActivity(register); } - + /** * Updates the content and visibility state of the icon and text associated * to the last check on the ownCloud server. @@ -997,14 +1166,16 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity if (mServerStatusIcon == 0 && mServerStatusText == 0) { tv.setVisibility(View.INVISIBLE); + } else { tv.setText(mServerStatusText); tv.setCompoundDrawablesWithIntrinsicBounds(mServerStatusIcon, 0, 0, 0); tv.setVisibility(View.VISIBLE); } + } - - + + /** * Updates the content and visibility state of the icon and text associated * to the interactions with the OAuth authorization server. @@ -1012,6 +1183,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity private void showAuthStatus() { if (mAuthStatusIcon == 0 && mAuthStatusText == 0) { mAuthStatusLayout.setVisibility(View.INVISIBLE); + } else { mAuthStatusLayout.setText(mAuthStatusText); mAuthStatusLayout.setCompoundDrawablesWithIntrinsicBounds(mAuthStatusIcon, 0, 0, 0); @@ -1019,7 +1191,17 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity } } - + + private void showRefreshButton() { + mHostUrlInput.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.ic_action_refresh_black, 0); + mRefreshButtonEnabled = true; + } + + private void hideRefreshButton() { + mHostUrlInput.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0); + mRefreshButtonEnabled = false; + } + /** * Called when the refresh button in the input field for ownCloud host is clicked. * @@ -1027,7 +1209,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity * * @param view Refresh 'button' */ - public void onRefreshClick(View view) { + public void onRefreshClick() { checkOcServer(); } @@ -1036,25 +1218,19 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity * Called when the eye icon in the password field is clicked. * * Toggles the visibility of the password in the field. - * - * @param view 'View password' 'button' */ - public void onViewPasswordClick(View view) { + public void onViewPasswordClick() { int selectionStart = mPasswordInput.getSelectionStart(); int selectionEnd = mPasswordInput.getSelectionEnd(); - int input_type = mPasswordInput.getInputType(); - if ((input_type & InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD) == InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD) { - input_type = InputType.TYPE_CLASS_TEXT - | InputType.TYPE_TEXT_VARIATION_PASSWORD; + if (isPasswordVisible()) { + hidePassword(); } else { - input_type = InputType.TYPE_CLASS_TEXT - | InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD; + showPassword(); } - mPasswordInput.setInputType(input_type); mPasswordInput.setSelection(selectionStart, selectionEnd); } - - + + /** * Called when the checkbox for OAuth authorization is clicked. * @@ -1067,7 +1243,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity changeViewByOAuth2Check(oAuth2Check.isChecked()); } - + /** * Changes the visibility of input elements depending upon the kind of authorization * chosen by the user: basic or OAuth @@ -1075,28 +1251,26 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity * @param checked 'True' when OAuth is selected. */ public void changeViewByOAuth2Check(Boolean checked) { - + if (checked) { mOAuthAuthEndpointText.setVisibility(View.VISIBLE); mOAuthTokenEndpointText.setVisibility(View.VISIBLE); mUsernameInput.setVisibility(View.GONE); mPasswordInput.setVisibility(View.GONE); - mViewPasswordButton.setVisibility(View.GONE); } else { mOAuthAuthEndpointText.setVisibility(View.GONE); mOAuthTokenEndpointText.setVisibility(View.GONE); mUsernameInput.setVisibility(View.VISIBLE); mPasswordInput.setVisibility(View.VISIBLE); - mViewPasswordButton.setVisibility(View.INVISIBLE); } } - + /** * Called from SslValidatorDialog when a new server certificate was correctly saved. */ public void onSavedCertificate() { - mOperationThread = mOcServerChkOperation.retry(this, mHandler); + checkOcServer(); } /** @@ -1125,59 +1299,37 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity return false; // always return false to grant that the software keyboard is hidden anyway } - + private abstract static class RightDrawableOnTouchListener implements OnTouchListener { - private int fuzz = 10; + private int fuzz = 75; /** * {@inheritDoc} */ @Override public boolean onTouch(View view, MotionEvent event) { - if (event.getAction() == MotionEvent.ACTION_DOWN) { - Drawable rightDrawable = null; - if (view instanceof TextView) { - Drawable[] drawables = ((TextView)view).getCompoundDrawables(); - if (drawables.length > 2) { - rightDrawable = drawables[2]; - } + Drawable rightDrawable = null; + if (view instanceof TextView) { + Drawable[] drawables = ((TextView)view).getCompoundDrawables(); + if (drawables.length > 2) { + rightDrawable = drawables[2]; } - if (rightDrawable != null) { - final int x = (int) event.getX(); - final int y = (int) event.getY(); - final Rect bounds = rightDrawable.getBounds(); - if (x >= (view.getRight() - bounds.width() - fuzz) && x <= (view.getRight() - view.getPaddingRight() + fuzz) - && y >= (view.getPaddingTop() - fuzz) && y <= (view.getHeight() - view.getPaddingBottom()) + fuzz) { - - return onDrawableTouch(event); - } + } + if (rightDrawable != null) { + final int x = (int) event.getX(); + final int y = (int) event.getY(); + final Rect bounds = rightDrawable.getBounds(); + if (x >= (view.getRight() - bounds.width() - fuzz) && x <= (view.getRight() - view.getPaddingRight() + fuzz) + && y >= (view.getPaddingTop() - fuzz) && y <= (view.getHeight() - view.getPaddingBottom()) + fuzz) { + + return onDrawableTouch(event); } } return false; } - + public abstract boolean onDrawableTouch(final MotionEvent event); } - - - private class HostUrlWatcher implements TextWatcher { - @Override - public void afterTextChanged(Editable s) { - } - - @Override - public void beforeTextChanged(CharSequence s, int start, int count, int after) { - } - - @Override - public void onTextChanged(CharSequence s, int start, int before, int count) { - if (mServerCheckedAndValid) { - mServerCheckedAndValid = false; - mOkButton.setEnabled(false); // avoids that the 'connect' button can be clicked if the test was previously passed - } - } - - } }