Browse Source

Fix bug Shibboleth server does not recognize maintenance mode

# Conflicts:
#	src/com/owncloud/android/authentication/AuthenticatorActivity.java
davigonz 8 years ago
parent
commit
33bbbb0be0

+ 4 - 3
src/main/java/com/owncloud/android/authentication/AuthenticatorActivity.java

@@ -1252,7 +1252,8 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
             }
             }
         } else {
         } else {
             if (!webViewLoginMethod) {
             if (!webViewLoginMethod) {
-                updateStatusIconFailUserName();
+                int statusText = result.getCode() == ResultCode.MAINTENANCE_MODE ? R.string.maintenance_mode : R.string.auth_fail_get_user_name;
+                updateStatusIconFailUserName(statusText);
                 showAuthStatus();
                 showAuthStatus();
             }
             }
             Log_OC.e(TAG, "Access to user name failed: " + result.getLogMessage());
             Log_OC.e(TAG, "Access to user name failed: " + result.getLogMessage());
@@ -1545,9 +1546,9 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
     }
     }
 
 
 
 
-    private void updateStatusIconFailUserName() {
+    private void updateStatusIconFailUserName(int statusText){
         mAuthStatusIcon = R.drawable.ic_alert;
         mAuthStatusIcon = R.drawable.ic_alert;
-        mAuthStatusText = R.string.auth_fail_get_user_name;
+        mAuthStatusText = statusText;
     }
     }
 
 
     private void updateServerStatusIconNoRegularAuth() {
     private void updateServerStatusIconNoRegularAuth() {