aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain/src/main/java
Commit message (Collapse)AuthorAgeFilesLines
* reformat mergeDominik Schürmann2014-03-212-59/+64
|
* Merge pull request #458 from hav3n/branch-delete-fixDominik Schürmann2014-03-216-140/+145
|\ | | | | New Fix for #410
| * Fix GPL HeadersNikhil Peter Raj2014-03-213-3/+3
| |
| * Fix for #410Nikhil Peter Raj2014-03-216-142/+147
| |
* | URI is transported in intents data not extra.Daniel Hammann2014-03-201-2/+2
| |
* | Merge pull request #457 from hav3n/branch-fix-certifyDominik Schürmann2014-03-202-72/+94
|\ \ | | | | | | Fix for #451
| * | Update fix for #451Nikhil Peter Raj2014-03-211-3/+2
| | |
| * | Cleanup for #451Nikhil Peter Raj2014-03-202-5/+0
| | |
| * | Fix for #451Nikhil Peter Raj2014-03-201-68/+96
| |/
* | Fix fingerprint handlingDominik Schürmann2014-03-208-18/+15
| |
* | Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychainDominik Schürmann2014-03-201-0/+5
|\ \
| * | Group fingerprint again to make it visually consistentThialfihar2014-03-201-0/+5
| |/
* / verify downloaded key by comparing fingerprintsDominik Schürmann2014-03-201-35/+45
|/
* put colorize method into key helperDominik Schürmann2014-03-205-80/+89
|
* colorize fingerprint in importDominik Schürmann2014-03-201-1/+3
|
* Use getter and setterDominik Schürmann2014-03-203-40/+111
|
* Dont try to parse key/fingerprint result from keyserver queryDominik Schürmann2014-03-206-85/+87
|
* Add debug logging for hkp keyserver actionsThialfihar2014-03-201-5/+10
|
* Let convertKeyIdToHex handle short key IDsThialfihar2014-03-201-0/+5
| | | | If a short key ID is given, then it should only be displayed as such.
* Fix key list views in main key viewThialfihar2014-03-201-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 displayuberspot2014-03-195-5/+9
|
* Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychainDominik Schürmann2014-03-192-17/+24
|\
| * Merge pull request #448 from AlexanderS/lint-fixesDominik Schürmann2014-03-191-1/+1
| |\ | | | | | | use correct LongSparseArray for minimum api level
| | * use correct LongSparseArray for minimum api levelAlexander Sulfrian2014-03-191-1/+1
| | |
| * | Merge pull request #445 from gogowitczak/rwrsa-branchDominik Schürmann2014-03-191-16/+23
| |\ \ | | |/ | |/| Disabled possibility to generate weak RSA keys (512 and 1024 bit)
| | * Blocked ok button for generating weak (<1024) RSA key.gogowitczak2014-03-181-16/+23
| | |
* | | CleanupDominik Schürmann2014-03-191-2/+1
|/ /
* | Cleanup SelectSecretKeyActivity and also return UriDominik Schürmann2014-03-182-75/+26
| |
* | CertifyKeyActivity sets error if no key is selecteduberspot2014-03-181-2/+2
| |
* | revert ca_necrypt patchDominik Schürmann2014-03-181-4/+0
| |
* | fix emails not showing up in import keyserver searchuberspot2014-03-181-2/+1
|/
* Merge pull request #434 from honnel/revocation-statusDominik Schürmann2014-03-182-6/+18
|\ | | | | Show revocation status in ViewKeyKeysAdapter #375
| * Show revocation status in SelectPublicKeyFragment #375Daniel Hammann2014-03-182-6/+18
| | | | | | | | Added revocation status in Key List View (graphical symbol and red coloring)
* | Merge pull request #437 from sreeram-boyapati/encryptDominik Schürmann2014-03-181-1/+4
|\ \ | | | | | | Can_Encrypt Check added to hide Button
| * | Code Style fixSreeram Boyapati2014-03-181-2/+2
| | |
| * | Can_Encrypt Check added to hide ButtonSreeram Boyapati2014-03-181-1/+4
| |/
* | Merge pull request #435 from sreeram-boyapati/change_passphraseDominik Schürmann2014-03-181-3/+5
|\ \ | | | | | | Button Text changes to Change Passphrase if Passphrase is set
| * | Button Text changes to Change Passphrase if Passphrase is setSreeram Boyapati2014-03-181-3/+5
| |/
* | add mr option in keyserver class before query (code simplification)Dominik Schürmann2014-03-181-3/+3
| |
* | Merge pull request #424 from gogowitczak/mro-branchDominik Schürmann2014-03-183-59/+117
|\ \ | | | | | | Machine readable output for Keyserver query
| * | Fixed coding style.gogowitczak2014-03-182-146/+153
| | |
| * | removed TODO commentgogowitczak2014-03-151-7/+0
| | |
| * | Keyserver query now uses machine readable output for search and get. Added ↵gogowitczak2014-03-153-92/+150
| |/ | | | | | | separate function for converting algorithm integer ID to String.
* | Merge pull request #430 from Valodim/certifyDominik Schürmann2014-03-189-208/+542
|\ \ | | | | | | Revamp certify dialogue
| * | certify: preserve user id certificates when saving secret keysVincent Breitmoser2014-03-173-7/+72
| | |
| * | certify: sign individual UIDsVincent Breitmoser2014-03-153-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 readabilityVincent Breitmoser2014-03-151-112/+128
| | | | | | | | | | | | note this commit introduces NO semantical changes whatsoever!
| * | certify: revamp certifykeyactivityVincent Breitmoser2014-03-152-1/+98
| | | | | | | | | | | | | | | | | | 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 Breitmoser2014-03-151-0/+36
| | |
| * | certify: viewkeyuseridsadapter cosmetics and checkbox capabilityVincent Breitmoser2014-03-152-12/+82
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-03 07:29:37 +0000