aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main
Commit message (Expand)AuthorAgeFilesLines
* encapsulate high level edit key into new operation classVincent Breitmoser2015-01-038-144/+272
* deal with non-existent user ids during import (#994)Vincent Breitmoser2015-01-023-9/+13
* throw exception if no data is found in getGenericDataVincent Breitmoser2015-01-021-0/+3
* get rid of RuntimeException control flow in UncachedKeyRing.fromStreamVincent Breitmoser2015-01-022-26/+19
* fix and test for bad certificate version numbers (#1012)Vincent Breitmoser2015-01-021-7/+13
* extend canonicalize to strip local certificates on exportVincent Breitmoser2015-01-0212-71/+123
* small improvements regarding pin tests and loggingVincent Breitmoser2015-01-013-1/+10
* add empty notation data packet only if necessaryVincent Breitmoser2015-01-011-16/+35
* tests: add multi key encryption/decryption test, new way for fake passphrase ...Vincent Breitmoser2015-01-012-2/+2
* fix small merge conflict oversightVincent Breitmoser2014-12-301-3/+0
* Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Vincent Breitmoser2014-12-3021-62/+124
|\
| * Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2014-12-295-65/+173
| |\
| * | New work on PIN and lock pattern UIDominik Schürmann2014-12-2921-61/+126
* | | some small notation data fixesVincent Breitmoser2014-12-302-10/+10
* | | add PIN as a SecretKeyTypeVincent Breitmoser2014-12-308-5/+38
* | | fix unit tests for ChangeUnlockParcelVincent Breitmoser2014-12-301-0/+3
* | | introduce handling of notation direct key signatures, and experimental pin no...Vincent Breitmoser2014-12-3013-24/+126
| |/ |/|
* | introduce new ChangeUnlockParcel packet for extended passphrase changing capa...Vincent Breitmoser2014-12-295-65/+173
|/
* Allow for creation date to be in the future up to one day to account for dive...Dominik Schürmann2014-12-281-4/+9
* Fix crash on first time wizardDominik Schürmann2014-12-281-2/+2
* Update target and support libs to SDK 21, fixing compile issuesDominik Schürmann2014-12-043-3/+1
* Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2014-12-041-3/+3
|\
| * Fix spelling of 'K-9 Mail' in FAQcketti2014-11-261-3/+3
* | Merge branch 'master' into developmentDominik Schürmann2014-12-041-3/+3
|\ \ | |/ |/|
| * Set version to 3.2beta1Dominik Schürmann2014-12-041-3/+3
* | more cleanupDominik Schürmann2014-11-211-14/+9
* | NFC activity designDominik Schürmann2014-11-214-19/+14
* | Minor code cleanupDominik Schürmann2014-11-214-11/+11
|/
* Version 3.1.2Dominik Schürmann2014-11-021-2/+2
* Pull from transifexDominik Schürmann2014-11-0223-17/+182
* Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2014-11-021-18/+39
|\
| * export secret and public keys in separate armored blocksVincent Breitmoser2014-10-311-9/+24
| * Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Vincent Breitmoser2014-10-3031-116/+486
| |\
| * | forgot a thing for secret key exportVincent Breitmoser2014-10-301-18/+24
* | | ChangelogDominik Schürmann2014-11-021-0/+5
| |/ |/|
* | Version 3.1.1Dominik Schürmann2014-10-301-2/+2
* | Revert "Version 3.1.1"Dominik Schürmann2014-10-301-2/+2
* | Version 3.1.1Dominik Schürmann2014-10-301-2/+2
* | Pull from transifexDominik Schürmann2014-10-3027-101/+467
* | Changelog 3.1.1Dominik Schürmann2014-10-302-1/+7
* | Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2014-10-304-102/+28
|\|
| * Fix to preselect certification key if only one is availableVincent Breitmoser2014-10-291-1/+1
| * remove unused ExchangeKeySpinner classVincent Breitmoser2014-10-291-100/+0
| * Close stream on key export to avoid partial write (see #986)Vincent Breitmoser2014-10-291-0/+7
| * retrofit getBlob method of matrixcursor for android 2.3Vincent Breitmoser2014-10-271-1/+20
* | Always use INTEGER instead of BOOLEAN in database to avoid confusionDominik Schürmann2014-10-291-12/+10
|/
* Version 3.1Dominik Schürmann2014-10-261-2/+2
* Pull from transifexDominik Schürmann2014-10-2620-0/+220
* Pull from transifexDominik Schürmann2014-10-2656-878/+3333
* Changelog 3.1Dominik Schürmann2014-10-261-0/+12