From: David A. Velasco <dvelasco@owncloud.com>
Date: Fri, 6 Jun 2014 10:27:47 +0000 (+0200)
Subject: Merge pull request #536 from owncloud/fix_issue_534
X-Git-Tag: oc-android-1.7.0_signed~289
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/36abdd9d0ae479323644604b1cc030bb7f0cb18a?hp=7c2f5e6f6466e0f40bd536b871b92a93d7ea8dfc

Merge pull request #536 from owncloud/fix_issue_534

Fix crash when adding file to ownCloud with local storage full.
---

diff --git a/src/com/owncloud/android/utils/ErrorMessageAdapter.java b/src/com/owncloud/android/utils/ErrorMessageAdapter.java
index c5bda8ce..7da60b92 100644
--- a/src/com/owncloud/android/utils/ErrorMessageAdapter.java
+++ b/src/com/owncloud/android/utils/ErrorMessageAdapter.java
@@ -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);