浏览代码

Merge pull request #278 from nextcloud/noUploadFailureNotificationForDeletedFiles

Don't show upload failed notification for already deleted files
Morris Jobke 8 年之前
父节点
当前提交
aba0071b1a
共有 2 个文件被更改,包括 1 次插入1 次删除
  1. 0 1
      res/values-fi/strings.xml
  2. 1 0
      src/com/owncloud/android/files/services/FileUploader.java

+ 0 - 1
res/values-fi/strings.xml

@@ -20,7 +20,6 @@
   <string name="file_list_folders">kansiot</string>
   <string name="file_list_file">tiedosto</string>
   <string name="file_list_files">Tiedostot</string>
-  <string name="action_share_file">Jaa linkki</string>
   <string name="action_unshare_file">Poista linkin jako</string>
   <string name="common_yes">KYLLÄ</string>
   <string name="common_no">EI</string>

+ 1 - 0
src/com/owncloud/android/files/services/FileUploader.java

@@ -1030,6 +1030,7 @@ public class FileUploader extends Service
 
         // Show the result: success or fail notification
         if (!uploadResult.isCancelled() &&
+            !ResultCode.LOCAL_FILE_NOT_FOUND.equals(uploadResult.getCode()) &&
             !uploadResult.getCode().equals(ResultCode.DELAYED_FOR_WIFI) &&
             !uploadResult.getCode().equals(ResultCode.DELAYED_FOR_CHARGING)) {