projects
/
pub
/
Android
/
ownCloud.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upgrade notifications on status bar when uploading to show proper message about fails...
[pub/Android/ownCloud.git]
/
src
/
com
/
owncloud
/
android
/
utils
/
ErrorMessageAdapter.java
diff --git
a/src/com/owncloud/android/utils/ErrorMessageAdapter.java
b/src/com/owncloud/android/utils/ErrorMessageAdapter.java
index
ec0ddd8
..
25a0dfe
100644
(file)
--- a/
src/com/owncloud/android/utils/ErrorMessageAdapter.java
+++ b/
src/com/owncloud/android/utils/ErrorMessageAdapter.java
@@
-69,8
+69,13
@@
public class ErrorMessageAdapter {
/*
} else if (result.getCode() == ResultCode.QUOTA_EXCEEDED) {
message = res.getString(R.string.failed_upload_quota_exceeded_text);
/*
} else if (result.getCode() == ResultCode.QUOTA_EXCEEDED) {
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 {
message = String.format(res.getString(R.string.uploader_upload_failed_content_single),
((UploadFileOperation) operation).getFileName());
} else {
message = String.format(res.getString(R.string.uploader_upload_failed_content_single),
((UploadFileOperation) operation).getFileName());