Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #457 from hav3n/branch-fix-certify | Dominik Schürmann | 2014-03-20 | 2 | -72/+94 |
|\ | | | | | Fix for #451 | ||||
| * | Update fix for #451 | Nikhil Peter Raj | 2014-03-21 | 1 | -3/+2 |
| | | |||||
| * | Cleanup for #451 | Nikhil Peter Raj | 2014-03-20 | 2 | -5/+0 |
| | | |||||
| * | Fix for #451 | Nikhil Peter Raj | 2014-03-20 | 1 | -68/+96 |
| | | |||||
* | | Fix fingerprint handling | Dominik Schürmann | 2014-03-20 | 9 | -21/+19 |
| | | |||||
* | | Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychain | Dominik Schürmann | 2014-03-20 | 3 | -23/+28 |
|\ \ | |||||
| * | | Move fingerprint up below the algorithm in key view | Thialfihar | 2014-03-20 | 1 | -15/+15 |
| | | | | | | | | | | | | | | | This makes it consistent with the key list entry layout and it also makes more sense, as it belongs to key identification. | ||||
| * | | Move fingerprint to the right in key list entry | Thialfihar | 2014-03-20 | 1 | -8/+8 |
| | | | | | | | | | | | | Fits much better there and doesn't separate the user ID. | ||||
| * | | Group fingerprint again to make it visually consistent | Thialfihar | 2014-03-20 | 1 | -0/+5 |
| |/ | |||||
* / | verify downloaded key by comparing fingerprints | Dominik Schürmann | 2014-03-20 | 1 | -35/+45 |
|/ | |||||
* | put colorize method into key helper | Dominik Schürmann | 2014-03-20 | 5 | -80/+89 |
| | |||||
* | colorize fingerprint in import | Dominik Schürmann | 2014-03-20 | 1 | -1/+3 |
| | |||||
* | Use getter and setter | Dominik Schürmann | 2014-03-20 | 3 | -40/+111 |
| | |||||
* | Dont try to parse key/fingerprint result from keyserver query | Dominik Schürmann | 2014-03-20 | 7 | -88/+91 |
| | |||||
* | Add debug logging for hkp keyserver actions | Thialfihar | 2014-03-20 | 1 | -5/+10 |
| | |||||
* | Let convertKeyIdToHex handle short key IDs | Thialfihar | 2014-03-20 | 1 | -0/+5 |
| | | | | If a short key ID is given, then it should only be displayed as such. | ||||
* | Fix key list views in main key view | Thialfihar | 2014-03-20 | 1 | -1/+11 |
| | | | | | | | 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. | ||||
* | add apg's fix for Key id display | uberspot | 2014-03-19 | 5 | -5/+9 |
| | |||||
* | Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychain | Dominik Schürmann | 2014-03-19 | 4 | -17/+32 |
|\ | |||||
| * | Merge pull request #448 from AlexanderS/lint-fixes | Dominik Schürmann | 2014-03-19 | 1 | -1/+1 |
| |\ | | | | | | | use correct LongSparseArray for minimum api level | ||||
| | * | use correct LongSparseArray for minimum api level | Alexander Sulfrian | 2014-03-19 | 1 | -1/+1 |
| | | | |||||
| * | | Merge pull request #445 from gogowitczak/rwrsa-branch | Dominik Schürmann | 2014-03-19 | 3 | -16/+31 |
| |\ \ | | |/ | |/| | Disabled possibility to generate weak RSA keys (512 and 1024 bit) | ||||
| | * | Note about blocked possibility to generate weak (<1024) RSA key. | gogowitczak | 2014-03-18 | 2 | -0/+8 |
| | | | |||||
| | * | Blocked ok button for generating weak (<1024) RSA key. | gogowitczak | 2014-03-18 | 1 | -16/+23 |
| | | | |||||
* | | | Remove oxygen text from icon | Dominik Schürmann | 2014-03-19 | 6 | -0/+0 |
| | | | |||||
* | | | Cleanup | Dominik Schürmann | 2014-03-19 | 1 | -2/+1 |
|/ / | |||||
* | | Cleanup SelectSecretKeyActivity and also return Uri | Dominik Schürmann | 2014-03-18 | 2 | -75/+26 |
| | | |||||
* | | CertifyKeyActivity sets error if no key is selected | uberspot | 2014-03-18 | 1 | -2/+2 |
| | | |||||
* | | revert ca_necrypt patch | Dominik Schürmann | 2014-03-18 | 1 | -4/+0 |
| | | |||||
* | | fix emails not showing up in import keyserver search | uberspot | 2014-03-18 | 1 | -2/+1 |
|/ | |||||
* | Merge pull request #434 from honnel/revocation-status | Dominik Schürmann | 2014-03-18 | 5 | -6/+22 |
|\ | | | | | Show revocation status in ViewKeyKeysAdapter #375 | ||||
| * | Show revocation status in SelectPublicKeyFragment #375 | Daniel Hammann | 2014-03-18 | 5 | -6/+22 |
| | | | | | | | | Added revocation status in Key List View (graphical symbol and red coloring) | ||||
* | | Merge pull request #437 from sreeram-boyapati/encrypt | Dominik Schürmann | 2014-03-18 | 1 | -1/+4 |
|\ \ | | | | | | | Can_Encrypt Check added to hide Button | ||||
| * | | Code Style fix | Sreeram Boyapati | 2014-03-18 | 1 | -2/+2 |
| | | | |||||
| * | | Can_Encrypt Check added to hide Button | Sreeram Boyapati | 2014-03-18 | 1 | -1/+4 |
| | | | |||||
* | | | Merge pull request #435 from sreeram-boyapati/change_passphrase | Dominik Schürmann | 2014-03-18 | 1 | -3/+5 |
|\ \ \ | | | | | | | | | Button Text changes to Change Passphrase if Passphrase is set | ||||
| * | | | Button Text changes to Change Passphrase if Passphrase is set | Sreeram Boyapati | 2014-03-18 | 1 | -3/+5 |
| |/ / | |||||
* | | | add mr option in keyserver class before query (code simplification) | Dominik Schürmann | 2014-03-18 | 1 | -3/+3 |
| | | | |||||
* | | | Merge pull request #424 from gogowitczak/mro-branch | Dominik Schürmann | 2014-03-18 | 3 | -59/+117 |
|\ \ \ | | | | | | | | | Machine readable output for Keyserver query | ||||
| * | | | Fixed coding style. | gogowitczak | 2014-03-18 | 2 | -146/+153 |
| | | | | |||||
| * | | | removed TODO comment | gogowitczak | 2014-03-15 | 1 | -7/+0 |
| | | | | |||||
| * | | | Keyserver query now uses machine readable output for search and get. Added ↵ | gogowitczak | 2014-03-15 | 3 | -92/+150 |
| |/ / | | | | | | | | | | separate function for converting algorithm integer ID to String. | ||||
* | | | Merge pull request #431 from honnel/ui-modification | Dominik Schürmann | 2014-03-18 | 3 | -4/+5 |
|\ \ \ | | |/ | |/| | Ui modification | ||||
| * | | #429 4) | Daniel Hammann | 2014-03-17 | 3 | -4/+5 |
| |/ | | | | | | | | | In the clicking for a particular contact , two icon in the actionbar show the same hint ('Share'). Second icon hint can be 'Keyserver' or just only 'server' | ||||
* | | Merge pull request #430 from Valodim/certify | Dominik Schürmann | 2014-03-18 | 14 | -216/+688 |
|\ \ | | | | | | | Revamp certify dialogue | ||||
| * | | certify: preserve user id certificates when saving secret keys | Vincent Breitmoser | 2014-03-17 | 4 | -7/+73 |
| | | | |||||
| * | | certify: sign individual UIDs | Vincent Breitmoser | 2014-03-15 | 3 | -12/+31 |
| | | | | | | | | | | | | | | | | | | direct signing of pubkeys is out for now. not sure how this should be handled, but it's trivial to re-add so leaving this up for discussion for now. | ||||
| * | | certify: add some subscopes in PgpKeyOperation for readability | Vincent Breitmoser | 2014-03-15 | 1 | -112/+128 |
| | | | | | | | | | | | | note this commit introduces NO semantical changes whatsoever! | ||||
| * | | certify: revamp certifykeyactivity | Vincent Breitmoser | 2014-03-15 | 4 | -1/+186 |
| | | | | | | | | | | | | | | | | | | show info on the key to be certified, along with a list of (selectable) user ids. user ids are handed through to the signing service, but not yet handled. | ||||
| * | | certify: support PUBLIC_KEY_RING_BY_MASTER_KEY_ID_USER_ID uri (haha) | Vincent Breitmoser | 2014-03-15 | 1 | -0/+36 |
| | | |