mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-27 09:39:25 +03:00
Code Issues Projects Releases Packages Wiki Activity

OC-460:URL-input GONE. OC-394

Browse source
This commit is contained in:
masensio 2013-06-25 14:13:04 +02:00
parent dcc0461a7d
commit 2df8f56e5e
1 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/com/owncloud/android/authentication/AuthenticatorActivity.java
View file

@ -143,6 +143,8 @@ implements OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
private TextView mOAuthTokenEndpointText;
private boolean mRefreshButtonEnabled;
private boolean mHostUrlInputEnabled;
/**
@ -165,6 +167,9 @@ implements OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
mOAuth2Check = (CheckBox) findViewById(R.id.oauth_onOff_check);
mOkButton = findViewById(R.id.buttonOK);
mAuthStatusLayout = (TextView) findViewById(R.id.auth_status_text);
/// set Host Url Input Enabled
mHostUrlInputEnabled = getResources().getBoolean(R.bool.show_server_url_input);
/// complete label for 'register account' button
Button b = (Button) findViewById(R.id.account_register);
@ -178,6 +183,12 @@ implements OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
mAction = getIntent().getByteExtra(EXTRA_ACTION, ACTION_CREATE);
mAccount = null;
mHostBaseUrl = "";
if (!mHostUrlInputEnabled)
{
mHostUrlInput.setText(getString(R.string.server_url));
mHostUrlInput.setVisibility(View.GONE);
checkOcServer();
}
if (savedInstanceState == null) {
/// connection state and info
@ -451,6 +462,11 @@ implements OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
private void checkOcServer() {
String uri = trimUrlWebdav(mHostUrlInput.getText().toString().trim());
if (!mHostUrlInputEnabled){
uri = getString(R.string.server_url);
}
mServerIsValid = false;
mServerIsChecked = false;
mOkButton.setEnabled(false);