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.

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

[stable13] Fix activities for end2end encryption #8686

Merged
merged 7 commits into from Mar 6, 2018

Conversation

@nickvergessen
Member

nickvergessen commented Mar 6, 2018

Backport #8298

nickvergessen added some commits Feb 10, 2018

Extract duplicated logic into a method
Signed-off-by: Joas Schilling <coding@schilljs.com>
Add special handling for e2e encryption
Signed-off-by: Joas Schilling <coding@schilljs.com>
Fix path handling for activities
Signed-off-by: Joas Schilling <coding@schilljs.com>
Fix problem with deleted files
Signed-off-by: Joas Schilling <coding@schilljs.com>
Do a recursion instead of an endless loop
Signed-off-by: Joas Schilling <coding@schilljs.com>
Catch exception when the parent is deleted as well
Signed-off-by: Joas Schilling <coding@schilljs.com>
Fix unit test
Signed-off-by: Joas Schilling <coding@schilljs.com>
@codecov

This comment has been minimized.

codecov bot commented Mar 6, 2018

Codecov Report

Merging #8686 into stable13 will decrease coverage by 0.01%.
The diff coverage is 10.2%.

@@              Coverage Diff               @@
##             stable13    #8686      +/-   ##
==============================================
- Coverage        51.3%   51.28%   -0.02%     
- Complexity      25001    25013      +12     
==============================================
  Files            1609     1609              
  Lines           95248    95298      +50     
  Branches         1376     1376              
==============================================
+ Hits            48867    48875       +8     
- Misses          46381    46423      +42
Impacted Files Coverage Δ Complexity Δ
apps/files/lib/Activity/Provider.php 15.47% <10.2%> (+1.77%) 83 <19> (+12) ⬆️
apps/files_trashbin/lib/Trashbin.php 72.28% <0%> (-0.25%) 136% <0%> (ø)
lib/private/Repair/Collation.php 0% <0%> (ø) 16% <0%> (ø) ⬇️
@rullzer

rullzer approved these changes Mar 6, 2018

@rullzer rullzer merged commit d7a70ab into stable13 Mar 6, 2018

1 of 3 checks passed

codecov/patch 10.2% of diff hit (target 51.3%)
Details
codecov/project 51.28% (-0.02%) compared to 242f0c0
Details
continuous-integration/drone/pr the build was successful
Details

@rullzer rullzer deleted the backport/8298/fix-activities-for-end2end-encryption branch Mar 6, 2018

@MorrisJobke MorrisJobke referenced this pull request Mar 9, 2018

Merged

13.0.1 RC1 #8748

10 of 10 tasks complete
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment