Merge branch 'develop' into regular_authentication_in_saml_server

[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 72b6594..33ddbf7 100644 (file)
--- a/src/com/owncloud/android/authentication/AuthenticatorActivity.java
+++ b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
@@ -35,7 +35,6 @@ import android.net.http.SslError;
 import android.os.Bundle;\r
 import android.os.Handler;\r
 import android.preference.PreferenceManager;\r
-import android.support.v4.app.DialogFragment;\r
 import android.support.v4.app.Fragment;\r
 import android.support.v4.app.FragmentManager;\r
 import android.support.v4.app.FragmentTransaction;\r
@@ -74,8 +73,7 @@ import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode;\r
 import com.owncloud.android.lib.resources.files.ExistenceCheckRemoteOperation;\r
 import com.owncloud.android.lib.resources.users.GetRemoteUserNameOperation;\r
-
-import com.owncloud.android.ui.dialog.AlertMessageDialog;\r
+\r
 import com.owncloud.android.ui.dialog.SamlWebViewDialog;\r
 import com.owncloud.android.ui.dialog.SslUntrustedCertDialog;\r
 import com.owncloud.android.ui.dialog.SslUntrustedCertDialog.OnSslUntrustedCertListener;\r
@@ -130,7 +128,6 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
     public static final byte ACTION_UPDATE_TOKEN = 1;\r
 \r
     private static final String TAG_SAML_DIALOG = "samlWebViewDialog";\r
-    private static final String TAG_ALERT_MESSAGE_DIALOG = "alertMessagewDialog";\r
     \r
     private String mHostBaseUrl;\r
     private OwnCloudVersion mDiscoveredVersion;\r
@@ -900,6 +897,9 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
             mDiscoveredVersion = operation.getDiscoveredVersion();\r
             mHostBaseUrl = normalizeUrl(mHostUrlInput.getText().toString());\r
             \r
+            // Refresh server status, but don't show it\r
+            updateServerStatusIconAndText(result);\r
+            \r
             /// update status icon and text\r
             if (mServerIsValid) {\r
                 hideRefreshButton();\r
@@ -908,9 +908,9 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
                 tryEmptyAuthorization();\r
             } else {\r
                 showRefreshButton();\r
+                // Show server status\r
+                showServerStatus();\r
             }\r
-            updateServerStatusIconAndText(result);\r
-            showServerStatus();\r
 \r
             /// very special case (TODO: move to a common place for all the remote operations)\r
             if (result.getCode() == ResultCode.SSL_RECOVERABLE_PEER_UNVERIFIED) {\r
@@ -1143,10 +1143,15 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
 \r
 \r
     private void updateStatusIconFailUserName(){\r
-        mAuthStatusIcon = android.R.drawable.ic_secure;\r
+        mAuthStatusIcon = R.drawable.common_error;\r
         mAuthStatusText = R.string.auth_fail_get_user_name;\r
     }\r
     \r
+    private void updateServerStatusIconNoRegularAuth(){\r
+        mServerStatusIcon = R.drawable.common_error;\r
+        mServerStatusText = R.string.auth_unsupported_auth_method;\r
+    }\r
+    \r
     /**\r
      * Processes the result of the request for and access token send \r
      * to an OAuth authorization server.\r
@@ -1204,8 +1209,9 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
                 mOkButton.setEnabled(false);\r
                 mTryEmptyAuthorization = false;\r
                 mServerIsValid = false;\r
-               //show an alert message\r
-               showAlertMessageDialog(R.string.common_alert_title, R.string.auth_unsupported_auth_method);\r
+                //show an alert message ( Server Status )\r
+                updateServerStatusIconNoRegularAuth();\r
+                showServerStatus();\r
                 \r
             } else {\r
                 Log_OC.d(TAG, "Successful access - time to save the account");\r
@@ -1228,7 +1234,10 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
             if (mTryEmptyAuthorization) {\r
                 mTryEmptyAuthorization = false;\r
                 mOkButton.setEnabled(true);\r
-\r
+                \r
+                // Show server status\r
+                showServerStatus();\r
+                \r
             } else if (result.isServerFail() || result.isException()) {\r
                 /// if server fail or exception in authorization, the UI is updated as when a server check failed\r
                 mServerIsChecked = true;\r
@@ -1778,10 +1787,5 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
         }\r
         \r
     }\r
-    \r
-    private void showAlertMessageDialog(int tittle, int message) {\r
-        DialogFragment newAlertMessage = AlertMessageDialog.newInstance(tittle, message);\r
-        newAlertMessage.show(getSupportFragmentManager(), TAG_ALERT_MESSAGE_DIALOG);\r
-    }\r
 \r
 }\r