Skip to content

Only handle encrypted property on folders - #8111

Merged
rullzer merged 1 commit into
masterfrom
only_encrypted_prop_on_folders
Jan 30, 2018
Merged

Only handle encrypted property on folders#8111
rullzer merged 1 commit into
masterfrom
only_encrypted_prop_on_folders

Conversation

@rullzer

Copy link
Copy Markdown
Member

Exposing the encrypted property is required for E2E. However, there is
no need to expose this on files as then it is server side encryption
(which the clients don't care about).

Better to not confuse the output.

Signed-off-by: Roeland Jago Douma roeland@famdouma.nl

Exposing the encrypted property is required for E2E. However, there is
no need to expose this on files as then it is server side encryption
(which the clients don't care about).
Better to not confuse the output.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
@codecov

codecovBot commented Jan 30, 2018

Copy link
Copy Markdown

Codecov Report

Merging #8111 into master will not change coverage.
The diff coverage is 66.66%.

@@ Coverage Diff @@## master #8111 +/- ##
========================================
Coverage 51.7% 51.7% Complexity 25429 25429 ========================================
Files 1598 1598 Lines 95248 95248 Branches 1376 1376 ========================================
Hits 49252 49252 Misses 45996 45996
Impacted FilesCoverage ΔComplexity Δ
apps/dav/lib/Connector/Sabre/FilesPlugin.php82.16% <66.66%> (ø)76 <2> (ø)⬇️
lib/private/Security/CertificateManager.php91% <0%> (-1%)39% <0%> (ø)
apps/files_trashbin/lib/Trashbin.php72.46% <0%> (-0.25%)136% <0%> (ø)
lib/private/Server.php85.34% <0%> (+0.09%)281% <0%> (ø)⬇️
lib/private/Files/Cache/Propagator.php96.2% <0%> (+1.26%)16% <0%> (ø)⬇️

@nickvergessennickvergessen left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

(another reason why we shouldn't have used the same flag)

@rullzer
rullzer merged commit 48884c9 into masterJan 30, 2018
@rullzer
rullzer deleted the only_encrypted_prop_on_folders branch January 30, 2018 20:54
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@rullzer@nickvergessen@MorrisJobke