Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'ui-createkey' | Daniel Hammann | 2014-03-23 | 1 | -10/+7 |
|\ | |||||
| * | Because of an unknown reason toast messages were commented out. | Daniel Hammann | 2014-03-21 | 1 | -10/+7 |
| | | |||||
* | | Merge branch 'save-key-workaround' of ↵ | Daniel Hammann | 2014-03-22 | 0 | -0/+0 |
|\ \ | | | | | | | | | | | | | | | | | | | https://github.com/honnel/openpgp-keychain into save-key-workaround Conflicts: OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java | ||||
| * | | The current implementation of saving new generated key doesn't save the key ↵ | Daniel Hammann | 2014-03-22 | 1 | -1/+8 |
| |/ | | | | | | | due to the public key of master key id can not be resolved by ProviderHelper.getPGPPublicKeyByKeyId (via URI/Cursor). Workaround uses local keys-arraylist for resoving the pubkey of master key id. | ||||
* / | The current implementation of saving new generated key doesn't save the key ↵ | Daniel Hammann | 2014-03-22 | 1 | -1/+9 |
|/ | | | | due to the public key of master key id can not be resolved by ProviderHelper.getPGPPublicKeyByKeyId (via URI/Cursor). Workaround uses local keys-arraylist for resoving the pubkey of master key id. | ||||
* | Fix nfc help button | Dominik Schürmann | 2014-03-21 | 1 | -1/+1 |
| | |||||
* | remove ach language, not supported by android | Dominik Schürmann | 2014-03-21 | 6 | -222/+0 |
| | |||||
* | Pull from transifex | Dominik Schürmann | 2014-03-21 | 24 | -0/+1311 |
| | |||||
* | Pull from transifex | Dominik Schürmann | 2014-03-21 | 21 | -92/+294 |
| | |||||
* | reformat merge | Dominik Schürmann | 2014-03-21 | 2 | -59/+64 |
| | |||||
* | Merge pull request #458 from hav3n/branch-delete-fix | Dominik Schürmann | 2014-03-21 | 8 | -140/+185 |
|\ | | | | | New Fix for #410 | ||||
| * | Fix GPL Headers | Nikhil Peter Raj | 2014-03-21 | 3 | -3/+3 |
| | | |||||
| * | Fix for #410 | Nikhil Peter Raj | 2014-03-21 | 8 | -142/+187 |
| | | |||||
* | | Merge pull request #461 from honnel/ui-tasks | Dominik Schürmann | 2014-03-21 | 2 | -3/+7 |
|\ \ | | | | | | | UI-Icon-Modifying #429 | ||||
| * | | UI-Icon-Modifying #429 added hint to text edit, different icons for share ↵ | Daniel Hammann | 2014-03-20 | 2 | -3/+7 |
| | | | | | | | | | | | | and clipboard button | ||||
* | | | Merge pull request #460 from honnel/uri-for-sign | Dominik Schürmann | 2014-03-21 | 1 | -2/+2 |
|\ \ \ | |/ / |/| | | URI is transported in intents data not extra. #459 | ||||
| * | | URI is transported in intents data not extra. | Daniel Hammann | 2014-03-20 | 1 | -2/+2 |
|/ / | |||||
* | | 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 |
|\ \ | |||||
| * \ | Merge pull request #456 from thi/adjust-fingerprint-layouts | Dominik Schürmann | 2014-03-20 | 3 | -23/+28 |
| |\ \ | | |/ | |/| | Adjust fingerprint layouts | ||||
| | * | 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 |
| | |||||
* | Merge pull request #455 from ↵ | Dominik Schürmann | 2014-03-20 | 2 | -5/+15 |
|\ | | | | | | | | | thi/454-fix-convert-key-id-to-hey-to-handle-short-key-ids 454 fix convert key id to hey to handle short key ids | ||||
| * | 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. | ||||
* | Merge pull request #453 from thi/452-unrevoked-keys-displayed-in-red | Dominik Schürmann | 2014-03-20 | 1 | -1/+11 |
|\ | | | | | Fix key list views in main key view | ||||
| * | 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. | ||||
* | Merge pull request #450 from uberspot/master | Dominik Schürmann | 2014-03-19 | 5 | -5/+9 |
|\ | | | | | add apg's fix for Key id display | ||||
| * | 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 | 9 | -15/+1 |
| | | | |||||
* | | | 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 |
| | | |||||
* | | Merge pull request #443 from uberspot/master | Dominik Schürmann | 2014-03-18 | 1 | -2/+2 |
|\ \ | | | | | | | CertifyKeyActivity sets error if no key is selected | ||||
| * | | CertifyKeyActivity sets error if no key is selected | uberspot | 2014-03-18 | 1 | -2/+2 |
|/ / |