aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider
Commit message (Expand)AuthorAgeFilesLines
* certs: display uid status in uid listVincent Breitmoser2014-04-062-0/+5
* certs: properly handle primary flag and revocation of uidsVincent Breitmoser2014-04-064-38/+82
* certs: various improvementsVincent Breitmoser2014-04-054-25/+48
* certs: more fixes, almost working nowVincent Breitmoser2014-04-052-12/+25
* Merge remote-tracking branch 'origin/master' into certsVincent Breitmoser2014-04-056-1595/+910
|\
| * db-overhaul: workaround api level 11Vincent Breitmoser2014-04-041-15/+23
| * db-overhaul: different hack for type info (api level problem inside)Vincent Breitmoser2014-04-041-18/+6
| * db-overhaul: fix loading indicators in KeyListActivity and ViewKeyActivityVincent Breitmoser2014-04-042-5/+9
| * db-overhaul: reintroduce by-mail and by-subkey queriesVincent Breitmoser2014-04-042-45/+91
| * db-overhaul: minor stuff, mostly ProviderHelperVincent Breitmoser2014-04-041-63/+56
| * db-overhaul: more work on new providerVincent Breitmoser2014-04-033-186/+148
| * more work on streamlining uris, and stripping ProviderHelperVincent Breitmoser2014-04-032-79/+60
| * ditch useless PgpKeyHelper.getMasterKey methodsVincent Breitmoser2014-04-031-58/+10
| * Merge remote-tracking branch 'origin/master' into db-overhaulVincent Breitmoser2014-04-032-3/+24
| |\
| | * Replace wildcard imports with explicit importsThialfihar2014-04-021-1/+5
| | * Rearrange too long linesThialfihar2014-04-022-10/+12
| | * Trivial spacing changes to conform to style guideThialfihar2014-04-021-2/+3
| | * Adjust import orderThialfihar2014-04-021-1/+1
| | * Only allow private keys associated to accounts of an appDominik Schürmann2014-04-011-2/+18
| * | Break a lot of stuff. Also, database redesign.Vincent Breitmoser2014-04-035-1182/+473
| |/
| * revert mistakeAshley Hughes2014-03-291-1/+1
| * merge masterAshley Hughes2014-03-297-173/+470
| |\
| | * Fix provider for API_ACCOUNTSDominik Schürmann2014-03-263-10/+10
| | * Fix constraints and insertDominik Schürmann2014-03-263-18/+25
| | * Temporary fix for inserting by content providerDominik Schürmann2014-03-251-4/+4
| | * Return account creation intent if account does not exists in dbDominik Schürmann2014-03-252-21/+7
| | * Fix update and insert for new api content providerDominik Schürmann2014-03-251-18/+14
| | * More experimental work on api accountsDominik Schürmann2014-03-252-55/+17
| | * Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychainDominik Schürmann2014-03-251-1/+1
| | |\
| | | * Rename old mentionings of APG-named thingsThialfihar2014-03-231-1/+1
| | * | More experimental work on API accountsDominik Schürmann2014-03-254-144/+127
| | * | Extend provider for new api tablesDominik Schürmann2014-03-234-41/+222
| | * | Move classes for OpenPGP API into remote packageDominik Schürmann2014-03-231-5/+5
| | * | New db table for api accountsDominik Schürmann2014-03-232-6/+25
| | |/
| | * raname to mKeychainDatabaseDominik Schürmann2014-03-211-6/+6
| | * Fix GPL HeadersNikhil Peter Raj2014-03-211-1/+1
| | * Fix for #410Nikhil Peter Raj2014-03-211-7/+16
| * | keep up with masterAshley Hughes2014-03-071-1/+1
| |\ \
| * \ \ master mergeAshley Hughes2014-02-223-1/+34
| |\ \ \
| * | | | fix certify keys without sign flagAshley Hughes2014-02-041-7/+5
* | | | | certs: more filters, better initial uid selection, code cosmeticsVincent Breitmoser2014-03-172-20/+31
* | | | | certs: provider cleanup and bugfixingVincent Breitmoser2014-03-152-41/+43
* | | | | Merge branch 'certify' into certsVincent Breitmoser2014-03-151-0/+36
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | certify: support PUBLIC_KEY_RING_BY_MASTER_KEY_ID_USER_ID uri (haha)Vincent Breitmoser2014-03-151-0/+36
* | | | | Merge branch 'master' into certsVincent Breitmoser2014-03-157-170/+136
|\| | | |
| * | | | final code style changesuberspot2014-03-137-86/+101
| * | | | final ui code style changesuberspot2014-03-131-1/+1
| * | | | Cleanup and simplificationDominik Schürmann2014-03-131-1/+1
| * | | | drop unified uri in favor of generic /key_ringsVincent Breitmoser2014-03-132-15/+10
| * | | | remove special treatment for unified list queryVincent Breitmoser2014-03-131-39/+14