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] reset encryptionVersion to '1' if a file was stream copied #9064

Merged
merged 1 commit into from Apr 4, 2018

Conversation

Projects
None yet
3 participants
@schiessle
Member

schiessle commented Apr 3, 2018

backport of #9018

reset encryptionVersion to '1' if a file was stream copied, because t…
…his means that we basically write the file from scratch

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>

@schiessle schiessle requested review from rullzer and MorrisJobke Apr 3, 2018

@schiessle schiessle added this to the Nextcloud 13.0.2 milestone Apr 3, 2018

@schiessle schiessle changed the title from reset encryptionVersion to '1' if a file was stream copied to [stable13] reset encryptionVersion to '1' if a file was stream copied Apr 3, 2018

@codecov

This comment has been minimized.

codecov bot commented Apr 3, 2018

Codecov Report

Merging #9064 into stable13 will increase coverage by <.01%.
The diff coverage is 71.42%.

@@              Coverage Diff               @@
##             stable13    #9064      +/-   ##
==============================================
+ Coverage       51.33%   51.33%   +<.01%     
  Complexity      25029    25029              
==============================================
  Files            1609     1609              
  Lines           95305    95305              
  Branches         1376     1376              
==============================================
+ Hits            48924    48929       +5     
+ Misses          46381    46376       -5
Impacted Files Coverage Δ Complexity Δ
lib/private/Files/Storage/Wrapper/Encryption.php 68.24% <71.42%> (ø) 145 <6> (ø) ⬇️
apps/files_trashbin/lib/Expiration.php 90.32% <0%> (-1.62%) 29% <0%> (ø)
apps/files_trashbin/lib/Trashbin.php 72.53% <0%> (+0.24%) 136% <0%> (ø) ⬇️
core/js/js.js 66.29% <0%> (+0.55%) 0% <0%> (ø) ⬇️
@rullzer

rullzer approved these changes Apr 4, 2018

@rullzer rullzer merged commit e95184e into stable13 Apr 4, 2018

3 checks passed

codecov/patch 71.42% of diff hit (target 51.33%)
Details
codecov/project 51.33% (+<.01%) compared to a0818ab
Details
continuous-integration/drone/pr the build was successful
Details

@rullzer rullzer deleted the fix-copy-encrypted-files-stable13 branch Apr 4, 2018

@MorrisJobke MorrisJobke referenced this pull request Apr 18, 2018

Merged

13.0.2 RC 1 #9228

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