Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Accounts list prettified | Dominik Schürmann | 2014-03-26 | 2 | -1/+27 |
| | |||||
* | Merge pull request #483 from uberspot/master | Dominik Schürmann | 2014-03-26 | 1 | -4/+0 |
|\ | | | | | fix capability icons and remove red text for revoked keys | ||||
| * | fix capability icons and remove red text for revoked keys | uberspot | 2014-03-26 | 1 | -4/+0 |
| | | |||||
* | | Make PendingIntents with FLAG_CANCEL_CURRENT and FLAG_ONE_SHOT | Dominik Schürmann | 2014-03-26 | 4 | -51/+50 |
|/ | |||||
* | Forgot resource | Dominik Schürmann | 2014-03-26 | 1 | -12/+0 |
| | |||||
* | Merge pull request #482 from uberspot/master | Dominik Schürmann | 2014-03-26 | 2 | -10/+27 |
|\ | | | | | Fix style for expired/revoked keys | ||||
| * | add strike through text for revoked or expired keys and disable views for ↵ | uberspot | 2014-03-26 | 2 | -10/+27 |
| | | | | | | | | revoked keys as well | ||||
* | | Part 2 of basic user interface for api accounts | Dominik Schürmann | 2014-03-26 | 2 | -55/+41 |
|/ | |||||
* | Accounts API, user interface | Dominik Schürmann | 2014-03-26 | 4 | -91/+194 |
| | |||||
* | Simplify can encrypt check | Dominik Schürmann | 2014-03-26 | 1 | -19/+24 |
| | |||||
* | Merge pull request #471 from sreeram-boyapati/encryption | Dominik Schürmann | 2014-03-26 | 1 | -1/+11 |
|\ | | | | | Added can_encrypt check | ||||
| * | Added can_encrypt check | Sreeram Boyapati | 2014-03-23 | 1 | -1/+11 |
| | | |||||
* | | Merge pull request #479 from AlexanderS/subkey-expiry | Dominik Schürmann | 2014-03-26 | 1 | -0/+22 |
|\ \ | | | | | | | Display expiry of subkeys in single key view. | ||||
| * | | Display expiry of subkeys in single key view. | Alexander Sulfrian | 2014-03-25 | 1 | -0/+22 |
| | | | |||||
* | | | Fix constraints and insert | Dominik Schürmann | 2014-03-26 | 4 | -19/+26 |
| | | | |||||
* | | | Temporary fix for inserting by content provider | Dominik Schürmann | 2014-03-25 | 1 | -4/+4 |
| | | | |||||
* | | | Return account creation intent if account does not exists in db | Dominik Schürmann | 2014-03-25 | 5 | -46/+60 |
| | | | |||||
* | | | Fix update and insert for new api content provider | Dominik Schürmann | 2014-03-25 | 1 | -18/+14 |
| | | | |||||
* | | | More experimental work on api accounts | Dominik Schürmann | 2014-03-25 | 5 | -81/+97 |
| | | | |||||
* | | | Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychain | Dominik Schürmann | 2014-03-25 | 11 | -33/+26 |
|\| | | |||||
| * | | Rename old mentionings of APG-named things | Thialfihar | 2014-03-23 | 11 | -23/+23 |
| | | | | | | | | | | | | | | | Mostly in comments, most importantly: STORE_PATH now ends in /KeychainBlobs instead of /ApgBlobs | ||||
| * | | Fix file decryption interface | Thialfihar | 2014-03-23 | 1 | -10/+3 |
| | | | | | | | | | | | | | | | | | | Actually use mAssumeSymmetricEncryption and set it to false as default. Don't close the file input stream, so we can actually look for PGP encrypted data in the next step. | ||||
* | | | 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 |
| | |