WhatsApp should give an option to upload my public-key. I want to generate public key on my computer using some other free software. For non-tech users, they may keep generating keys however they want. But there should be an option.

That is the only way to guarantee that it really supports privacy.