Added workaround app project to environment setup files

[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 283dfe1..53f18bb 100644 (file)
--- a/src/com/owncloud/android/authentication/AuthenticatorActivity.java
+++ b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
@@ -53,6 +53,7 @@ import android.widget.Toast;
 \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

+import com.owncloud.android.MainApp;\r

 import com.owncloud.android.R;\r
 import com.owncloud.android.authentication.SsoWebViewClient.SsoWebViewClientListener;\r
 import com.owncloud.android.network.OwnCloudClientUtils;\r
 import com.owncloud.android.R;\r
 import com.owncloud.android.authentication.SsoWebViewClient.SsoWebViewClientListener;\r
 import com.owncloud.android.network.OwnCloudClientUtils;\r


@@ -273,7 +274,7 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
             mAccount = savedInstanceState.getParcelable(KEY_ACCOUNT);\r
             mAuthTokenType = savedInstanceState.getString(AccountAuthenticator.KEY_AUTH_TOKEN_TYPE);\r
             if (mAuthTokenType == null) {\r
             mAccount = savedInstanceState.getParcelable(KEY_ACCOUNT);\r
             mAuthTokenType = savedInstanceState.getString(AccountAuthenticator.KEY_AUTH_TOKEN_TYPE);\r
             if (mAuthTokenType == null) {\r

-                mAuthTokenType =  AccountAuthenticator.AUTH_TOKEN_TYPE_PASSWORD;\r
+                mAuthTokenType =  MainApp.getAuthTokenTypePass();\r

                 \r
             }\r
 \r
                 \r
             }\r
 \r


@@ -311,7 +312,7 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
         if (mServerIsChecked && !mServerIsValid && refreshButtonEnabled) showRefreshButton();\r
         mOkButton.setEnabled(mServerIsValid); // state not automatically recovered in configuration changes\r
 \r
         if (mServerIsChecked && !mServerIsValid && refreshButtonEnabled) showRefreshButton();\r
         mOkButton.setEnabled(mServerIsValid); // state not automatically recovered in configuration changes\r
 \r

-        if (AccountAuthenticator.AUTH_TOKEN_TYPE_SAML_WEB_SSO_SESSION_COOKIE.equals(mAuthTokenType) || \r
+        if (MainApp.getAuthTokenTypeSamlSessionCookie().equals(mAuthTokenType) || \r

                 !AUTH_OPTIONAL.equals(getString(R.string.auth_method_oauth2))) {\r
             mOAuth2Check.setVisibility(View.GONE);\r
         }\r
                 !AUTH_OPTIONAL.equals(getString(R.string.auth_method_oauth2))) {\r
             mOAuth2Check.setVisibility(View.GONE);\r
         }\r


@@ -363,7 +364,7 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
             @Override\r
             public boolean onTouch(View view, MotionEvent event) {\r
                 if (event.getAction() == MotionEvent.ACTION_DOWN) {\r
             @Override\r
             public boolean onTouch(View view, MotionEvent event) {\r
                 if (event.getAction() == MotionEvent.ACTION_DOWN) {\r

-                    if (AccountAuthenticator.AUTH_TOKEN_TYPE_SAML_WEB_SSO_SESSION_COOKIE.equals(mAuthTokenType) &&\r
+                    if (MainApp.getAuthTokenTypeSamlSessionCookie().equals(mAuthTokenType) &&\r

                             mHostUrlInput.hasFocus()) {\r
                         checkOcServer();\r
                     }\r
                             mHostUrlInput.hasFocus()) {\r
                         checkOcServer();\r
                     }\r


@@ -396,11 +397,11 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
                 samlWebSsoRequired = AUTH_ON.equals(getString(R.string.auth_method_saml_web_sso));            \r
             }\r
             if (oAuthRequired) {\r
                 samlWebSsoRequired = AUTH_ON.equals(getString(R.string.auth_method_saml_web_sso));            \r
             }\r
             if (oAuthRequired) {\r

-                mAuthTokenType = AccountAuthenticator.AUTH_TOKEN_TYPE_ACCESS_TOKEN;\r
+                mAuthTokenType = MainApp.getAuthTokenTypeAccessToken();\r

             } else if (samlWebSsoRequired) {\r
             } else if (samlWebSsoRequired) {\r

-                mAuthTokenType = AccountAuthenticator.AUTH_TOKEN_TYPE_SAML_WEB_SSO_SESSION_COOKIE;\r
+                mAuthTokenType = MainApp.getAuthTokenTypeSamlSessionCookie();\r

             } else {\r
             } else {\r

-                mAuthTokenType = AccountAuthenticator.AUTH_TOKEN_TYPE_PASSWORD;\r
+                mAuthTokenType = MainApp.getAuthTokenTypePass();\r

             }\r
         }\r
     \r
             }\r
         }\r
     \r


@@ -409,7 +410,7 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
             mUsernameInput.setText(userName);\r
         }\r
         \r
             mUsernameInput.setText(userName);\r
         }\r
         \r

-        mOAuth2Check.setChecked(AccountAuthenticator.AUTH_TOKEN_TYPE_ACCESS_TOKEN.equals(mAuthTokenType));\r
+        mOAuth2Check.setChecked(MainApp.getAuthTokenTypeAccessToken().equals(mAuthTokenType));\r

         \r
     }\r
 \r
         \r
     }\r
 \r


@@ -482,10 +483,10 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
     protected void onResume() {\r
         super.onResume();\r
         if (mAction == ACTION_UPDATE_TOKEN && mJustCreated && getIntent().getBooleanExtra(EXTRA_ENFORCED_UPDATE, false)) {\r
     protected void onResume() {\r
         super.onResume();\r
         if (mAction == ACTION_UPDATE_TOKEN && mJustCreated && getIntent().getBooleanExtra(EXTRA_ENFORCED_UPDATE, false)) {\r

-            if (AccountAuthenticator.AUTH_TOKEN_TYPE_ACCESS_TOKEN.equals(mAuthTokenType)) {\r
+            if (MainApp.getAuthTokenTypeAccessToken().equals(mAuthTokenType)) {\r

                 //Toast.makeText(this, R.string.auth_expired_oauth_token_toast, Toast.LENGTH_LONG).show();\r
                 showAuthMessage(getString(R.string.auth_expired_oauth_token_toast));\r
                 //Toast.makeText(this, R.string.auth_expired_oauth_token_toast, Toast.LENGTH_LONG).show();\r
                 showAuthMessage(getString(R.string.auth_expired_oauth_token_toast));\r

-            } else if (AccountAuthenticator.AUTH_TOKEN_TYPE_SAML_WEB_SSO_SESSION_COOKIE.equals(mAuthTokenType)) {\r
+            } else if (MainApp.getAuthTokenTypeSamlSessionCookie().equals(mAuthTokenType)) {\r

                 //Toast.makeText(this, R.string.auth_expired_saml_sso_token_toast, Toast.LENGTH_LONG).show();\r
                 showAuthMessage(getString(R.string.auth_expired_saml_sso_token_toast));\r
             } else {\r
                 //Toast.makeText(this, R.string.auth_expired_saml_sso_token_toast, Toast.LENGTH_LONG).show();\r
                 showAuthMessage(getString(R.string.auth_expired_saml_sso_token_toast));\r
             } else {\r


@@ -685,9 +686,9 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
             return;\r
         }\r
 \r
             return;\r
         }\r
 \r

-        if (AccountAuthenticator.AUTH_TOKEN_TYPE_ACCESS_TOKEN.equals(mAuthTokenType)) {\r
+        if (MainApp.getAuthTokenTypeAccessToken().equals(mAuthTokenType)) {\r

             startOauthorization();\r
             startOauthorization();\r

-        } else if (AccountAuthenticator.AUTH_TOKEN_TYPE_SAML_WEB_SSO_SESSION_COOKIE.equals(mAuthTokenType)) { \r
+        } else if (MainApp.getAuthTokenTypeSamlSessionCookie().equals(mAuthTokenType)) { \r

             startSamlBasedFederatedSingleSignOnAuthorization();\r
         } else {\r
             checkBasicAuthorization();\r
             startSamlBasedFederatedSingleSignOnAuthorization();\r
         } else {\r
             checkBasicAuthorization();\r


@@ -781,7 +782,7 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
             onGetOAuthAccessTokenFinish((OAuth2GetAccessToken)operation, result);\r
 \r
         } else if (operation instanceof ExistenceCheckOperation)  {\r
             onGetOAuthAccessTokenFinish((OAuth2GetAccessToken)operation, result);\r
 \r
         } else if (operation instanceof ExistenceCheckOperation)  {\r

-            if (AccountAuthenticator.AUTH_TOKEN_TYPE_SAML_WEB_SSO_SESSION_COOKIE.equals(mAuthTokenType)) {\r
+            if (MainApp.getAuthTokenTypeSamlSessionCookie().equals(mAuthTokenType)) {\r

                 onSamlBasedFederatedSingleSignOnAuthorizationStart(operation, result);\r
                 \r
             } else {\r
                 onSamlBasedFederatedSingleSignOnAuthorizationStart(operation, result);\r
                 \r
             } else {\r


@@ -1166,12 +1167,12 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
         response.putString(AccountManager.KEY_ACCOUNT_NAME, mAccount.name);\r
         response.putString(AccountManager.KEY_ACCOUNT_TYPE, mAccount.type);\r
         \r
         response.putString(AccountManager.KEY_ACCOUNT_NAME, mAccount.name);\r
         response.putString(AccountManager.KEY_ACCOUNT_TYPE, mAccount.type);\r
         \r

-        if (AccountAuthenticator.AUTH_TOKEN_TYPE_ACCESS_TOKEN.equals(mAuthTokenType)) { \r
+        if (MainApp.getAuthTokenTypeAccessToken().equals(mAuthTokenType)) { \r

             response.putString(AccountManager.KEY_AUTHTOKEN, mAuthToken);\r
             // the next line is necessary; by now, notifications are calling directly to the AuthenticatorActivity to update, without AccountManager intervention\r
             mAccountMgr.setAuthToken(mAccount, mAuthTokenType, mAuthToken);\r
             \r
             response.putString(AccountManager.KEY_AUTHTOKEN, mAuthToken);\r
             // the next line is necessary; by now, notifications are calling directly to the AuthenticatorActivity to update, without AccountManager intervention\r
             mAccountMgr.setAuthToken(mAccount, mAuthTokenType, mAuthToken);\r
             \r

-        } else if (AccountAuthenticator.AUTH_TOKEN_TYPE_SAML_WEB_SSO_SESSION_COOKIE.equals(mAuthTokenType)) {\r
+        } else if (MainApp.getAuthTokenTypeSamlSessionCookie().equals(mAuthTokenType)) {\r

             String username = getUserNameForSamlSso();\r
             if (!mUsernameInput.getText().toString().equals(username)) {\r
                 // fail - not a new account, but an existing one; disallow\r
             String username = getUserNameForSamlSso();\r
             if (!mUsernameInput.getText().toString().equals(username)) {\r
                 // fail - not a new account, but an existing one; disallow\r


@@ -1206,8 +1207,8 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
      */\r
     private boolean createAccount() {\r
         /// create and save new ownCloud account\r
      */\r
     private boolean createAccount() {\r
         /// create and save new ownCloud account\r

-        boolean isOAuth = AccountAuthenticator.AUTH_TOKEN_TYPE_ACCESS_TOKEN.equals(mAuthTokenType);\r
-        boolean isSaml =  AccountAuthenticator.AUTH_TOKEN_TYPE_SAML_WEB_SSO_SESSION_COOKIE.equals(mAuthTokenType);\r
+        boolean isOAuth = MainApp.getAuthTokenTypeAccessToken().equals(mAuthTokenType);\r
+        boolean isSaml =  MainApp.getAuthTokenTypeSamlSessionCookie().equals(mAuthTokenType);\r

 \r
         Uri uri = Uri.parse(mHostBaseUrl);\r
         String username = mUsernameInput.getText().toString().trim();\r
 \r
         Uri uri = Uri.parse(mHostBaseUrl);\r
         String username = mUsernameInput.getText().toString().trim();\r


@@ -1221,7 +1222,7 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
         if (uri.getPort() >= 0) {\r
             accountName += ":" + uri.getPort();\r
         }\r
         if (uri.getPort() >= 0) {\r
             accountName += ":" + uri.getPort();\r
         }\r

-        mAccount = new Account(accountName, AccountAuthenticator.ACCOUNT_TYPE);\r
+        mAccount = new Account(accountName, MainApp.getAccountType());\r

         if (AccountUtils.exists(mAccount, getApplicationContext())) {\r
             // fail - not a new account, but an existing one; disallow\r
             RemoteOperationResult result = new RemoteOperationResult(ResultCode.ACCOUNT_NOT_NEW); \r
         if (AccountUtils.exists(mAccount, getApplicationContext())) {\r
             // fail - not a new account, but an existing one; disallow\r
             RemoteOperationResult result = new RemoteOperationResult(ResultCode.ACCOUNT_NOT_NEW); \r


@@ -1250,10 +1251,10 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
             /// prepare result to return to the Authenticator\r
             //  TODO check again what the Authenticator makes with it; probably has the same effect as addAccountExplicitly, but it's not well done\r
             final Intent intent = new Intent();       \r
             /// prepare result to return to the Authenticator\r
             //  TODO check again what the Authenticator makes with it; probably has the same effect as addAccountExplicitly, but it's not well done\r
             final Intent intent = new Intent();       \r

-            intent.putExtra(AccountManager.KEY_ACCOUNT_TYPE,    AccountAuthenticator.ACCOUNT_TYPE);\r
+            intent.putExtra(AccountManager.KEY_ACCOUNT_TYPE,    MainApp.getAccountType());\r

             intent.putExtra(AccountManager.KEY_ACCOUNT_NAME,    mAccount.name);\r
             /*if (!isOAuth)\r
             intent.putExtra(AccountManager.KEY_ACCOUNT_NAME,    mAccount.name);\r
             /*if (!isOAuth)\r

-                intent.putExtra(AccountManager.KEY_AUTHTOKEN,   AccountAuthenticator.ACCOUNT_TYPE); */\r
+                intent.putExtra(AccountManager.KEY_AUTHTOKEN,   MainApp.getAccountType()); */\r

             intent.putExtra(AccountManager.KEY_USERDATA,        username);\r
             if (isOAuth || isSaml) {\r
                 mAccountMgr.setAuthToken(mAccount, mAuthTokenType, mAuthToken);\r
             intent.putExtra(AccountManager.KEY_USERDATA,        username);\r
             if (isOAuth || isSaml) {\r
                 mAccountMgr.setAuthToken(mAccount, mAuthTokenType, mAuthToken);\r


@@ -1273,11 +1274,11 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
             /// immediately request for the synchronization of the new account\r
             Bundle bundle = new Bundle();\r
             bundle.putBoolean(ContentResolver.SYNC_EXTRAS_MANUAL, true);\r
             /// immediately request for the synchronization of the new account\r
             Bundle bundle = new Bundle();\r
             bundle.putBoolean(ContentResolver.SYNC_EXTRAS_MANUAL, true);\r

-            ContentResolver.requestSync(mAccount, AccountAuthenticator.AUTHORITY, bundle);\r
+            ContentResolver.requestSync(mAccount, MainApp.getAuthTokenType(), bundle);\r

             syncAccount();\r
 //          Bundle bundle = new Bundle();\r
 //          bundle.putBoolean(ContentResolver.SYNC_EXTRAS_MANUAL, true);\r
             syncAccount();\r
 //          Bundle bundle = new Bundle();\r
 //          bundle.putBoolean(ContentResolver.SYNC_EXTRAS_MANUAL, true);\r

-//          ContentResolver.requestSync(mAccount, AccountAuthenticator.AUTHORITY, bundle);\r
+//          ContentResolver.requestSync(mAccount, MainApp.getAuthTokenType(), bundle);\r

             return true;\r
         }\r
     }\r
             return true;\r
         }\r
     }\r


@@ -1484,9 +1485,9 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
     public void onCheckClick(View view) {\r
         CheckBox oAuth2Check = (CheckBox)view;\r
         if (oAuth2Check.isChecked()) {\r
     public void onCheckClick(View view) {\r
         CheckBox oAuth2Check = (CheckBox)view;\r
         if (oAuth2Check.isChecked()) {\r

-            mAuthTokenType = AccountAuthenticator.AUTH_TOKEN_TYPE_ACCESS_TOKEN;\r
+            mAuthTokenType = MainApp.getAuthTokenTypeAccessToken();\r

         } else {\r
         } else {\r

-            mAuthTokenType = AccountAuthenticator.AUTH_TOKEN_TYPE_PASSWORD;\r
+            mAuthTokenType = MainApp.getAuthTokenTypePass();\r

         }\r
         adaptViewAccordingToAuthenticationMethod();\r
     }\r
         }\r
         adaptViewAccordingToAuthenticationMethod();\r
     }\r


@@ -1497,14 +1498,14 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
      * the current authorization method.\r
      */\r
     private void adaptViewAccordingToAuthenticationMethod () {\r
      * the current authorization method.\r
      */\r
     private void adaptViewAccordingToAuthenticationMethod () {\r

-        if (AccountAuthenticator.AUTH_TOKEN_TYPE_ACCESS_TOKEN.equals(mAuthTokenType)) {\r
+        if (MainApp.getAuthTokenTypeAccessToken().equals(mAuthTokenType)) {\r

             // OAuth 2 authorization\r
             mOAuthAuthEndpointText.setVisibility(View.VISIBLE);\r
             mOAuthTokenEndpointText.setVisibility(View.VISIBLE);\r
             mUsernameInput.setVisibility(View.GONE);\r
             mPasswordInput.setVisibility(View.GONE);\r
             \r
             // OAuth 2 authorization\r
             mOAuthAuthEndpointText.setVisibility(View.VISIBLE);\r
             mOAuthTokenEndpointText.setVisibility(View.VISIBLE);\r
             mUsernameInput.setVisibility(View.GONE);\r
             mPasswordInput.setVisibility(View.GONE);\r
             \r

-        } else if (AccountAuthenticator.AUTH_TOKEN_TYPE_SAML_WEB_SSO_SESSION_COOKIE.equals(mAuthTokenType)) {\r
+        } else if (MainApp.getAuthTokenTypeSamlSessionCookie().equals(mAuthTokenType)) {\r

             // SAML-based web Single Sign On\r
             mOAuthAuthEndpointText.setVisibility(View.GONE);\r
             mOAuthTokenEndpointText.setVisibility(View.GONE);\r
             // SAML-based web Single Sign On\r
             mOAuthAuthEndpointText.setVisibility(View.GONE);\r
             mOAuthTokenEndpointText.setVisibility(View.GONE);\r


@@ -1550,7 +1551,7 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
             }\r
             \r
         } else if (actionId == EditorInfo.IME_ACTION_NEXT && inputField != null && inputField.equals(mHostUrlInput)) {\r
             }\r
             \r
         } else if (actionId == EditorInfo.IME_ACTION_NEXT && inputField != null && inputField.equals(mHostUrlInput)) {\r

-            if (AccountAuthenticator.AUTH_TOKEN_TYPE_SAML_WEB_SSO_SESSION_COOKIE.equals(mAuthTokenType)) {\r
+            if (MainApp.getAuthTokenTypeSamlSessionCookie().equals(mAuthTokenType)) {\r

                 checkOcServer();\r
             }\r
         }\r
                 checkOcServer();\r
             }\r
         }\r


@@ -1651,12 +1652,12 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
         /// immediately request for the synchronization of the new account\r
         Bundle bundle = new Bundle();\r
         bundle.putBoolean(ContentResolver.SYNC_EXTRAS_MANUAL, true);\r
         /// immediately request for the synchronization of the new account\r
         Bundle bundle = new Bundle();\r
         bundle.putBoolean(ContentResolver.SYNC_EXTRAS_MANUAL, true);\r

-        ContentResolver.requestSync(mAccount, AccountAuthenticator.AUTHORITY, bundle);\r
+        ContentResolver.requestSync(mAccount, MainApp.getAuthTokenType(), bundle);\r

     }\r
     \r
     @Override\r
     public boolean onTouchEvent(MotionEvent event) {\r
     }\r
     \r
     @Override\r
     public boolean onTouchEvent(MotionEvent event) {\r

-        if (AccountAuthenticator.AUTH_TOKEN_TYPE_SAML_WEB_SSO_SESSION_COOKIE.equals(mAuthTokenType) &&\r
+        if (MainApp.getAuthTokenTypeSamlSessionCookie().equals(mAuthTokenType) &&\r

                 mHostUrlInput.hasFocus() && event.getAction() == MotionEvent.ACTION_DOWN) {\r
             checkOcServer();\r
         }\r
                 mHostUrlInput.hasFocus() && event.getAction() == MotionEvent.ACTION_DOWN) {\r
             checkOcServer();\r
         }\r