Commit Graph

3421 Commits

Author SHA1 Message Date
Dominik Schürmann
01c3e7bbf9 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2015-01-12 15:38:25 +01:00
Dominik Schürmann
374de7ed96 Update safeslinger lib 2015-01-12 15:38:16 +01:00
Dominik Schürmann
3e74405f3c Merge pull request #1023 from adithyaphilip/development
Issue #954 - fixed crash when file scheme is passed, broadened deletion scope
2015-01-12 11:03:42 +01:00
Abraham Philip
16f924eef3 fixed crash when file scheme is passed, broadened deletion scope 2015-01-09 05:07:50 +05:30
Dominik Schürmann
6570483fab Test new icon 2015-01-07 14:10:12 +01:00
Dominik Schürmann
816b1bb8c8 OpenPGP instead of PGP 2015-01-07 13:45:28 +01:00
Dominik Schürmann
443fbaff17 PIn not pin passphrase 2015-01-07 13:29:56 +01:00
Dominik Schürmann
c4ee00bd39 OpenPGP not PGP 2015-01-07 00:01:57 +01:00
Dominik Schürmann
6ec85b0550 Clearup after lockpattern experiments 2015-01-06 19:29:51 +01:00
Dominik Schürmann
af762a65a0 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2015-01-06 14:52:12 +01:00
Dominik Schürmann
e34ad18ed2 Passphrase wizard tests 2015-01-06 14:52:07 +01:00
Vincent Breitmoser
0c3f9ae0a6 tests: add a couple of CertifyOperation test cases 2015-01-03 23:02:11 +01:00
Vincent Breitmoser
07251f35ae minor stuff 2015-01-03 23:01:57 +01:00
Vincent Breitmoser
47ace7cea3 make certify routines more robust (#1016) 2015-01-03 22:14:12 +01:00
Vincent Breitmoser
2192a6badd add more descriptive string about non-mdc encrypted data 2015-01-03 21:07:33 +01:00
Vincent Breitmoser
320f7d35ef encapsulate high level edit key into new operation class 2015-01-03 13:55:15 +01:00
Vincent Breitmoser
5057ea1744 deal with non-existent user ids during import (#994) 2015-01-02 14:28:03 +01:00
Vincent Breitmoser
9cf800bcd8 tests: add multiple keys with signature test case 2015-01-02 02:50:14 +01:00
Vincent Breitmoser
920fbdfb42 throw exception if no data is found in getGenericData 2015-01-02 02:24:11 +01:00
Vincent Breitmoser
56f2a3137b get rid of RuntimeException control flow in UncachedKeyRing.fromStream 2015-01-02 02:05:12 +01:00
Vincent Breitmoser
b52fb90380 fix and test for bad certificate version numbers (#1012)
closes #1012
2015-01-02 01:58:16 +01:00
Vincent Breitmoser
704fc2dd45 tests: for export, check that a token local cert actually exists before export 2015-01-02 01:11:43 +01:00
Vincent Breitmoser
57e3266fa5 tests: add test for key export 2015-01-02 00:15:08 +01:00
Vincent Breitmoser
7223abcf0c extend canonicalize to strip local certificates on export 2015-01-02 00:07:05 +01:00
Vincent Breitmoser
1c1ae769ef small improvements regarding pin tests and logging 2015-01-01 21:13:07 +01:00
Vincent Breitmoser
2d38079574 add empty notation data packet only if necessary 2015-01-01 20:46:39 +01:00
Vincent Breitmoser
9f7b2472cf tests: be less verbose about inserting keyrings for encrypt/decrypt 2015-01-01 20:21:52 +01:00
Vincent Breitmoser
5e9d8ca8c6 tests: add multi key encryption/decryption test, new way for fake passphrase cache 2015-01-01 20:21:32 +01:00
Vincent Breitmoser
bf537c4a81 fix unit tests (canonicalize after create) 2015-01-01 18:24:09 +01:00
Vincent Breitmoser
71c53f13ec fix small merge conflict oversight 2014-12-30 16:24:20 +01:00
Vincent Breitmoser
9e663237b6 Merge branch 'development' of github.com:open-keychain/open-keychain into development
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedSecretKey.java
	OpenKeychain/src/main/res/values/strings.xml
2014-12-30 13:09:27 +01:00
Vincent Breitmoser
2223cdd405 some small notation data fixes 2014-12-30 13:07:56 +01:00
Vincent Breitmoser
22ea1defa8 add test case for PIN unlock 2014-12-30 13:07:36 +01:00
Vincent Breitmoser
438405d3d2 add PIN as a SecretKeyType 2014-12-30 12:34:24 +01:00
Vincent Breitmoser
7524881a01 fix unit tests for ChangeUnlockParcel 2014-12-30 12:02:37 +01:00
Vincent Breitmoser
2a5ac4e67c Revert "Remove restriction for max parallel forks for gradle tests"
This reverts commit ce34192dbb.

Conflicts:
	build.gradle
2014-12-30 11:59:57 +01:00
Vincent Breitmoser
c7b0b650c1 introduce handling of notation direct key signatures, and experimental pin notation packet 2014-12-30 00:44:12 +01:00
Dominik Schürmann
ccde6add70 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2014-12-29 23:17:01 +01:00
Dominik Schürmann
610c4780f1 New work on PIN and lock pattern UI 2014-12-29 23:16:54 +01:00
Vincent Breitmoser
576e6fd0cc introduce new ChangeUnlockParcel packet for extended passphrase changing capabilities 2014-12-29 23:12:11 +01:00
Dominik Schürmann
320f825878 Add android-lockpattern library 2014-12-29 23:10:50 +01:00
Dominik Schürmann
bf4762ef6f Cleanup UncachedKeyringTest 2014-12-29 13:32:28 +01:00
Dominik Schürmann
ce34192dbb Remove restriction for max parallel forks for gradle tests 2014-12-28 21:56:19 +01:00
Dominik Schürmann
56325851dc Remove necessity to prepare tests via shell script 2014-12-28 21:48:49 +01:00
Dominik Schürmann
d8e6e51452 Fix test for future creation timestamps to account for loosen timestamp check 2014-12-28 21:44:48 +01:00
Dominik Schürmann
a86abe04cd Allow for creation date to be in the future up to one day to account for diverging clocks on different systems for fresh keys 2014-12-28 20:57:03 +01:00
Dominik Schürmann
7dbf0abf7b Fix crash on first time wizard 2014-12-28 19:06:17 +01:00
Dominik Schürmann
a110089b4d New icon for Lollipop release 2014-12-14 19:23:28 +01:00
Dominik Schürmann
f8e2dd681b Update plugin to 1.0 2014-12-12 14:31:41 +01:00
Dominik Schürmann
38698bd891 Merge branch 'master' into development 2014-12-05 13:50:06 +01:00