소스 검색

Merge pull request #11384 from nextcloud/fix/invalid-filename-download

Improve error message when download fails due to invalid filename
Álvaro Brey 2 년 전
부모
커밋
edec670f28
2개의 변경된 파일9개의 추가작업 그리고 3개의 파일을 삭제
  1. 7 3
      app/src/main/java/com/owncloud/android/utils/ErrorMessageAdapter.java
  2. 2 0
      app/src/main/res/values/strings.xml

+ 7 - 3
app/src/main/java/com/owncloud/android/utils/ErrorMessageAdapter.java

@@ -324,9 +324,13 @@ public final class ErrorMessageAdapter {
                 new File(operation.getSavePath()).getName());
 
         } else {
-            if (result.getCode() == ResultCode.FILE_NOT_FOUND) {
-                return res.getString(R.string.downloader_download_file_not_found);
-
+            switch (result.getCode()) {
+                case FILE_NOT_FOUND:
+                    return res.getString(R.string.downloader_download_file_not_found);
+                case CANNOT_CREATE_FILE:
+                    return res.getString(R.string.download_cannot_create_file);
+                case INVALID_LOCAL_FILE_NAME:
+                    return res.getString(R.string.download_download_invalid_local_file_name);
             }
         }
         return null;

+ 2 - 0
app/src/main/res/values/strings.xml

@@ -1075,4 +1075,6 @@
     <string name="document_scan_export_dialog_title">Choose export type</string>
     <string name="document_scan_export_dialog_pdf">PDF file</string>
     <string name="document_scan_export_dialog_images">Multiple images</string>
+    <string name="download_cannot_create_file">Cannot create local file</string>
+    <string name="download_download_invalid_local_file_name">Invalid filename for local file</string>
 </resources>