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

[stable13] Fix activities for end2end encryption #8686

Merged
merged 7 commits into from Mar 6, 2018
Merged

[stable13] Fix activities for end2end encryption #8686

merged 7 commits into from Mar 6, 2018

Conversation

nickvergessen
Copy link
Member

Backport #8298

@nickvergessen
Extract duplicated logic into a method
0911f3b 
Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessen
Add special handling for e2e encryption
737af44 
Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessen
Fix path handling for activities
f1e01db 
Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessen
Fix problem with deleted files
7c15b99 
Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessen
Do a recursion instead of an endless loop
5d8aaf9 
Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessen
Catch exception when the parent is deleted as well
8f8d7cf 
Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessen
Fix unit test
d16aa27 
Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessen nickvergessen added this to the Nextcloud 13.0.1 milestone Mar 6, 2018
@codecov
Copy link

codecov bot commented Mar 6, 2018 •
edited

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 merged commit d7a70ab into stable13 Mar 6, 2018
@rullzer rullzer deleted the backport/8298/fix-activities-for-end2end-encryption branch March 6, 2018 21:44
@MorrisJobke MorrisJobke mentioned this pull request Mar 9, 2018
Merged
10 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rullzer rullzer rullzer approved these changes

@MorrisJobke MorrisJobke MorrisJobke approved these changes

@schiessle schiessle Awaiting requested review from schiessle

Assignees
No one assigned
Labels
3. to review Waiting for reviews bug feature: activity and notification feature: encryption (client-side)
Projects
None yet
Milestone
Nextcloud 13.0.1
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@nickvergessen @rullzer @MorrisJobke