Merge pull request #7912 from owncloud/enc_move_checks_to_pre_hook

move check if a file should be encrypted to the pre hook

diff --cc apps/files_encryption/lib/proxy.php
Simple merge