diff --git a/app/src/main/java/com/owncloud/android/ui/activity/UploadListActivity.java b/app/src/main/java/com/owncloud/android/ui/activity/UploadListActivity.java index d4f3d5c950..8d5e5ac529 100755 --- a/app/src/main/java/com/owncloud/android/ui/activity/UploadListActivity.java +++ b/app/src/main/java/com/owncloud/android/ui/activity/UploadListActivity.java @@ -196,19 +196,22 @@ public class UploadListActivity extends FileActivity { private void refresh() { backgroundJobManager.startImmediateFilesSyncJob(false, true); - // retry failed uploads - new Thread(() -> FileUploader.retryFailedUploads( - this, - uploadsStorageManager, - connectivityService, - userAccountManager, - powerManagementService)) - .start(); + if(uploadsStorageManager.getFailedUploads().length > 0){ + // retry failed uploads + new Thread(() -> FileUploader.retryFailedUploads( + this, + uploadsStorageManager, + connectivityService, + userAccountManager, + powerManagementService)) + .start(); + DisplayUtils.showSnackMessage(this, R.string.uploader_local_files_uploaded); + } + // update UI uploadListAdapter.loadUploadItemsFromDb(); swipeListRefreshLayout.setRefreshing(false); - DisplayUtils.showSnackMessage(this, R.string.uploader_local_files_uploaded); } @Override diff --git a/app/src/main/java/com/owncloud/android/utils/FilesUploadHelper.kt b/app/src/main/java/com/owncloud/android/utils/FilesUploadHelper.kt index b15c4910bd..0b146c36a1 100644 --- a/app/src/main/java/com/owncloud/android/utils/FilesUploadHelper.kt +++ b/app/src/main/java/com/owncloud/android/utils/FilesUploadHelper.kt @@ -151,7 +151,6 @@ class FilesUploadHelper { val boundListener = mBoundListeners[key] boundListener?.onTransferProgress(progressRate, totalTransferredSoFar, totalToTransfer, fileName) - Log_OC.d("TAG", "Hello") } } } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 16526b0bc2..c60ee567ec 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -916,7 +916,7 @@ Failed to start editor Add folder info creates folder info - Try to upload local files again + Retry to upload failed local files We couldnt locate the file on server. Another user may have deleted the file File not found. Are you sure that this file exists or has a previous conflict not been resolved? File upload conflict