private static final String KEY_AUTH_STATUS_TEXT = "AUTH_STATUS_TEXT";\r
private static final String KEY_AUTH_STATUS_ICON = "AUTH_STATUS_ICON";\r
private static final String KEY_SERVER_AUTH_METHOD = "SERVER_AUTH_METHOD";\r
- private static final String KEY_WAITING_FOR_OP_ID = "DETECT_AUTH_OP_ID";\r
+ private static final String KEY_WAITING_FOR_OP_ID = "WAITING_FOR_OP_ID";\r
private static final String KEY_AUTH_TOKEN = "AUTH_TOKEN";\r
\r
private static final String AUTH_ON = "on";\r
\r
private boolean mServerIsChecked = false;\r
private boolean mServerIsValid = false;\r
+ private boolean mPendingAutoCheck = false;\r
\r
private GetServerInfoOperation.ServerInfo mServerInfo = \r
new GetServerInfoOperation.ServerInfo();\r
\r
/// Identifier of operation in progress which result shouldn't be lost \r
private long mWaitingForOpId = Long.MAX_VALUE;\r
- \r
+\r
\r
/**\r
* {@inheritDoc}\r
*/\r
@Override\r
protected void onCreate(Bundle savedInstanceState) {\r
- Log_OC.wtf(TAG, "onCreate init");\r
+ //Log_OC.wtf(TAG, "onCreate init");\r
super.onCreate(savedInstanceState);\r
getWindow().requestFeature(Window.FEATURE_NO_TITLE);\r
\r
/// initialize general UI elements\r
initOverallUi(savedInstanceState);\r
\r
+ mOkButton = findViewById(R.id.buttonOK);\r
+\r
/// initialize block to be moved to single Fragment to check server and get info about it \r
initServerPreFragment(savedInstanceState);\r
\r
/// initialize block to be moved to single Fragment to retrieve and validate credentials \r
initAuthorizationPreFragment(savedInstanceState);\r
\r
- Log_OC.wtf(TAG, "onCreate end");\r
+ //Log_OC.wtf(TAG, "onCreate end");\r
}\r
\r
private void initAuthTokenType() {\r
});\r
\r
\r
- /// step 4 - automatic actions to start\r
- if (savedInstanceState == null) {\r
- if (mAction != ACTION_CREATE || !isUrlInputAllowed) {\r
- checkOcServer(); \r
- }\r
- }\r
+ /// step 4 - mark automatic check to be started when OperationsService is ready\r
+ mPendingAutoCheck = (savedInstanceState == null && \r
+ (mAction != ACTION_CREATE || !isUrlInputAllowed));\r
}\r
\r
\r
mUsernameInput = (EditText) findViewById(R.id.account_username);\r
mPasswordInput = (EditText) findViewById(R.id.account_password);\r
mAuthStatusView = (TextView) findViewById(R.id.auth_status_text); \r
- mOkButton = findViewById(R.id.buttonOK);\r
\r
/// step 1 - load and process relevant inputs (resources, intent, savedInstanceState)\r
String presetUserName = null;\r
*/\r
@Override\r
protected void onSaveInstanceState(Bundle outState) {\r
- Log_OC.wtf(TAG, "onSaveInstanceState init" );\r
+ //Log_OC.wtf(TAG, "onSaveInstanceState init" );\r
super.onSaveInstanceState(outState);\r
\r
/// global state\r
outState.putInt(KEY_AUTH_STATUS_TEXT, mAuthStatusText);\r
outState.putString(KEY_AUTH_TOKEN, mAuthToken);\r
\r
- Log_OC.wtf(TAG, "onSaveInstanceState end" );\r
+ //Log_OC.wtf(TAG, "onSaveInstanceState end" );\r
}\r
\r
\r
*/\r
@Override\r
protected void onResume() {\r
- Log_OC.wtf(TAG, "onResume init" );\r
+ //Log_OC.wtf(TAG, "onResume init" );\r
super.onResume();\r
\r
// bound here to avoid spurious changes triggered by Android on device rotations\r
doOnResumeAndBound();\r
}\r
\r
- Log_OC.wtf(TAG, "onResume end" );\r
+ //Log_OC.wtf(TAG, "onResume end" );\r
}\r
\r
\r
@Override\r
protected void onPause() {\r
- Log_OC.wtf(TAG, "onPause init" );\r
+ //Log_OC.wtf(TAG, "onPause init" );\r
if (mOperationsServiceBinder != null) {\r
- Log_OC.wtf(TAG, "unregistering to listen for operation callbacks" );\r
+ //Log_OC.wtf(TAG, "unregistering to listen for operation callbacks" );\r
mOperationsServiceBinder.removeOperationListener(this);\r
}\r
\r
mHostUrlInput.setOnFocusChangeListener(null);\r
\r
super.onPause();\r
- Log_OC.wtf(TAG, "onPause end" );\r
+ //Log_OC.wtf(TAG, "onPause end" );\r
}\r
\r
@Override\r
queryParameters);\r
\r
if (mOperationsServiceBinder != null) {\r
- Log_OC.wtf(TAG, "getting access token..." );\r
+ //Log_OC.wtf(TAG, "getting access token..." );\r
mWaitingForOpId = mOperationsServiceBinder.newOperation(getServerInfoIntent);\r
}\r
}\r
getServerInfoIntent.putExtra(OperationsService.EXTRA_SERVER_URL, uri);\r
getServerInfoIntent.putExtra(OperationsService.EXTRA_AUTH_TOKEN_TYPE, mAuthTokenType);\r
if (mOperationsServiceBinder != null) {\r
- Log_OC.wtf(TAG, "checking server..." );\r
+ //Log_OC.wtf(TAG, "checking server..." );\r
mWaitingForOpId = mOperationsServiceBinder.newOperation(getServerInfoIntent);\r
+ } else {\r
+ Log_OC.wtf(TAG, "Server check tried with OperationService unbound!" );\r
}\r
\r
} else {\r
mServerStatusText = R.string.auth_wtf_reenter_URL;\r
showServerStatus();\r
mOkButton.setEnabled(false);\r
- Log_OC.wtf(TAG, "The user was allowed to click 'connect' to an unchecked server!!");\r
+ //Log_OC.wtf(TAG, "The user was allowed to click 'connect' to an unchecked server!!");\r
return;\r
}\r
\r
* the root folder of the ownCloud server.\r
*/\r
private void checkBasicAuthorization() {\r
- /// get the path to the root folder through WebDAV from the version server\r
- String webdav_path = AccountUtils.getWebdavPath(mServerInfo.mVersion, mAuthTokenType);\r
-\r
/// get basic credentials entered by user\r
String username = mUsernameInput.getText().toString();\r
String password = mPasswordInput.getText().toString();\r
String remotePath ="";\r
boolean successIfAbsent = false;\r
boolean followRedirects = true;\r
- startExistenceCheckRemoteOperation(remotePath, this, successIfAbsent, webdav_path, username, password, followRedirects);\r
+ startExistenceCheckRemoteOperation(\r
+ remotePath, this, successIfAbsent, username, password, followRedirects);\r
\r
}\r
\r
- private void startExistenceCheckRemoteOperation(String remotePath, Context context, boolean successIfAbsent, String webdav_path,\r
+ private void startExistenceCheckRemoteOperation(\r
+ String remotePath, Context context, boolean successIfAbsent,\r
String username, String password, boolean followRedirects) {\r
Intent existenceCheckIntent = new Intent();\r
existenceCheckIntent.setAction(OperationsService.ACTION_EXISTENCE_CHECK);\r
existenceCheckIntent.putExtra(OperationsService.EXTRA_SERVER_URL, mServerInfo.mBaseUrl);\r
existenceCheckIntent.putExtra(OperationsService.EXTRA_REMOTE_PATH, remotePath);\r
existenceCheckIntent.putExtra(OperationsService.EXTRA_SUCCESS_IF_ABSENT, successIfAbsent);\r
- existenceCheckIntent.putExtra(OperationsService.EXTRA_WEBDAV_PATH, webdav_path);\r
existenceCheckIntent.putExtra(OperationsService.EXTRA_USERNAME, username);\r
existenceCheckIntent.putExtra(OperationsService.EXTRA_PASSWORD, password);\r
existenceCheckIntent.putExtra(OperationsService.EXTRA_AUTH_TOKEN, mAuthToken);\r
existenceCheckIntent.putExtra(OperationsService.EXTRA_FOLLOW_REDIRECTS, followRedirects);\r
\r
if (mOperationsServiceBinder != null) {\r
- Log_OC.wtf(TAG, "starting existenceCheckRemoteOperation..." );\r
+ //Log_OC.wtf(TAG, "starting existenceCheckRemoteOperation..." );\r
mWaitingForOpId = mOperationsServiceBinder.newOperation(existenceCheckIntent);\r
}\r
}\r
IndeterminateProgressDialog.newInstance(R.string.auth_trying_to_login, true);\r
dialog.show(getSupportFragmentManager(), WAIT_DIALOG_TAG);\r
\r
- /// get the path to the root folder through WebDAV from the version server\r
- String webdav_path = AccountUtils.getWebdavPath(mServerInfo.mVersion, mAuthTokenType);\r
-\r
/// test credentials accessing the root folder\r
String remotePath ="";\r
boolean successIfAbsent = false;\r
boolean followRedirections = false;\r
- startExistenceCheckRemoteOperation(remotePath, this, successIfAbsent, webdav_path, "", "", followRedirections);\r
+ startExistenceCheckRemoteOperation(\r
+ remotePath, this, successIfAbsent, "", "", followRedirections);\r
\r
}\r
\r
onGetOAuthAccessTokenFinish(result);\r
\r
} else if (operation instanceof ExistenceCheckRemoteOperation) {\r
- Log_OC.wtf(TAG, "received detection response through callback" );\r
+ //Log_OC.wtf(TAG, "received detection response through callback" );\r
if (AccountTypeUtils.getAuthTokenTypeSamlSessionCookie(MainApp.getAccountType()).equals(mAuthTokenType)) {\r
onSamlBasedFederatedSingleSignOnAuthorizationStart(result);\r
\r
mWaitingForOpId = Long.MAX_VALUE;\r
dismissDialog(WAIT_DIALOG_TAG);\r
\r
- String webdav_path = AccountUtils.getWebdavPath(mServerInfo.mVersion, mAuthTokenType);\r
- if (result.isSuccess() && webdav_path != null) {\r
+ if (result.isSuccess()) {\r
/// be gentle with the user\r
IndeterminateProgressDialog dialog = \r
IndeterminateProgressDialog.newInstance(R.string.auth_trying_to_login, true);\r
String remotePath ="";\r
boolean successIfAbsent = false;\r
boolean followRedirects = true;\r
- startExistenceCheckRemoteOperation(remotePath, this, successIfAbsent, webdav_path, "", "", followRedirects);\r
+ startExistenceCheckRemoteOperation(\r
+ remotePath, this, successIfAbsent, "", "", followRedirects);\r
\r
} else {\r
updateAuthStatusIconAndText(result);\r
String username = mUsernameInput.getText().toString().trim();\r
if (isOAuth) {\r
username = "OAuth_user" + (new java.util.Random(System.currentTimeMillis())).nextLong();\r
- } \r
- String accountName = username + "@" + uri.getHost();\r
- if (uri.getPort() >= 0) {\r
- accountName += ":" + uri.getPort();\r
}\r
+ String accountName = com.owncloud.android.lib.common.accounts.AccountUtils.\r
+ buildAccountName(uri, username);\r
Account newAccount = new Account(accountName, MainApp.getAccountType());\r
if (AccountUtils.exists(newAccount, getApplicationContext())) {\r
// fail - not a new account, but an existing one; disallow\r
getUserNameIntent.putExtra(OperationsService.EXTRA_FOLLOW_REDIRECTS, followRedirects);\r
\r
if (mOperationsServiceBinder != null) {\r
- Log_OC.wtf(TAG, "starting getRemoteUserNameOperation..." );\r
+ //Log_OC.wtf(TAG, "starting getRemoteUserNameOperation..." );\r
mWaitingForOpId = mOperationsServiceBinder.newOperation(getUserNameIntent);\r
}\r
}\r
\r
\r
private void doOnResumeAndBound() {\r
- Log_OC.wtf(TAG, "registering to listen for operation callbacks" );\r
+ //Log_OC.wtf(TAG, "registering to listen for operation callbacks" );\r
mOperationsServiceBinder.addOperationListener(AuthenticatorActivity.this, mHandler);\r
if (mWaitingForOpId <= Integer.MAX_VALUE) {\r
mOperationsServiceBinder.dispatchResultIfFinished((int)mWaitingForOpId, this);\r
}\r
+ \r
+ if (mPendingAutoCheck) {\r
+ checkOcServer();\r
+ }\r
}\r
\r
\r
@Override\r
public void onServiceConnected(ComponentName component, IBinder service) {\r
if (component.equals(new ComponentName(AuthenticatorActivity.this, OperationsService.class))) {\r
- Log_OC.wtf(TAG, "Operations service connected");\r
+ //Log_OC.wtf(TAG, "Operations service connected");\r
mOperationsServiceBinder = (OperationsServiceBinder) service;\r
\r
doOnResumeAndBound();\r
projects / pub / Android / ownCloud.git / blobdiff