From: jabarros <jabarros@solidgear.es>
Date: Fri, 11 Jul 2014 11:10:07 +0000 (+0200)
Subject: Add case for when trying to download a file that is no longer available on the server
X-Git-Tag: oc-android-1.7.0_signed~245^2~2
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/2b21d677910621915358992c08ceb078ee71c42e?ds=inline;hp=-c

Add case for when trying to download a file that is no longer available on the server
---

2b21d677910621915358992c08ceb078ee71c42e
diff --git a/res/values/strings.xml b/res/values/strings.xml
index e66c2d16..a8da038c 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -277,5 +277,6 @@
 	<string name="unshare_link_forbidden_permissions">to unshare this file</string>
 	<string name="forbidden_permissions_create">to create the file</string>
 	<string name="uploader_upload_forbidden_permissions">to upload in this folder</string>
+	<string name="downloader_download_file_not_found">The file is no longer available on the server</string>
 
 </resources>
diff --git a/src/com/owncloud/android/utils/ErrorMessageAdapter.java b/src/com/owncloud/android/utils/ErrorMessageAdapter.java
index 25a0dfeb..ebdadc18 100644
--- a/src/com/owncloud/android/utils/ErrorMessageAdapter.java
+++ b/src/com/owncloud/android/utils/ErrorMessageAdapter.java
@@ -89,8 +89,13 @@ public class ErrorMessageAdapter {
                         new File(((DownloadFileOperation) operation).getSavePath()).getName());
                 
             } else {
-                message = String.format(res.getString(R.string.downloader_download_failed_content), 
-                        new File(((DownloadFileOperation) operation).getSavePath()).getName());
+                if (result.getCode() == ResultCode.FILE_NOT_FOUND) {
+                    message = res.getString(R.string.downloader_download_file_not_found);
+
+                } else {
+                    message = String.format(res.getString(R.string.downloader_download_failed_content), new File(
+                            ((DownloadFileOperation) operation).getSavePath()).getName());
+                }
             }
             
         } else if (operation instanceof RemoveFileOperation) {