Make the OAuth authorization available or not depending upon a variable in oauth.xml

[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 9b2dd85..cc1b648 100644 (file)
--- a/src/com/owncloud/android/authentication/AuthenticatorActivity.java
+++ b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
@@ -87,6 +87,10 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
     private static final String KEY_IS_SSL_CONN = "IS_SSL_CONN";\r
     private static final String KEY_OAUTH2_STATUS_TEXT = "OAUTH2_STATUS_TEXT";\r
     private static final String KEY_OAUTH2_STATUS_ICON = "OAUTH2_STATUS_ICON";\r
     private static final String KEY_IS_SSL_CONN = "IS_SSL_CONN";\r
     private static final String KEY_OAUTH2_STATUS_TEXT = "OAUTH2_STATUS_TEXT";\r
     private static final String KEY_OAUTH2_STATUS_ICON = "OAUTH2_STATUS_ICON";\r

+    \r
+    private static final String OAUTH_MODE_ON = "on";\r
+    private static final String OAUTH_MODE_OFF = "off";\r
+    private static final String OAUTH_MODE_OPTIONAL = "optional";\r

 \r
     private static final int DIALOG_LOGIN_PROGRESS = 0;\r
     private static final int DIALOG_SSL_VALIDATOR = 1;\r
 \r
     private static final int DIALOG_LOGIN_PROGRESS = 0;\r
     private static final int DIALOG_SSL_VALIDATOR = 1;\r


@@ -154,7 +158,6 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
         mOkButton = findViewById(R.id.buttonOK);\r
         mAuthStatusLayout = (TextView) findViewById(R.id.auth_status_text); \r
         \r
         mOkButton = findViewById(R.id.buttonOK);\r
         mAuthStatusLayout = (TextView) findViewById(R.id.auth_status_text); \r
         \r

-\r

         /// 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


@@ -179,7 +182,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
             \r
             /// retrieve extras from intent\r
             String tokenType = getIntent().getExtras().getString(AccountAuthenticator.KEY_AUTH_TOKEN_TYPE);\r
             \r
             /// retrieve extras from intent\r
             String tokenType = getIntent().getExtras().getString(AccountAuthenticator.KEY_AUTH_TOKEN_TYPE);\r

-            boolean oAuthRequired = AccountAuthenticator.AUTH_TOKEN_TYPE_ACCESS_TOKEN.equals(tokenType);\r
+            boolean oAuthRequired = AccountAuthenticator.AUTH_TOKEN_TYPE_ACCESS_TOKEN.equals(tokenType) || OAUTH_MODE_ON.equals(getString(R.string.oauth2_mode));\r

             \r
             mAccount = getIntent().getExtras().getParcelable(EXTRA_ACCOUNT);\r
             if (mAccount != null) {\r
             \r
             mAccount = getIntent().getExtras().getParcelable(EXTRA_ACCOUNT);\r
             if (mAccount != null) {\r


@@ -201,6 +204,10 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
             loadSavedInstanceState(savedInstanceState);\r
         }\r
         \r
             loadSavedInstanceState(savedInstanceState);\r
         }\r
         \r

+        if (!OAUTH_MODE_OPTIONAL.equals(getString(R.string.oauth2_mode))) {\r
+            mOAuth2Check.setVisibility(View.GONE);\r
+        }\r
+        \r

         if (mAction == ACTION_UPDATE_TOKEN) {\r
             /// lock things that should not change\r
             mHostUrlInput.setEnabled(false);\r
         if (mAction == ACTION_UPDATE_TOKEN) {\r
             /// lock things that should not change\r
             mHostUrlInput.setEnabled(false);\r


@@ -344,7 +351,8 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
                                                                 getString(R.string.oauth2_redirect_uri), // TODO check - necessary here?      \r
                                                                 getString(R.string.oauth2_grant_type),\r
                                                                 queryParameters);\r
                                                                 getString(R.string.oauth2_redirect_uri), // TODO check - necessary here?      \r
                                                                 getString(R.string.oauth2_grant_type),\r
                                                                 queryParameters);\r

-        WebdavClient client = OwnCloudClientUtils.createOwnCloudClient(Uri.parse(getString(R.string.oauth2_url_endpoint_access)), getApplicationContext());\r
+        //WebdavClient client = OwnCloudClientUtils.createOwnCloudClient(Uri.parse(getString(R.string.oauth2_url_endpoint_access)), getApplicationContext());\r
+        WebdavClient client = OwnCloudClientUtils.createOwnCloudClient(Uri.parse(mOAuthTokenEndpointText.getText().toString().trim()), getApplicationContext());\r

         operation.execute(client, this, mHandler);\r
     }\r
     \r
         operation.execute(client, this, mHandler);\r
     }\r
     \r


@@ -516,7 +524,8 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
         updateAuthStatus();\r
         \r
         // GET AUTHORIZATION request\r
         updateAuthStatus();\r
         \r
         // GET AUTHORIZATION request\r

-        Uri uri = Uri.parse(getString(R.string.oauth2_url_endpoint_auth));\r
+        //Uri uri = Uri.parse(getString(R.string.oauth2_url_endpoint_auth));\r
+        Uri uri = Uri.parse(mOAuthAuthEndpointText.getText().toString().trim());\r

         Uri.Builder uriBuilder = uri.buildUpon();\r
         uriBuilder.appendQueryParameter(OAuth2Constants.KEY_RESPONSE_TYPE, getString(R.string.oauth2_response_type));\r
         uriBuilder.appendQueryParameter(OAuth2Constants.KEY_REDIRECT_URI, getString(R.string.oauth2_redirect_uri));   \r
         Uri.Builder uriBuilder = uri.buildUpon();\r
         uriBuilder.appendQueryParameter(OAuth2Constants.KEY_RESPONSE_TYPE, getString(R.string.oauth2_response_type));\r
         uriBuilder.appendQueryParameter(OAuth2Constants.KEY_REDIRECT_URI, getString(R.string.oauth2_redirect_uri));   \r