mirror of
https://github.com/nextcloud/android.git
synced 2024-11-27 09:39:25 +03:00
Show maintenance mode error in notifications while uploading a file
# Conflicts: # build.gradle # res/values/strings.xml
This commit is contained in:
parent
45d305afd6
commit
ad6d867971
4 changed files with 6 additions and 2 deletions
|
@ -323,6 +323,7 @@ public class UploadFileOperation extends SyncOperation {
|
|||
remoteParentPath = remoteParentPath.endsWith(OCFile.PATH_SEPARATOR) ?
|
||||
remoteParentPath : remoteParentPath + OCFile.PATH_SEPARATOR;
|
||||
result = grantFolderExistence(remoteParentPath, client);
|
||||
|
||||
if (!result.isSuccess()) {
|
||||
|
||||
return result;
|
||||
|
|
|
@ -74,6 +74,4 @@ public class NotificationUtils {
|
|||
}, delayInMillis);
|
||||
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
|
|
@ -85,6 +85,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 = String.format(
|
||||
res.getString(R.string.uploader_upload_failed_content_single),
|
||||
|
|
|
@ -543,6 +543,8 @@
|
|||
<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="uploads_view_upload_status_waiting_for_charging">Awaiting charge</string>
|
||||
<string name="actionbar_search">Search</string>
|
||||
<string name="files_drop_not_supported">This is a Nextcloud feature, please update.</string>
|
||||
|
|
Loading…
Reference in a new issue