X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/865940064dd70fdaa8a59e0768ae57a487923967..c2abbaaedb69dba35866a48b745b68f3519cbca1:/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 53f18bb4..69872d73 100644 --- a/src/com/owncloud/android/authentication/AuthenticatorActivity.java +++ b/src/com/owncloud/android/authentication/AuthenticatorActivity.java @@ -49,7 +49,6 @@ import android.widget.CheckBox; import android.widget.EditText; import android.widget.TextView; import android.widget.TextView.OnEditorActionListener; -import android.widget.Toast; import com.actionbarsherlock.app.SherlockDialogFragment; import com.owncloud.android.Log_OC; @@ -64,11 +63,13 @@ import com.owncloud.android.operations.OwnCloudServerCheckOperation; import com.owncloud.android.operations.RemoteOperation; import com.owncloud.android.operations.RemoteOperationResult; import com.owncloud.android.operations.RemoteOperationResult.ResultCode; +import com.owncloud.android.ui.CustomButton; import com.owncloud.android.ui.dialog.SamlWebViewDialog; import com.owncloud.android.ui.dialog.SslValidatorDialog; import com.owncloud.android.ui.dialog.SslValidatorDialog.OnSslValidatorListener; import com.owncloud.android.utils.OwnCloudVersion; + import eu.alefzero.webdav.WebdavClient; /** @@ -187,7 +188,7 @@ implements OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList mOAuthAuthEndpointText = (TextView)findViewById(R.id.oAuthEntryPoint_1); mOAuthTokenEndpointText = (TextView)findViewById(R.id.oAuthEntryPoint_2); mOAuth2Check = (CheckBox) findViewById(R.id.oauth_onOff_check); - mOkButton = findViewById(R.id.buttonOK); + mOkButton = (CustomButton) findViewById(R.id.buttonOK); mAuthStatusLayout = (TextView) findViewById(R.id.auth_status_text); /// set Host Url Input Enabled @@ -197,9 +198,14 @@ implements OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList /// complete label for 'register account' button Button b = (Button) findViewById(R.id.account_register); if (b != null) { - b.setText(String.format(getString(R.string.auth_register), getString(R.string.app_name))); + b.setText(String.format(getString(R.string.auth_register), getString(R.string.app_name))); } +// /// complete background of 'OK' button +// boolean customButtons = getResources().getBoolean(R.bool.custom_buttons); +// if (customButtons) +// mOkButton.setBackgroundResource(R.drawable.btn_default); + /// initialization mAccountMgr = AccountManager.get(this); mNewCapturedUriFromOAuth2Redirection = null;