Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | More experimental work on API accounts | Dominik Schürmann | 2014-03-25 | 16 | -391/+743 |
| | |||||
* | Extend provider for new api tables | Dominik Schürmann | 2014-03-23 | 4 | -41/+222 |
| | |||||
* | Move classes for OpenPGP API into remote package | Dominik Schürmann | 2014-03-23 | 11 | -15/+20 |
| | |||||
* | New db table for api accounts | Dominik Schürmann | 2014-03-23 | 2 | -6/+25 |
| | |||||
* | Merge pull request #469 from honnel/save-key-workaround | Dominik Schürmann | 2014-03-23 | 1 | -1/+9 |
|\ | | | | | Can't save key after key generation | ||||
| * | 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. | ||||
* | | Use new FoldableLinearLayout in API settings | Dominik Schürmann | 2014-03-23 | 1 | -41/+5 |
| | | |||||
* | | Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychain | Dominik Schürmann | 2014-03-22 | 3 | -57/+210 |
|\ \ | |||||
| * \ | Merge pull request #467 from uberspot/master | Dominik Schürmann | 2014-03-22 | 2 | -47/+203 |
| |\ \ | | | | | | | | | Make foldable settings in EncryptActivity into a separate widget | ||||
| | * | | Make foldable settings in EncryptActivity a separate widget | uberspot | 2014-03-21 | 2 | -47/+203 |
| | |/ | |||||
| * / | Because of an unknown reason toast messages were commented out. | Daniel Hammann | 2014-03-21 | 1 | -10/+7 |
| |/ | |||||
* / | raname to mKeychainDatabase | Dominik Schürmann | 2014-03-21 | 1 | -6/+6 |
|/ | |||||
* | Fix nfc help button | Dominik Schürmann | 2014-03-21 | 1 | -1/+1 |
| | |||||
* | 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 | 6 | -140/+145 |
|\ | | | | | 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 | 6 | -142/+147 |
| | | |||||
* | | 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 | 8 | -18/+15 |
| | | |||||
* | | Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychain | Dominik Schürmann | 2014-03-20 | 1 | -0/+5 |
|\ \ | |||||
| * | | 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 | 6 | -85/+87 |
| | |||||
* | 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 | 2 | -17/+24 |
|\ | |||||
| * | 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 | 1 | -16/+23 |
| |\ \ | | |/ | |/| | Disabled possibility to generate weak RSA keys (512 and 1024 bit) | ||||
| | * | Blocked ok button for generating weak (<1024) RSA key. | gogowitczak | 2014-03-18 | 1 | -16/+23 |
| | | | |||||
* | | | 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 | 2 | -6/+18 |
|\ | | | | | Show revocation status in ViewKeyKeysAdapter #375 | ||||
| * | Show revocation status in SelectPublicKeyFragment #375 | Daniel Hammann | 2014-03-18 | 2 | -6/+18 |
| | | | | | | | | 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 |