Skip to content

Commit f0bbdf8

Browse files
alperozturk96backportbot[bot]
authored andcommitted
remove public handleLocalBehaviour
Signed-off-by: alperozturk96 <alper_ozturk@proton.me>
1 parent 65c14db commit f0bbdf8

1 file changed

Lines changed: 3 additions & 1 deletion

File tree

app/src/main/java/com/nextcloud/client/jobs/utils/UploadErrorNotificationManager.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ object UploadErrorNotificationManager {
6767
return
6868
}
6969

70-
// Do not show an error notification when uploading the same file again (manual uploads only).
70+
// do not show an error notification when uploading the same file again
7171
if (result.code == ResultCode.SYNC_CONFLICT) {
7272
val isSameFile = withContext(Dispatchers.IO) {
7373
FileUploadHelper.instance().isSameFileOnRemote(
@@ -80,6 +80,8 @@ object UploadErrorNotificationManager {
8080

8181
if (isSameFile) {
8282
Log_OC.w(TAG, "exact same file already exists on remote, error notification skipped")
83+
84+
// only show notification for manual uploads
8385
onSameFileConflict()
8486
return
8587
}

0 commit comments

Comments
 (0)