fixed resync an encrypted library

We need put the download dialog into "merge with existing folder"
mode when resyncing an encrypted library.
Merge pull request #309 from haiwen/resync

fixed resync an encrypted library