浏览代码

Show maintenance mode message while downloading, removing, renaming or creating folder operations

davigonz 8 年之前
父节点
当前提交
c47970857c
共有 2 个文件被更改,包括 14 次插入1 次删除
  1. 13 0
      src/main/java/com/owncloud/android/utils/ErrorMessageAdapter.java
  2. 1 1
      src/main/res/values/strings.xml

+ 13 - 0
src/main/java/com/owncloud/android/utils/ErrorMessageAdapter.java

@@ -106,6 +106,9 @@ public class ErrorMessageAdapter {
                 if (result.getCode() == ResultCode.FILE_NOT_FOUND) {
                     message = res.getString(R.string.downloader_download_file_not_found);
 
+                }  else if (result.getCode() == ResultCode.MAINTENANCE_MODE) {
+                        message = res.getString(R.string.maintenance_mode);
+
                 } else {
                     message = String.format(
                             res.getString(R.string.downloader_download_failed_content), new File(
@@ -122,6 +125,9 @@ 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);
+
                 } else {
                     message = res.getString(R.string.remove_fail_msg);
                 }
@@ -142,6 +148,9 @@ public class ErrorMessageAdapter {
             } else if (result.getCode() == ResultCode.INVALID_CHARACTER_DETECT_IN_SERVER) {
                 message = res.getString(R.string.filename_forbidden_charaters_from_server);
 
+            } else if (result.getCode() == ResultCode.MAINTENANCE_MODE) {
+                message = res.getString(R.string.maintenance_mode);
+
             } else {
                 message = res.getString(R.string.rename_server_fail_msg);
             }
@@ -161,6 +170,10 @@ public class ErrorMessageAdapter {
 
             } else if (result.getCode() == ResultCode.INVALID_CHARACTER_DETECT_IN_SERVER) {
                 message = res.getString(R.string.filename_forbidden_charaters_from_server);
+
+            } else if (result.getCode() == ResultCode.MAINTENANCE_MODE) {
+                    message = res.getString(R.string.maintenance_mode);
+
             } else {
                 message = res.getString(R.string.create_dir_fail_msg);
             }

+ 1 - 1
src/main/res/values/strings.xml

@@ -543,7 +543,7 @@
     <string name="local_file_not_found_toast">File not found in local file system</string>
     <string name="confirmation_remove_files_alert">Do you really want to remove the selected items?</string>
     <string name="confirmation_remove_folders_alert">Do you really want to remove the selected items and their contents?</string>
-    <string name="maintenance_mode">This Owncloud instance is in maintenance mode, so it may take a while.</string>
+    <string name="maintenance_mode">This Owncloud instance is in maintenance mode, please try again later or contact your system administrator.</string>
 
     <string name="uploads_view_upload_status_waiting_for_charging">Awaiting charge</string>
     <string name="actionbar_search">Search</string>