Snowden's advice – encrypt everything

It's the right advice. If routine communication and storage were encrypted, the value of dragnet surveillance would be degraded, perhaps to the point of losing all practical value.