Skip to content

[stable13] Fix activities for end2end encryption - #8686

Merged
rullzer merged 7 commits into
stable13from
backport/8298/fix-activities-for-end2end-encryption
Mar 6, 2018
Merged

[stable13] Fix activities for end2end encryption#8686
rullzer merged 7 commits into
stable13from
backport/8298/fix-activities-for-end2end-encryption

Conversation

@nickvergessen

@nickvergessennickvergessen commented Mar 6, 2018

Copy link
Copy Markdown
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>
@nickvergessennickvergessen added this to the Nextcloud 13.0.1 milestone Mar 6, 2018
@codecov

codecovBot commented Mar 6, 2018•
edited
Loading

Copy link
Copy Markdown

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 FilesCoverage ΔComplexity Δ
apps/files/lib/Activity/Provider.php15.47% <10.2%> (+1.77%)83 <19> (+12)⬆️
apps/files_trashbin/lib/Trashbin.php72.28% <0%> (-0.25%)136% <0%> (ø)
lib/private/Repair/Collation.php0% <0%> (ø)16% <0%> (ø)⬇️

@rullzer
rullzer merged commit d7a70ab into stable13Mar 6, 2018
@rullzer
rullzer deleted the backport/8298/fix-activities-for-end2end-encryption branch March 6, 2018 21:44
@MorrisJobkeMorrisJobke mentioned this pull request Mar 9, 2018
Merged
10 tasks
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@rullzerrullzerrullzer approved these changes
@MorrisJobkeMorrisJobkeMorrisJobke approved these changes
@schiessleschiessleAwaiting requested review from schiessle

Assignees

No one assigned

Labels

3. to reviewWaiting for reviewsbugfeature: activity and notificationfeature: encryption (client-side)

Projects

None yet

Milestone

Nextcloud 13.0.1

Development

Successfully merging this pull request may close these issues.

3 participants

@nickvergessen@rullzer@MorrisJobke