fix emails not showing up in import keyserver search
Merge pull request #441 from uberspot/master

fix emails not showing up in import keyserver search
revert ca_necrypt patch
CertifyKeyActivity sets error if no key is selected
Merge pull request #443 from uberspot/master

CertifyKeyActivity sets error if no key is selected
Cleanup SelectSecretKeyActivity and also return Uri
Blocked ok button for generating weak (<1024) RSA key.
Note about blocked possibility to generate weak (<1024) RSA key.
Merge pull request #445 from gogowitczak/rwrsa-branch

Disabled possibility to generate weak RSA keys (512 and 1024 bit)
use correct LongSparseArray for minimum api level
Merge pull request #448 from AlexanderS/lint-fixes

use correct LongSparseArray for minimum api level
Cleanup
Remove oxygen text from icon
Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychain
add apg's fix for Key id display
Merge pull request #450 from uberspot/master

add apg's fix for Key id display
Fix key list views in main key view

Since the views are being reused, a revoked key might set the text
color of a view and when the view is being reused for a non-revoked
key it is still red. So grab the default text colour and set it
explicitly when the key is not revoked.
Merge pull request #453 from thi/452-unrevoked-keys-displayed-in-red

Fix key list views in main key view
Let convertKeyIdToHex handle short key IDs

If a short key ID is given, then it should only be displayed as such.
Add debug logging for hkp keyserver actions