aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * 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
| * \ Merge pull request #1011 from cketti/fix_k9_referencesDominik Schürmann2014-11-271-3/+3
| |\ \ | | | | | | | | Fix spelling of 'K-9 Mail' in FAQ
| | * | Fix spelling of 'K-9 Mail' in FAQcketti2014-11-261-3/+3
| |/ /
* | | Merge branch 'master' into developmentDominik Schürmann2014-12-0415-43/+42
|\ \ \ | |/ / |/| |
| * | Update to com.novoda:gradle-android-test-plugin:0.10.0, no snapshot version ↵Dominik Schürmann2014-12-042-36/+35
| | | | | | | | | | | | anymore, jacoco disabled for now
| * | Set version to 3.2beta1Dominik Schürmann2014-12-041-3/+3
| | |
| * | Update for Android Studio 1.0 RCDominik Schürmann2014-12-049-0/+0
| | |
| * | Update for Android Studio 1.0 RCDominik Schürmann2014-12-043-4/+4
| |/
* | more cleanupDominik Schürmann2014-11-211-14/+9
| |
* | NFC activity designDominik Schürmann2014-11-214-19/+14
| |
* | Minor code cleanupDominik Schürmann2014-11-217-12/+11
| |
* | Update keybase and minidns libsDominik Schürmann2014-11-042-0/+0
|/
* Version 3.1.2Dominik Schürmann2014-11-021-2/+2
|