aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | Clearup after lockpattern experimentsDominik Schürmann2015-01-062-31/+26
| | | | | |
* | | | | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2015-01-0641-339/+1418
|\| | | | | | | | | | | | | | | | | | | | | | | development
| * | | | | tests: add a couple of CertifyOperation test casesVincent Breitmoser2015-01-031-0/+238
| | | | | |
| * | | | | minor stuffVincent Breitmoser2015-01-033-3/+6
| | | | | |
| * | | | | make certify routines more robust (#1016)Vincent Breitmoser2015-01-034-0/+14
| | | | | |
| * | | | | add more descriptive string about non-mdc encrypted dataVincent Breitmoser2015-01-033-1/+3
| | | | | |
| * | | | | encapsulate high level edit key into new operation classVincent Breitmoser2015-01-0314-167/+294
| | | | | |
| * | | | | deal with non-existent user ids during import (#994)Vincent Breitmoser2015-01-023-9/+13
| | | | | |
| * | | | | tests: add multiple keys with signature test caseVincent Breitmoser2015-01-021-0/+75
| | | | | |
| * | | | | 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-024-33/+24
| | | | | |
| * | | | | fix and test for bad certificate version numbers (#1012)Vincent Breitmoser2015-01-024-7/+47
| | | | | | | | | | | | | | | | | | | | | | | | closes #1012
| * | | | | tests: for export, check that a token local cert actually exists before exportVincent Breitmoser2015-01-021-10/+22
| | | | | |
| * | | | | tests: add test for key exportVincent Breitmoser2015-01-021-0/+211
| | | | | |
| * | | | | extend canonicalize to strip local certificates on exportVincent Breitmoser2015-01-0212-71/+123
| | | | | |
| * | | | | small improvements regarding pin tests and loggingVincent Breitmoser2015-01-014-6/+33
| | | | | |
| * | | | | add empty notation data packet only if necessaryVincent Breitmoser2015-01-011-16/+35
| | | | | |
| * | | | | tests: be less verbose about inserting keyrings for encrypt/decryptVincent Breitmoser2015-01-011-2/+15
| | | | | |
| * | | | | tests: add multi key encryption/decryption test, new way for fake passphrase ↵Vincent Breitmoser2015-01-013-45/+125
| | | | | | | | | | | | | | | | | | | | | | | | cache
| * | | | | fix unit tests (canonicalize after create)Vincent Breitmoser2015-01-012-0/+5
| | | | | |
| * | | | | fix small merge conflict oversightVincent Breitmoser2014-12-301-3/+0
| | | | | |
| * | | | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Vincent Breitmoser2014-12-3025-62/+129
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | development Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedSecretKey.java OpenKeychain/src/main/res/values/strings.xml
| * | | | | | some small notation data fixesVincent Breitmoser2014-12-302-10/+10
| | | | | | |
| * | | | | | add test case for PIN unlockVincent Breitmoser2014-12-301-2/+28
| | | | | | |
| * | | | | | add PIN as a SecretKeyTypeVincent Breitmoser2014-12-308-5/+38
| | | | | | |
| * | | | | | fix unit tests for ChangeUnlockParcelVincent Breitmoser2014-12-306-16/+24
| | | | | | |
| * | | | | | Revert "Remove restriction for max parallel forks for gradle tests"Vincent Breitmoser2014-12-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit ce34192dbbff388c0ccd384fba15cd95075a14ca. Conflicts: build.gradle
| * | | | | | introduce handling of notation direct key signatures, and experimental pin ↵Vincent Breitmoser2014-12-3013-24/+126
| | | | | | | | | | | | | | | | | | | | | | | | | | | | notation packet
* | | | | | | Passphrase wizard testsDominik Schürmann2015-01-0613-22/+1891
| |/ / / / / |/| | | | |
* | | | | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2014-12-2910-81/+189
|\| | | | | | | | | | | | | | | | | | | | | | | development
| * | | | | introduce new ChangeUnlockParcel packet for extended passphrase changing ↵Vincent Breitmoser2014-12-2910-81/+189
| | | | | | | | | | | | | | | | | | | | | | | | capabilities
* | | | | | New work on PIN and lock pattern UIDominik Schürmann2014-12-2921-61/+126
| | | | | |
* | | | | | Add android-lockpattern libraryDominik Schürmann2014-12-294-0/+5
|/ / / / /
* | | | | Cleanup UncachedKeyringTestDominik Schürmann2014-12-292-7/+7
| | | | |
* | | | | Remove restriction for max parallel forks for gradle testsDominik Schürmann2014-12-281-6/+0
| | | | |
* | | | | Remove necessity to prepare tests via shell scriptDominik Schürmann2014-12-283-35/+3
| | | | |
* | | | | Fix test for future creation timestamps to account for loosen timestamp checkDominik Schürmann2014-12-282-5/+7
| | | | |
* | | | | Allow for creation date to be in the future up to one day to account for ↵Dominik Schürmann2014-12-281-4/+9
| | | | | | | | | | | | | | | | | | | | diverging clocks on different systems for fresh keys
* | | | | Fix crash on first time wizardDominik Schürmann2014-12-281-2/+2
| | | | |
* | | | | New icon for Lollipop releaseDominik Schürmann2014-12-1430-0/+1989
| | | | |
* | | | | Update plugin to 1.0Dominik Schürmann2014-12-123-1/+1
| |_|_|/ |/| | |
* | | | Merge branch 'master' into developmentDominik Schürmann2014-12-053-0/+0
|\ \ \ \
| * | | | Add passhrase attacking screens for wikiDominik Schürmann2014-12-053-0/+0
| |/ / /
* | | | Fix travisDominik Schürmann2014-12-051-1/+1
| | | |
* | | | Fix travisDominik Schürmann2014-12-051-1/+1
| | | |
* | | | Fix travisDominik Schürmann2014-12-041-3/+3
| | | |
* | | | Update target and support libs to SDK 21, fixing compile issuesDominik Schürmann2014-12-044-8/+6
| | | |
* | | | Switch from mavenCentral to jcenterDominik Schürmann2014-12-041-2/+2
| | | |
* | | | Fix jacocoDominik Schürmann2014-12-041-24/+23
| | | |
* | | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2014-12-041-3/+3
|\ \ \ \ | | | | | | | | | | | | | | | development