Commit Graph

3403 Commits

Author SHA1 Message Date
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
Dominik Schürmann
99047aae6d Add passhrase attacking screens for wiki 2014-12-05 13:47:25 +01:00
Dominik Schürmann
fda01143e0 Fix travis 2014-12-05 00:27:33 +01:00
Dominik Schürmann
584ba94f20 Fix travis 2014-12-05 00:13:38 +01:00
Dominik Schürmann
b4c5337624 Fix travis 2014-12-04 23:37:57 +01:00
Dominik Schürmann
26341a325b Update target and support libs to SDK 21, fixing compile issues 2014-12-04 22:48:40 +01:00
Dominik Schürmann
ac1cbad3ff Switch from mavenCentral to jcenter 2014-12-04 20:02:06 +01:00
Dominik Schürmann
9df7147c8b Fix jacoco 2014-12-04 19:58:08 +01:00
Dominik Schürmann
6b9749289f Merge branch 'development' of github.com:open-keychain/open-keychain into development 2014-12-04 19:44:27 +01:00
Dominik Schürmann
389d191448 Merge branch 'master' into development 2014-12-04 19:43:41 +01:00
Dominik Schürmann
8f5295f2d1 Update to com.novoda:gradle-android-test-plugin:0.10.0, no snapshot version anymore, jacoco disabled for now 2014-12-04 19:42:30 +01:00
Dominik Schürmann
450ac161b9 Set version to 3.2beta1 2014-12-04 19:26:10 +01:00
Dominik Schürmann
e41dcd3795 Update for Android Studio 1.0 RC 2014-12-04 19:07:38 +01:00
Dominik Schürmann
d50213e0b0 Update for Android Studio 1.0 RC 2014-12-04 19:05:17 +01:00
Dominik Schürmann
4a9e3ccc83 Merge pull request #1011 from cketti/fix_k9_references
Fix spelling of 'K-9 Mail' in FAQ
2014-11-27 11:25:34 +01:00
cketti
aa8b3db139 Fix spelling of 'K-9 Mail' in FAQ 2014-11-26 04:40:58 +01:00
Dominik Schürmann
a805069c59 more cleanup 2014-11-21 23:55:04 +01:00
Dominik Schürmann
dd65d10406 NFC activity design 2014-11-21 13:31:43 +01:00
Dominik Schürmann
fc32f5f9d4 Minor code cleanup 2014-11-21 12:41:39 +01:00