Changed maintenance mode message

src/main/java/com/owncloud/android/authentication/AuthenticatorActivity.java

@@ -1454,7 +1454,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
                 mServerStatusText = R.string.auth_redirect_non_secure_connection_title;
                 break;
             case MAINTENANCE_MODE:
-                mServerStatusText = R.string.auth_maintenance_mode;
+                mServerStatusText = R.string.maintenance_mode;
                 break;
             default:
                 mServerStatusText = 0;

src/main/java/com/owncloud/android/utils/ErrorMessageAdapter.java

@@ -85,7 +85,7 @@ public class ErrorMessageAdapter {
                     message = res.getString(R.string.filename_forbidden_charaters_from_server);
 
                 } else if (result.getCode() == ResultCode.MAINTENANCE_MODE) {
-                    message = String.format(res.getString(R.string.maintenance_mode), res.getString(R.string.app_name));
+                    message = res.getString(R.string.maintenance_mode);
 
                 } else {
                     message = String.format(
@@ -106,7 +106,7 @@ public class ErrorMessageAdapter {
                     message = res.getString(R.string.downloader_download_file_not_found);
 
                 }  else if (result.getCode() == ResultCode.MAINTENANCE_MODE) {
-                        message = String.format(res.getString(R.string.maintenance_mode), res.getString(R.string.app_name));
+                    message = res.getString(R.string.maintenance_mode);
 
                 } else {
                     message = String.format(
@@ -126,7 +126,7 @@ public class ErrorMessageAdapter {
                             res.getString(R.string.forbidden_permissions_delete));
 
                 } else if (result.getCode() == ResultCode.MAINTENANCE_MODE) {
-                    message = String.format(res.getString(R.string.maintenance_mode), res.getString(R.string.app_name));
+                    message = res.getString(R.string.maintenance_mode);
 
                 } else {
                     message = res.getString(R.string.remove_fail_msg);
@@ -149,7 +149,7 @@ public class ErrorMessageAdapter {
                 message = res.getString(R.string.filename_forbidden_charaters_from_server);
 
             } else if (result.getCode() == ResultCode.MAINTENANCE_MODE) {
-                message = String.format(res.getString(R.string.maintenance_mode), res.getString(R.string.app_name));
+                message = res.getString(R.string.maintenance_mode);
 
             } else {
                 message = res.getString(R.string.rename_server_fail_msg);
@@ -172,7 +172,7 @@ public class ErrorMessageAdapter {
                 message = res.getString(R.string.filename_forbidden_charaters_from_server);
 
             } else if (result.getCode() == ResultCode.MAINTENANCE_MODE) {
-                    message = String.format(res.getString(R.string.maintenance_mode), res.getString(R.string.app_name));
+                message = res.getString(R.string.maintenance_mode);
 
             } else {
                 message = res.getString(R.string.create_dir_fail_msg);
@@ -193,7 +193,7 @@ public class ErrorMessageAdapter {
                         res.getString(R.string.share_link_forbidden_permissions));
 
             } else if (result.getCode() == ResultCode.MAINTENANCE_MODE) {
-                message = String.format(res.getString(R.string.maintenance_mode), res.getString(R.string.app_name));
+                message = res.getString(R.string.maintenance_mode);
 
             } else {    // Generic error
                 // Show a Message, operation finished without success
@@ -214,7 +214,7 @@ public class ErrorMessageAdapter {
                         res.getString(R.string.unshare_link_forbidden_permissions));
 
             } else if (result.getCode() == ResultCode.MAINTENANCE_MODE) {
-                message = String.format(res.getString(R.string.maintenance_mode), res.getString(R.string.app_name));
+                message = res.getString(R.string.maintenance_mode);
 
             } else {    // Generic error
                 // Show a Message, operation finished without success
@@ -236,7 +236,7 @@ public class ErrorMessageAdapter {
                         res.getString(R.string.update_link_forbidden_permissions));
 
             } else if (result.getCode() == ResultCode.MAINTENANCE_MODE) {
-                message = String.format(res.getString(R.string.maintenance_mode), res.getString(R.string.app_name));
+                message = res.getString(R.string.maintenance_mode);
 
             } else {    // Generic error
                 // Show a Message, operation finished without success
@@ -261,7 +261,7 @@ public class ErrorMessageAdapter {
                 message = res.getString(R.string.filename_forbidden_charaters_from_server);
 
             } else if (result.getCode() == ResultCode.MAINTENANCE_MODE) {
-                message = String.format(res.getString(R.string.maintenance_mode), res.getString(R.string.app_name));
+                message = res.getString(R.string.maintenance_mode);
 
             } else {    // Generic error
                 // Show a Message, operation finished without success
@@ -278,7 +278,7 @@ public class ErrorMessageAdapter {
                             folderPathName);
 
                 } else if (result.getCode() == ResultCode.MAINTENANCE_MODE) {
-                    message = String.format(res.getString(R.string.maintenance_mode), res.getString(R.string.app_name));
+                    message = res.getString(R.string.maintenance_mode);
 
                 } else {    // Generic error
                     // Show a Message, operation finished without success
@@ -302,7 +302,7 @@ public class ErrorMessageAdapter {
                         res.getString(R.string.forbidden_permissions_copy));
 
             } else if (result.getCode() == ResultCode.MAINTENANCE_MODE) {
-                message = String.format(res.getString(R.string.maintenance_mode), res.getString(R.string.app_name));
+                message = res.getString(R.string.maintenance_mode);
 
             } else {    // Generic error
                 // Show a Message, operation finished without success

src/main/res/values/strings.xml

@@ -276,7 +276,6 @@
 	<string name="auth_fail_get_user_name">Your server is not returning a correct user ID, please contact an administrator</string>
 	<string name="auth_can_not_auth_against_server">Cannot authenticate to this server</string>
     <string name="auth_account_does_not_exist">Account does not exist on the device yet</string>
-    <string name="auth_maintenance_mode">The server is in maintenance mode, please try again later.</string>
 
 
     <string name="favorite">Set as available offline</string>