fix getFileKey() call
Merge branch 'encryption_work_with_public_gallery' into encryption_enable_public_upload