Merge branch 'saml_based_federated_single_sign_on' into saml_based_federated_single_s...

[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 37ff491..9ba0970 100644 (file)
--- a/src/com/owncloud/android/authentication/AuthenticatorActivity.java
+++ b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
@@ -18,8 +18,6 @@
 \r
 package com.owncloud.android.authentication;\r
 \r
-import java.net.URLDecoder;\r
-\r
 import android.accounts.Account;\r
 import android.accounts.AccountManager;\r
 import android.app.AlertDialog;\r
@@ -51,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.Toast;\r
 \r
 import com.actionbarsherlock.app.SherlockDialogFragment;\r
 import com.owncloud.android.Log_OC;\r
@@ -742,6 +739,7 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
         mAuthCheckOperation = new  ExistenceCheckOperation("", this, false);\r
         WebdavClient client = OwnCloudClientUtils.createOwnCloudClient(Uri.parse(mHostBaseUrl + webdav_path), this, false);\r
         mOperationThread = mAuthCheckOperation.execute(client, this, mHandler);\r
+      \r
     }\r
 \r
     /**\r
@@ -776,7 +774,7 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
             // NOTHING TO DO ; can't find out what situation that leads to the exception in this code, but user logs signal that it happens\r
         }\r
         \r
-        if (result.isTemporalRedirection() || result.isIdPRedirection()) {\r
+        if (result.isTemporalRedirection() && result.isIdPRedirection()) {\r
             String url = result.getRedirectedLocation();\r
             String targetUrl = mHostBaseUrl + AccountUtils.getWebdavPath(mDiscoveredVersion, mCurrentAuthTokenType);\r
             \r
@@ -784,8 +782,8 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
             mSamlDialog = SamlWebViewDialog.newInstance(url, targetUrl);            \r
             mSamlDialog.show(getSupportFragmentManager(), TAG_SAML_DIALOG);\r
             \r
-            mAuthStatusIcon = android.R.drawable.ic_secure;\r
-            mAuthStatusText = R.string.auth_follow_auth_server;\r
+            mAuthStatusIcon = 0;\r
+            mAuthStatusText = 0;\r
             \r
         } else {\r
             mAuthStatusIcon = R.drawable.common_error;\r
@@ -1131,6 +1129,7 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
             showAuthStatus();\r
             Log_OC.d(TAG, "Access failed: " + result.getLogMessage());\r
         }\r
+\r
     }\r
 \r
 \r
@@ -1163,7 +1162,6 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
             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, mCurrentAuthTokenType, mAuthToken);\r
-            Log_OC.e(TAG, "saving auth token: " + mAuthToken);\r
             \r
         } else {\r
             response.putString(AccountManager.KEY_AUTHTOKEN, mPasswordInput.getText().toString());\r
@@ -1235,7 +1233,6 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
             intent.putExtra(AccountManager.KEY_USERDATA,        username);\r
             if (isOAuth || isSaml) {\r
                 mAccountMgr.setAuthToken(mAccount, mCurrentAuthTokenType, mAuthToken);\r
-                Log_OC.e(TAG, "saving auth token: " + mAuthToken);\r
             }\r
             /// add user data to the new account; TODO probably can be done in the last parameter addAccountExplicitly, or in KEY_USERDATA\r
             mAccountMgr.setUserData(mAccount, AccountAuthenticator.KEY_OC_VERSION,    mDiscoveredVersion.toString());\r
@@ -1587,6 +1584,7 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
                 finish();\r
             }\r
         }\r
+\r
             \r
     }\r
 \r
@@ -1610,8 +1608,8 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
             // TODO - show fail\r
             Log_OC.d(TAG, "SSO failed");\r
         }\r
-    }\r
     \r
+    }\r
     \r
     /** Show auth_message \r
      * \r