Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Cfapi: Make sure no data is transfered after cancellation #3420

Merged
merged 1 commit into from
Jun 17, 2021
Merged

Cfapi: Make sure no data is transfered after cancellation #3420

merged 1 commit into from
Jun 17, 2021

Conversation

FlexW
Copy link

@FlexW FlexW commented Jun 9, 2021

Signed-off-by: Felix Weilbach felix.weilbach@nextcloud.com

This a different version of #3289 that works without global variables.

@FlexW FlexW mentioned this pull request Jun 9, 2021
Closed
allexzander
allexzander reviewed Jun 10, 2021
View reviewed changes
src/libsync/propagatedownload.cpp Show resolved Hide resolved
src/libsync/propagatedownload.cpp Outdated Show resolved Hide resolved
src/libsync/vfs/cfapi/hydrationjob.cpp Outdated Show resolved Hide resolved
src/libsync/vfs/cfapi/vfs_cfapi.cpp Outdated Show resolved Hide resolved
@FlexW
Copy link
Author

FlexW commented Jun 14, 2021

/rebase

@github-actions github-actions bot force-pushed the bugfix/cfapi-improve-cancellation branch from 09e212d to 8e80160 Compare June 14, 2021 14:51
mgallien
mgallien reviewed Jun 15, 2021
View reviewed changes
Copy link
Collaborator

@mgallien mgallien left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I will continue later with a more detailed review

src/libsync/vfs/cfapi/cfapiwrapper.cpp Outdated Show resolved Hide resolved
src/libsync/vfs/cfapi/cfapiwrapper.cpp Outdated Show resolved Hide resolved
src/libsync/vfs/cfapi/cfapiwrapper.cpp Show resolved Hide resolved
mgallien
mgallien approved these changes Jun 16, 2021
View reviewed changes
Copy link
Collaborator

@mgallien mgallien left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks
please clean history before merging it

@FlexW FlexW force-pushed the bugfix/cfapi-improve-cancellation branch 2 times, most recently from 69dcc73 to 8f4164a Compare June 17, 2021 07:36
@allexzander allexzander self-requested a review June 17, 2021 07:41
@FlexW
Copy link
Author

FlexW commented Jun 17, 2021

/rebase

Cfapi: Make sure no data is transfered after cancellation
c799dbd 
Signed-off-by: Felix Weilbach <felix.weilbach@nextcloud.com>
@github-actions github-actions bot force-pushed the bugfix/cfapi-improve-cancellation branch from 8f4164a to c799dbd Compare June 17, 2021 09:10
@nextcloud-desktop-bot
Copy link

AppImage file: Nextcloud-PR-3420-c799dbdd610618c42976ba5ea359282b4fddf9a7-x86_64.AppImage

To test this change/fix you can simply download above AppImage file and test it.

Please make sure to quit your existing Nextcloud app and backup your data.

@FlexW FlexW merged commit 6e41875 into master Jun 17, 2021
@FlexW FlexW deleted the bugfix/cfapi-improve-cancellation branch June 17, 2021 09:46
@FlexW
Copy link
Author

FlexW commented Jun 18, 2021

/backport to stable-3.2

@backportbot-nextcloud backportbot-nextcloud bot mentioned this pull request Jun 18, 2021
Merged
@allexzander allexzander mentioned this pull request Dec 20, 2021
Closed
This was referenced Aug 16, 2024
Closed
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@allexzander allexzander allexzander approved these changes

@mgallien mgallien mgallien approved these changes

@camilasan camilasan Awaiting requested review from camilasan

@er-vin er-vin Awaiting requested review from er-vin

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@FlexW @nextcloud-desktop-bot @mgallien @allexzander