mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-27 17:46:37 +03:00
Code Issues Projects Releases Packages Wiki Activity

Upgrade notifications on status bar when uploading to show proper message about fails due to lack of permissions and removed FailedUploaderActivity

Browse source
This commit is contained in:
jabarros 2014-07-11 11:45:15 +02:00 committed by David A. Velasco
parent a28fa921c9
commit 61c8f7f083
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
res/values/strings.xml
View file

@ -270,11 +270,12 @@
<string name="network_error_connect_timeout_exception">An error occurred while waiting for the server, the operation couldn\'t have been done</string> <string name="network_error_connect_timeout_exception">An error occurred while waiting for the server, the operation couldn\'t have been done</string>
<string name="network_host_not_available">The operation couldn\'t be completed, server is unavailable</string> <string name="network_host_not_available">The operation couldn\'t be completed, server is unavailable</string>
<string name="forbidden_permissions">You do not have permissions %s</string> <string name="forbidden_permissions">You do not have permission %s</string>
<string name="forbidden_permissions_rename">to rename this file</string> <string name="forbidden_permissions_rename">to rename this file</string>
<string name="forbidden_permissions_delete">to delete this file</string> <string name="forbidden_permissions_delete">to delete this file</string>
<string name="share_link_forbidden_permissions">to share this file</string> <string name="share_link_forbidden_permissions">to share this file</string>
<string name="unshare_link_forbidden_permissions">to unshare this file</string> <string name="unshare_link_forbidden_permissions">to unshare this file</string>
<string name="forbidden_permissions_create">to create the file</string> <string name="forbidden_permissions_create">to create the file</string>
<string name="uploader_upload_forbidden_permissions">to upload in this folder</string>
</resources> </resources>

5
src/com/owncloud/android/utils/ErrorMessageAdapter.java
View file

@ -69,8 +69,13 @@ public class ErrorMessageAdapter {
/* /*
} else if (result.getCode() == ResultCode.QUOTA_EXCEEDED) { } else if (result.getCode() == ResultCode.QUOTA_EXCEEDED) {
message = res.getString(R.string.failed_upload_quota_exceeded_text); message = res.getString(R.string.failed_upload_quota_exceeded_text);
<<<<<<< HEAD
*/ */
} else if (result.getCode() == ResultCode.FORBIDDEN) {
message = String.format(res.getString(R.string.forbidden_permissions),
res.getString(R.string.uploader_upload_forbidden_permissions));
} else { } else {
message = String.format(res.getString(R.string.uploader_upload_failed_content_single), message = String.format(res.getString(R.string.uploader_upload_failed_content_single),
((UploadFileOperation) operation).getFileName()); ((UploadFileOperation) operation).getFileName());