aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | GreenDominik Schürmann2015-01-13227-45/+164
| | | | | |
| * | | | | Start working on Material DesignDominik Schürmann2015-01-1318-180/+242
| | | | | |
| * | | | | Set minSdk to 14Dominik Schürmann2015-01-131-4/+1
| |/ / / /
| * | | | Merge pull request #1023 from adithyaphilip/developmentDominik Schürmann2015-01-121-7/+28
| |\ \ \ \ | | | | | | | | | | | | Issue #954 - fixed crash when file scheme is passed, broadened deletion scope
| | * | | | fixed crash when file scheme is passed, broadened deletion scopeAbraham Philip2015-01-091-7/+28
| | | | | |
* | | | | | No output stream for detached signatures, makes no sense to pipe it throughDominik Schürmann2015-01-081-2/+1
| | | | | |
* | | | | | Experimental API support for detached signatures (not tested)Dominik Schürmann2015-01-085-44/+118
|/ / / / /
* | | | | Test new iconDominik Schürmann2015-01-076-0/+0
| | | | |
* | | | | OpenPGP instead of PGPDominik Schürmann2015-01-071-5/+5
| | | | |
* | | | | PIn not pin passphraseDominik Schürmann2015-01-071-1/+1
| | | | |
* | | | | OpenPGP not PGPDominik Schürmann2015-01-072-2/+2
| | | | |
* | | | | 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-0631-256/+621
|\| | | | | | | | | | | | | | | | | | | development
| * | | | 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-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
| | | | | | | | | | | | | | | | | | | | closes #1012
| * | | | 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
| | | | | | | | | | | | | | | | | | | | cache
| * | | | fix small merge conflict oversightVincent Breitmoser2014-12-301-3/+0
| | | | |
| * | | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Vincent Breitmoser2014-12-3021-62/+124
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 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 ↵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-295-65/+173
|\| | | | | | | | | | | | | | | | | | | development
| * | | | introduce new ChangeUnlockParcel packet for extended passphrase changing ↵Vincent Breitmoser2014-12-295-65/+173
| | | | | | | | | | | | | | | | | | | | capabilities
* | | | | New work on PIN and lock pattern UIDominik Schürmann2014-12-2921-61/+126
|/ / / /
* | | | 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
| |_|/ |/| |
* | | 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 ↵Dominik Schürmann2014-12-041-3/+3
|\ \ \ | | | | | | | | | | | | development
| * | | 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 ↵Dominik Schürmann2014-11-021-18/+39
|\ | | | | | | development
| * 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 ↵Vincent Breitmoser2014-10-3031-116/+486
| |\ | | | | | | | | | development