Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | rewrite PgpSignEncrypt data flow | Vincent Breitmoser | 2015-02-01 | 3 | -14/+14 |
| | | | | | | | - introduce high-level SignEncryptOperation for uri to uri signing/encryption - use SignEncryptParcel for high-level operation parameters - use PgpSignEncryptInput plus streams for low-level operation parameters - get rid of all sign/encrypt logic in KeychainIntentService | ||||
* | Merge remote-tracking branch 'origin/development' into development | Vincent Breitmoser | 2015-01-31 | 4 | -8/+127 |
|\ | |||||
| * | Rename app setting classes for consistency | Dominik Schürmann | 2015-01-30 | 1 | -1/+0 |
| | | |||||
| * | Fix saving of allowed keys | Dominik Schürmann | 2015-01-30 | 1 | -11/+5 |
| | | |||||
| * | Merge branch 'ligi/fix/add_ability_to_compile_with_java8' of ↵ | Dominik Schürmann | 2015-01-30 | 1 | -1/+1 |
| |\ | | | | | | | | | | https://github.com/ligi/open-keychain into ligi-ligi/fix/add_ability_to_compile_with_java8 | ||||
| | * | Add explicit casting to be able to compile with java8 | ligi | 2015-01-29 | 1 | -1/+1 |
| | | | |||||
| * | | Saving of allowed keys | Dominik Schürmann | 2015-01-29 | 4 | -10/+70 |
| | | | |||||
| * | | Introduce allowed keys table per API client | Dominik Schürmann | 2015-01-29 | 3 | -4/+70 |
| |/ | |||||
* / | prevent recursive consolidate | Vincent Breitmoser | 2015-01-31 | 1 | -4/+8 |
|/ | |||||
* | lift language level to java 7, and some code cleanup | Vincent Breitmoser | 2015-01-25 | 2 | -20/+20 |
| | |||||
* | always show revoked user ids last! | Vincent Breitmoser | 2015-01-19 | 1 | -4/+4 |
| | |||||
* | actually import user attributes (though they are not shown anywhere yet) | Vincent Breitmoser | 2015-01-14 | 2 | -12/+121 |
| | |||||
* | make user_ids table typed, with attribute_data support | Vincent Breitmoser | 2015-01-14 | 4 | -62/+94 |
| | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java | ||||
* | minor stuff | Vincent Breitmoser | 2015-01-03 | 2 | -0/+2 |
| | |||||
* | throw exception if no data is found in getGenericData | Vincent Breitmoser | 2015-01-02 | 1 | -0/+3 |
| | |||||
* | add PIN as a SecretKeyType | Vincent Breitmoser | 2014-12-30 | 1 | -0/+5 |
| | |||||
* | Changelog 3.1.1 | Dominik Schürmann | 2014-10-30 | 1 | -1/+1 |
| | |||||
* | Always use INTEGER instead of BOOLEAN in database to avoid confusion | Dominik Schürmann | 2014-10-29 | 1 | -12/+10 |
| | |||||
* | fix consolidate if no secret key are present | Vincent Breitmoser | 2014-10-26 | 1 | -2/+6 |
| | |||||
* | prevent cancel dring consolidate, move logic into progressable | Vincent Breitmoser | 2014-10-26 | 1 | -0/+3 |
| | |||||
* | Retry canonicalization with pubkey self certs if first attempt failed | Vincent Breitmoser | 2014-10-26 | 1 | -4/+16 |
| | | | | Fixes #974 | ||||
* | change the way merging is logged | Vincent Breitmoser | 2014-10-25 | 1 | -0/+4 |
| | |||||
* | integrate download from keyserver into key import operation | Vincent Breitmoser | 2014-10-23 | 1 | -6/+6 |
| | |||||
* | fix logging in consolidate, part 2 | Vincent Breitmoser | 2014-10-11 | 1 | -11/+14 |
| | |||||
* | fix logging in consolidate, part 1 | Vincent Breitmoser | 2014-10-11 | 1 | -43/+47 |
| | |||||
* | move around package structure a bit | Vincent Breitmoser | 2014-10-10 | 1 | -5/+5 |
| | |||||
* | move operations into ops package, introduce BaseOperation class | Vincent Breitmoser | 2014-10-10 | 1 | -3/+3 |
| | |||||
* | Replace many PgpGeneralExceptions with PgpKeyNotFoundException | Dominik Schürmann | 2014-10-09 | 1 | -23/+23 |
| | |||||
* | Revert "Replace PgpGeneralException with NotFoundException where appropriate" | Dominik Schürmann | 2014-10-09 | 1 | -55/+91 |
| | | | | This reverts commit 49b4ff63122988dc1587844e6b4b2ee5d0855385. | ||||
* | Replace PgpGeneralException with NotFoundException where appropriate | Dominik Schürmann | 2014-10-09 | 1 | -91/+55 |
| | |||||
* | add support for second line in log view | Vincent Breitmoser | 2014-10-05 | 1 | -0/+6 |
| | |||||
* | preselect certify key | Dominik Schürmann | 2014-10-05 | 1 | -3/+3 |
| | |||||
* | implement preliminary MultiCertifyActivity (most heavy lifting is done) | Vincent Breitmoser | 2014-10-04 | 2 | -8/+23 |
| | |||||
* | forgot adjustments in ProviderHelper | Vincent Breitmoser | 2014-10-03 | 1 | -4/+5 |
| | |||||
* | get rid of two consolidate number preferences | Vincent Breitmoser | 2014-10-03 | 1 | -29/+31 |
| | |||||
* | use iterator interface exclusively in ParcelableFileCache | Vincent Breitmoser | 2014-10-03 | 1 | -2/+2 |
| | |||||
* | make getSignId a secret key operation, and respect unavailable keys | Vincent Breitmoser | 2014-10-02 | 1 | -45/+13 |
| | | | | This one should remedy #811, but waiting for a test | ||||
* | 3.0 beta3 | Dominik Schürmann | 2014-09-30 | 1 | -4/+7 |
| | |||||
* | log "unspecified" flags differently | Vincent Breitmoser | 2014-09-22 | 1 | -2/+10 |
| | |||||
* | nicer code in key import for flag log types | Vincent Breitmoser | 2014-09-22 | 1 | -75/+27 |
| | |||||
* | show authenticate flag in logs | Vincent Breitmoser | 2014-09-22 | 1 | -22/+64 |
| | |||||
* | key spinner fixes | Dominik Schürmann | 2014-09-21 | 1 | -6/+6 |
| | |||||
* | New key flags icons, subkey adapter redesign, support authanticate flag in ↵ | Dominik Schürmann | 2014-09-20 | 4 | -5/+28 |
| | | | | database | ||||
* | respect user id revocation signatures | Vincent Breitmoser | 2014-09-20 | 1 | -31/+60 |
| | | | | Closes #836 | ||||
* | forgot a LogLevel piece | Vincent Breitmoser | 2014-09-19 | 1 | -78/+77 |
| | |||||
* | package reordering: merge util and helper, there were no real difference; ↵ | Dominik Schürmann | 2014-09-17 | 1 | -18/+17 |
| | | | | created ui.util for everything related to formatting | ||||
* | Merge remote-tracking branch 'origin/master' | Vincent Breitmoser | 2014-09-15 | 1 | -2/+2 |
|\ | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java OpenKeychain/src/main/res/values-de/strings.xml | ||||
| * | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-09-15 | 1 | -3/+3 |
| |\ | |||||
| * | | New decrypt activity design (WIP), saner UTF8 decoding (replacing ↵ | Dominik Schürmann | 2014-09-15 | 1 | -2/+2 |
| | | | | | | | | | | | | non-decodable characters) | ||||
* | | | move LogLevel info into LogType enum | Vincent Breitmoser | 2014-09-15 | 1 | -8/+8 |
| |/ |/| |