Browse Source

Show maintenance mode message while authenticating

# Conflicts:
#	src/com/owncloud/android/authentication/AuthenticatorActivity.java
davigonz 8 năm trước cách đây
mục cha
commit
27bf6ecfc1

+ 2 - 1
src/main/java/com/owncloud/android/utils/ErrorMessageAdapter.java

@@ -124,6 +124,7 @@ public class ErrorMessageAdapter {
                     // Error --> No permissions
                     message = String.format(res.getString(R.string.forbidden_permissions),
                             res.getString(R.string.forbidden_permissions_delete));
+
                 } else if (result.getCode() == ResultCode.MAINTENANCE_MODE) {
                     message = res.getString(R.string.maintenance_mode);
 
@@ -299,7 +300,7 @@ public class ErrorMessageAdapter {
             } else if (result.getCode() == ResultCode.FORBIDDEN) {
                 message = String.format(res.getString(R.string.forbidden_permissions),
                         res.getString(R.string.forbidden_permissions_copy));
-                
+
             } else if (result.getCode() == ResultCode.MAINTENANCE_MODE) {
                 message = res.getString(R.string.maintenance_mode);