Merge branch 'develop' into setup_buttons

[pub/Android/ownCloud.git] / 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 53f18bb..69872d7 100644 (file)
--- 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;\r
 import android.widget.TextView;\r
 import android.widget.TextView.OnEditorActionListener;\r
 import android.widget.EditText;\r
 import android.widget.TextView;\r
 import android.widget.TextView.OnEditorActionListener;\r

-import android.widget.Toast;\r

 \r
 import com.actionbarsherlock.app.SherlockDialogFragment;\r
 import com.owncloud.android.Log_OC;\r
 \r
 import com.actionbarsherlock.app.SherlockDialogFragment;\r
 import com.owncloud.android.Log_OC;\r


@@ -64,11 +63,13 @@ import com.owncloud.android.operations.OwnCloudServerCheckOperation;
 import com.owncloud.android.operations.RemoteOperation;\r
 import com.owncloud.android.operations.RemoteOperationResult;\r
 import com.owncloud.android.operations.RemoteOperationResult.ResultCode;\r
 import com.owncloud.android.operations.RemoteOperation;\r
 import com.owncloud.android.operations.RemoteOperationResult;\r
 import com.owncloud.android.operations.RemoteOperationResult.ResultCode;\r

+import com.owncloud.android.ui.CustomButton;\r

 import com.owncloud.android.ui.dialog.SamlWebViewDialog;\r
 import com.owncloud.android.ui.dialog.SslValidatorDialog;\r
 import com.owncloud.android.ui.dialog.SslValidatorDialog.OnSslValidatorListener;\r
 import com.owncloud.android.utils.OwnCloudVersion;\r
 \r
 import com.owncloud.android.ui.dialog.SamlWebViewDialog;\r
 import com.owncloud.android.ui.dialog.SslValidatorDialog;\r
 import com.owncloud.android.ui.dialog.SslValidatorDialog.OnSslValidatorListener;\r
 import com.owncloud.android.utils.OwnCloudVersion;\r
 \r

+\r

 import eu.alefzero.webdav.WebdavClient;\r
 \r
 /**\r
 import eu.alefzero.webdav.WebdavClient;\r
 \r
 /**\r


@@ -187,7 +188,7 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
         mOAuthAuthEndpointText = (TextView)findViewById(R.id.oAuthEntryPoint_1);\r
         mOAuthTokenEndpointText = (TextView)findViewById(R.id.oAuthEntryPoint_2);\r
         mOAuth2Check = (CheckBox) findViewById(R.id.oauth_onOff_check);\r
         mOAuthAuthEndpointText = (TextView)findViewById(R.id.oAuthEntryPoint_1);\r
         mOAuthTokenEndpointText = (TextView)findViewById(R.id.oAuthEntryPoint_2);\r
         mOAuth2Check = (CheckBox) findViewById(R.id.oauth_onOff_check);\r

-        mOkButton = findViewById(R.id.buttonOK);\r
+        mOkButton = (CustomButton) findViewById(R.id.buttonOK);\r

         mAuthStatusLayout = (TextView) findViewById(R.id.auth_status_text); \r
         \r
         /// set Host Url Input Enabled\r
         mAuthStatusLayout = (TextView) findViewById(R.id.auth_status_text); \r
         \r
         /// set Host Url Input Enabled\r


@@ -197,9 +198,14 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
         /// complete label for 'register account' button\r
         Button b = (Button) findViewById(R.id.account_register);\r
         if (b != null) {\r
         /// complete label for 'register account' button\r
         Button b = (Button) findViewById(R.id.account_register);\r
         if (b != null) {\r

-            b.setText(String.format(getString(R.string.auth_register), getString(R.string.app_name)));\r
+            b.setText(String.format(getString(R.string.auth_register), getString(R.string.app_name)));            \r

         }\r
 \r
         }\r
 \r

+//        /// complete background of 'OK' button\r
+//        boolean customButtons = getResources().getBoolean(R.bool.custom_buttons);\r
+//        if (customButtons)\r
+//            mOkButton.setBackgroundResource(R.drawable.btn_default);\r
+        \r

         /// initialization\r
         mAccountMgr = AccountManager.get(this);\r
         mNewCapturedUriFromOAuth2Redirection = null;\r
         /// initialization\r
         mAccountMgr = AccountManager.get(this);\r
         mNewCapturedUriFromOAuth2Redirection = null;\r