import android.os.Bundle;\r
import android.os.Handler;\r
import android.preference.PreferenceManager;\r
+import android.support.v4.app.DialogFragment;\r
import android.support.v4.app.Fragment;\r
import android.support.v4.app.FragmentManager;\r
import android.support.v4.app.FragmentTransaction;\r
import com.owncloud.android.lib.resources.files.ExistenceCheckRemoteOperation;\r
import com.owncloud.android.lib.resources.users.GetRemoteUserNameOperation;\r
+import com.owncloud.android.ui.dialog.AlertMessageDialog;\r
import com.owncloud.android.ui.dialog.SamlWebViewDialog;\r
import com.owncloud.android.ui.dialog.SslUntrustedCertDialog;\r
import com.owncloud.android.ui.dialog.SslUntrustedCertDialog.OnSslUntrustedCertListener;\r
public static final byte ACTION_UPDATE_TOKEN = 1;\r
\r
private static final String TAG_SAML_DIALOG = "samlWebViewDialog";\r
+ private static final String TAG_ALERT_MESSAGE_DIALOG = "alertMessagewDialog";\r
\r
private String mHostBaseUrl;\r
private OwnCloudVersion mDiscoveredVersion;\r
private boolean mResumed; // Control if activity is resumed\r
\r
public static String DIALOG_UNTRUSTED_CERT = "DIALOG_UNTRUSTED_CERT";\r
+ \r
+ private boolean mTryEmptyAuthorization = false;\r
\r
\r
/**\r
mIsSslConn = (result.getCode() == ResultCode.OK_SSL);\r
mOcServerChkOperation = null;\r
\r
+ \r
+ /// retrieve discovered version and normalize server URL\r
+ mDiscoveredVersion = operation.getDiscoveredVersion();\r
+ mHostBaseUrl = normalizeUrl(mHostUrlInput.getText().toString());\r
+ \r
/// update status icon and text\r
if (mServerIsValid) {\r
hideRefreshButton();\r
+ // Try to create an account with user and pass "", to know if it is a regular server\r
+ // Update connect button in the answer of this method\r
+ tryEmptyAuthorization();\r
} else {\r
showRefreshButton();\r
}\r
showUntrustedCertDialog(result);\r
}\r
\r
- /// retrieve discovered version and normalize server URL\r
- mDiscoveredVersion = operation.getDiscoveredVersion();\r
- mHostBaseUrl = normalizeUrl(mHostUrlInput.getText().toString());\r
-\r
- /// allow or not the user try to access the server\r
- mOkButton.setEnabled(mServerIsValid);\r
\r
} // else nothing ; only the last check operation is considered; \r
// multiple can be triggered if the user amends a URL before a previous check can be triggered\r
}\r
\r
\r
+ /**\r
+ * Try to access with user/pass ""/"", to know if it is a regular server\r
+ */\r
+ private void tryEmptyAuthorization() {\r
+ mTryEmptyAuthorization = true;\r
+ \r
+ Log_OC.d(TAG, "Trying empty authorization to detect authentication method");\r
+ \r
+ /// be gentle with the user\r
+ showDialog(DIALOG_LOGIN_PROGRESS);\r
+ \r
+ /// get the path to the root folder through WebDAV from the version server\r
+ String webdav_path = AccountUtils.getWebdavPath(mDiscoveredVersion, mAuthTokenType);\r
+\r
+ /// get basic credentials entered by user\r
+ String username = "";\r
+ String password = "";\r
+\r
+ /// test credentials \r
+ mAuthCheckOperation = new ExistenceCheckRemoteOperation("", this, false);\r
+ OwnCloudClient client = OwnCloudClientFactory.createOwnCloudClient(Uri.parse(mHostBaseUrl + webdav_path), this, true);\r
+ client.setBasicCredentials(username, password);\r
+ mOperationThread = mAuthCheckOperation.execute(client, this, mHandler);\r
+ }\r
+ \r
+ \r
private String normalizeUrl(String url) {\r
if (url != null && url.length() > 0) {\r
url = url.trim();\r
} catch (IllegalArgumentException e) {\r
// NOTHING TO DO ; can't find out what situation that leads to the exception in this code, but user logs signal that it happens\r
}\r
-\r
+ \r
if (result.isSuccess()) {\r
- Log_OC.d(TAG, "Successful access - time to save the account");\r
+ \r
+ if (mTryEmptyAuthorization) {\r
+ //allow or not the user try to access the server\r
+ mOkButton.setEnabled(false);\r
+ mTryEmptyAuthorization = false;\r
+ mServerIsValid = false;\r
+ //show an alert message\r
+ showAlertMessageDialog(R.string.common_alert_title, R.string.auth_unsupported_auth_method);\r
+ \r
+ } else {\r
+ Log_OC.d(TAG, "Successful access - time to save the account");\r
\r
- boolean success = false;\r
- if (mAction == ACTION_CREATE) {\r
- success = createAccount();\r
+ boolean success = false;\r
+ if (mAction == ACTION_CREATE) {\r
+ success = createAccount();\r
\r
- } else {\r
- updateToken();\r
- success = true;\r
- }\r
+ } else {\r
+ updateToken();\r
+ success = true;\r
+ }\r
\r
- if (success) {\r
- finish();\r
+ if (success) {\r
+ finish();\r
+ }\r
}\r
\r
- } else if (result.isServerFail() || result.isException()) {\r
- /// if server fail or exception in authorization, the UI is updated as when a server check failed\r
- mServerIsChecked = true;\r
- mServerIsValid = false;\r
- mIsSslConn = false;\r
- mOcServerChkOperation = null;\r
- mDiscoveredVersion = null;\r
- mHostBaseUrl = normalizeUrl(mHostUrlInput.getText().toString());\r
+ } else {\r
+ if (mTryEmptyAuthorization) {\r
+ mTryEmptyAuthorization = false;\r
+ mOkButton.setEnabled(true);\r
+\r
+ } else if (result.isServerFail() || result.isException()) {\r
+ /// if server fail or exception in authorization, the UI is updated as when a server check failed\r
+ mServerIsChecked = true;\r
+ mServerIsValid = false;\r
+ mIsSslConn = false;\r
+ mOcServerChkOperation = null;\r
+ mDiscoveredVersion = null;\r
+ mHostBaseUrl = normalizeUrl(mHostUrlInput.getText().toString());\r
+\r
+ // update status icon and text\r
+ updateServerStatusIconAndText(result);\r
+ showServerStatus();\r
+ mAuthStatusIcon = 0;\r
+ mAuthStatusText = 0;\r
+ showAuthStatus();\r
+\r
+ // update input controls state\r
+ showRefreshButton();\r
+ mOkButton.setEnabled(false);\r
\r
- // update status icon and text\r
- updateServerStatusIconAndText(result);\r
- showServerStatus();\r
- mAuthStatusIcon = 0;\r
- mAuthStatusText = 0;\r
- showAuthStatus();\r
- \r
- // update input controls state\r
- showRefreshButton();\r
- mOkButton.setEnabled(false);\r
+ // very special case (TODO: move to a common place for all the remote operations) (dangerous here?)\r
+ if (result.getCode() == ResultCode.SSL_RECOVERABLE_PEER_UNVERIFIED) {\r
+ showUntrustedCertDialog(result);\r
+ }\r
\r
- // very special case (TODO: move to a common place for all the remote operations) (dangerous here?)\r
- if (result.getCode() == ResultCode.SSL_RECOVERABLE_PEER_UNVERIFIED) {\r
- showUntrustedCertDialog(result);\r
+ } else { // authorization fail due to client side - probably wrong credentials\r
+ updateAuthStatusIconAndText(result);\r
+ showAuthStatus();\r
+ Log_OC.d(TAG, "Access failed: " + result.getLogMessage());\r
}\r
-\r
- } else { // authorization fail due to client side - probably wrong credentials\r
- updateAuthStatusIconAndText(result);\r
- showAuthStatus();\r
- Log_OC.d(TAG, "Access failed: " + result.getLogMessage());\r
}\r
\r
}\r
}\r
\r
}\r
+ \r
+ private void showAlertMessageDialog(int tittle, int message) {\r
+ DialogFragment newAlertMessage = AlertMessageDialog.newInstance(tittle, message);\r
+ newAlertMessage.show(getSupportFragmentManager(), TAG_ALERT_MESSAGE_DIALOG);\r
+ }\r
\r
}\r
projects / pub / Android / ownCloud.git / blobdiff