aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java
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-0622-200/+547
|\ | | | | | | development
| * minor stuffVincent Breitmoser2015-01-033-3/+6
| |
| * make certify routines more robust (#1016)Vincent Breitmoser2015-01-033-0/+13
| |
| * add more descriptive string about non-mdc encrypted dataVincent Breitmoser2015-01-032-1/+2
| |
| * encapsulate high level edit key into new operation classVincent Breitmoser2015-01-037-144/+264
| |
| * deal with non-existent user ids during import (#994)Vincent Breitmoser2015-01-022-3/+6
| |
| * 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-023-22/+72
| |
| * small improvements regarding pin tests and loggingVincent Breitmoser2015-01-012-0/+7
| |
| * 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-302-33/+89
| |\ | | | | | | | | | | | | | | | | | | | | | 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-307-5/+36
| | |
| * | fix unit tests for ChangeUnlockParcelVincent Breitmoser2014-12-301-0/+3
| | |
| * | introduce handling of notation direct key signatures, and experimental pin ↵Vincent Breitmoser2014-12-304-15/+115
| | | | | | | | | | | | notation packet
* | | Passphrase wizard testsDominik Schürmann2015-01-065-22/+1609
| |/ |/|
* | 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-292-33/+91
|/
* 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-041-1/+1
|
* more cleanupDominik Schürmann2014-11-211-14/+9
|
* Minor code cleanupDominik Schürmann2014-11-214-11/+11
|
* 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-302-13/+11
|\ | | | | | | development
| * Changelog 3.1.1Dominik Schürmann2014-10-301-1/+1
| |
| * Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2014-10-304-102/+28
| |\ | | | | | | | | | development
| * | Always use INTEGER instead of BOOLEAN in database to avoid confusionDominik Schürmann2014-10-291-12/+10
| | |
* | | forgot a thing for secret key exportVincent Breitmoser2014-10-301-18/+24
| |/ |/|
* | Fix to preselect certification key if only one is availableVincent Breitmoser2014-10-291-1/+1
| | | | | | | | Closes #981
* | 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
|/
* Fix crash with NotFoundExceptionDominik Schürmann2014-10-261-3/+8
|
* Rename multi certify files to certifyDominik Schürmann2014-10-266-22/+17
|
* Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2014-10-267-5/+30
|\ | | | | | | development
| * Display error on certification attempt with yubikeyVincent Breitmoser2014-10-262-0/+6
| | | | | | | | Closes #978
| * disable cancel button instead of hiding it on cancel preventionVincent Breitmoser2014-10-261-1/+1
| |
| * fix consolidate if no secret key are presentVincent Breitmoser2014-10-261-2/+6
| |
| * prevent cancel dring consolidate, move logic into progressableVincent Breitmoser2014-10-264-2/+17
| |
* | Fix notify after certifyDominik Schürmann2014-10-262-26/+20
|/
* Use new safe slinger activity from share tabDominik Schürmann2014-10-261-76/+26
|
* Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2014-10-266-16/+56
|\ | | | | | | development
| * Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Vincent Breitmoser2014-10-261-10/+10
| |\ | | | | | | | | | development
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-10 10:29:51 +0000