Merge pull request #536 from owncloud/fix_issue_534
authorDavid A. Velasco <dvelasco@owncloud.com>
Fri, 6 Jun 2014 10:27:47 +0000 (12:27 +0200)
committerDavid A. Velasco <dvelasco@owncloud.com>
Fri, 6 Jun 2014 10:27:47 +0000 (12:27 +0200)
Fix crash when adding file to ownCloud with local storage full.

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

index c5bda8c..7da60b9 100644 (file)
@@ -62,7 +62,8 @@ public class ErrorMessageAdapter {
                 if (result.getCode() == ResultCode.LOCAL_STORAGE_FULL
                         || result.getCode() == ResultCode.LOCAL_STORAGE_NOT_COPIED) {
                     message = String.format(res.getString(R.string.error__upload__local_file_not_copied), 
-                            ((UploadFileOperation) operation).getFileName());
+                            ((UploadFileOperation) operation).getFileName(), 
+                            res.getString(R.string.app_name));
                     
                 } else if (result.getCode() == ResultCode.QUOTA_EXCEEDED) {
                     message = res.getString(R.string.failed_upload_quota_exceeded_text);