aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider
Commit message (Expand)AuthorAgeFilesLines
* add linked id certs uri to KeychainProviderVincent Breitmoser2015-03-092-7/+15
* use loader in LinkedIdViewFragmentVincent Breitmoser2015-03-092-1/+16
* Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-082-3/+2
|\
| * Remove advanced preferences, move compression as menu item in encrypt activit...Dominik Schürmann2015-03-051-2/+1
| * Debug optionsDominik Schürmann2015-03-051-1/+1
* | work on LinkedIdViewFragmentVincent Breitmoser2015-03-051-6/+0
* | do a TON of UI workVincent Breitmoser2015-03-053-20/+30
* | work more on separation of linked identities and resources, initial ui workVincent Breitmoser2015-03-041-0/+5
* | NON-WORKING Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-024-49/+185
|\|
| * save revocation instead of self-cert for revoked uidsVincent Breitmoser2015-02-261-12/+19
| * rewrite PgpSignEncrypt data flowVincent Breitmoser2015-02-013-14/+14
| * Merge remote-tracking branch 'origin/development' into developmentVincent Breitmoser2015-01-314-8/+127
| |\
| | * Rename app setting classes for consistencyDominik Schürmann2015-01-301-1/+0
| | * Fix saving of allowed keysDominik Schürmann2015-01-301-11/+5
| | * Merge branch 'ligi/fix/add_ability_to_compile_with_java8' of https://github.c...Dominik Schürmann2015-01-301-1/+1
| | |\
| | | * Add explicit casting to be able to compile with java8ligi2015-01-291-1/+1
| | * | Saving of allowed keysDominik Schürmann2015-01-294-10/+70
| | * | Introduce allowed keys table per API clientDominik Schürmann2015-01-293-4/+70
| | |/
| * / prevent recursive consolidateVincent Breitmoser2015-01-311-4/+8
| |/
| * lift language level to java 7, and some code cleanupVincent Breitmoser2015-01-252-20/+20
| * always show revoked user ids last!Vincent Breitmoser2015-01-191-4/+4
| * actually import user attributes (though they are not shown anywhere yet)Vincent Breitmoser2015-01-142-12/+121
| * make user_ids table typed, with attribute_data supportVincent Breitmoser2015-01-144-62/+94
* | actually import user attributes (though they are not shown anywhere yet)Vincent Breitmoser2015-01-142-12/+121
* | make user_ids table typed, with attribute_data supportVincent Breitmoser2015-01-134-62/+94
|/
* minor stuffVincent Breitmoser2015-01-032-0/+2
* throw exception if no data is found in getGenericDataVincent Breitmoser2015-01-021-0/+3
* add PIN as a SecretKeyTypeVincent Breitmoser2014-12-301-0/+5
* Changelog 3.1.1Dominik Schürmann2014-10-301-1/+1
* Always use INTEGER instead of BOOLEAN in database to avoid confusionDominik Schürmann2014-10-291-12/+10
* fix consolidate if no secret key are presentVincent Breitmoser2014-10-261-2/+6
* prevent cancel dring consolidate, move logic into progressableVincent Breitmoser2014-10-261-0/+3
* Retry canonicalization with pubkey self certs if first attempt failedVincent Breitmoser2014-10-261-4/+16
* change the way merging is loggedVincent Breitmoser2014-10-251-0/+4
* integrate download from keyserver into key import operationVincent Breitmoser2014-10-231-6/+6
* fix logging in consolidate, part 2Vincent Breitmoser2014-10-111-11/+14
* fix logging in consolidate, part 1Vincent Breitmoser2014-10-111-43/+47
* move around package structure a bitVincent Breitmoser2014-10-101-5/+5
* move operations into ops package, introduce BaseOperation classVincent Breitmoser2014-10-101-3/+3
* Replace many PgpGeneralExceptions with PgpKeyNotFoundExceptionDominik Schürmann2014-10-091-23/+23
* Revert "Replace PgpGeneralException with NotFoundException where appropriate"Dominik Schürmann2014-10-091-55/+91
* Replace PgpGeneralException with NotFoundException where appropriateDominik Schürmann2014-10-091-91/+55
* add support for second line in log viewVincent Breitmoser2014-10-051-0/+6
* preselect certify keyDominik Schürmann2014-10-051-3/+3
* implement preliminary MultiCertifyActivity (most heavy lifting is done)Vincent Breitmoser2014-10-042-8/+23
* forgot adjustments in ProviderHelperVincent Breitmoser2014-10-031-4/+5
* get rid of two consolidate number preferencesVincent Breitmoser2014-10-031-29/+31
* use iterator interface exclusively in ParcelableFileCacheVincent Breitmoser2014-10-031-2/+2
* make getSignId a secret key operation, and respect unavailable keysVincent Breitmoser2014-10-021-45/+13
* 3.0 beta3Dominik Schürmann2014-09-301-4/+7