cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,371 Commits 1 Branch 0 Tags
f978aca8e587e4b9cd0574cac6f4bc7cc3d9fef9
Commit Graph

224 Commits

Author SHA1 Message Date
Vincent Breitmoser
7f3154ecea Merge branch 'master' into v/multi-decrypt 2015-06-17 21:33:31 +02:00
Vincent Breitmoser
f5aa36ef9f fix rest of resource leaks (#1351) 2015-06-17 21:30:25 +02:00
Vincent Breitmoser
374b21410e Merge branch 'v/instrument' into v/multi-decrypt 
Conflicts:
	.travis.yml
	OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/CreateKeyActivityTest.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java
 2015-06-17 19:24:07 +02:00
Vincent Breitmoser
312cb38848 preliminary EditKeyTest 2015-06-17 18:52:59 +02:00
Vincent Breitmoser
baea318470 Merge remote-tracking branch 'origin/master' into v/multi-decrypt 2015-06-11 17:12:07 +02:00
Dominik Schürmann
aa31abd93f Allow debug build besides release build 2015-06-10 19:47:29 +02:00
Vincent Breitmoser
fa61438306 multi-decrypt: implement save operation (missing actual copy) 2015-06-03 17:01:29 +02:00
Vincent Breitmoser
0d8370be1d rewrite PgpDecryptVerify input, introduce PgpDecryptVerifyInputParcel 2015-05-30 13:25:47 +02:00
Vincent Breitmoser
2bbb9b9608 update database to trigger consolidate 2015-05-28 22:43:10 +02:00
Vincent Breitmoser
c4d392051c improve robustness of SecretKeyType handling 2015-05-28 22:34:02 +02:00
Vincent Breitmoser
c8f788b925 set to stripped by default, rather than "unavailable" 2015-05-28 22:22:24 +02:00
Vincent Breitmoser
b2f32827c6 allow user packets with only revocation packet 2015-05-28 22:00:08 +02:00
Dominik Schürmann
0a29f6d3ac Cleanup 2015-05-10 11:52:39 +02:00
Dominik Schürmann
e14a2efcad Fixes and clarifications to app signature (or better certificate) pinning 2015-05-10 03:31:19 +02:00
William Faulk
eabc6cd8d4 use TemporaryStorageProvider for Bluetooth Share 2015-05-04 16:49:30 -04:00
Dominik Schürmann
4e425495e6 Apply patch from https://github.com/open-keychain/open-keychain/issues/1240 with db upgrade 2015-05-04 13:57:43 +02:00
Dominik Schürmann
c2593f29ff Query for duplicate user ids 2015-03-15 02:40:31 +01:00
Vincent Breitmoser
9ff4d7b2bc change user_id primary key in database, use keyring rather than unified query in consolidate 2015-03-11 18:39:26 +01:00
Dominik Schürmann
f13953e8fc API 7 2015-03-10 11:34:35 +01:00
Dominik Schürmann
e45f000cb4 Remove advanced preferences, move compression as menu item in encrypt activites, select hash and encryption algo based on hardcoded preferred lists 2015-03-05 16:57:57 +01:00
Dominik Schürmann
7ccdd7d38e Debug options 2015-03-05 11:14:19 +01:00
Vincent Breitmoser
e5bb7a35b5 save revocation instead of self-cert for revoked uids 2015-02-26 18:53:16 +01:00
Vincent Breitmoser
7b24ee7b55 rewrite PgpSignEncrypt data flow 
- introduce high-level SignEncryptOperation for uri to uri signing/encryption
- use SignEncryptParcel for high-level operation parameters
- use PgpSignEncryptInput plus streams for low-level operation parameters
- get rid of all sign/encrypt logic in KeychainIntentService
 2015-02-01 23:14:26 +01:00
Vincent Breitmoser
0b6dc65c97 Merge remote-tracking branch 'origin/development' into development 2015-01-31 18:49:54 +01:00
Vincent Breitmoser
5466d1e980 prevent recursive consolidate 2015-01-31 18:49:00 +01:00
Dominik Schürmann
e651a39279 Rename app setting classes for consistency 2015-01-30 10:59:57 +01:00
Dominik Schürmann
464f7c6718 Fix saving of allowed keys 2015-01-30 10:47:40 +01:00
Dominik Schürmann
34b664f4b6 Merge branch 'ligi/fix/add_ability_to_compile_with_java8' of https://github.com/ligi/open-keychain into ligi-ligi/fix/add_ability_to_compile_with_java8 2015-01-30 10:10:13 +01:00
Dominik Schürmann
38f7950d90 Saving of allowed keys 2015-01-29 21:00:58 +01:00
ligi
fcd91d881e Add explicit casting to be able to compile with java8 2015-01-29 20:30:26 +01:00
Dominik Schürmann
d6e4936fa5 Introduce allowed keys table per API client 2015-01-29 17:46:27 +01:00
Vincent Breitmoser
8d9c3c0534 lift language level to java 7, and some code cleanup 2015-01-25 12:36:00 +01:00
Vincent Breitmoser
e71bd3d9dd always show revoked user ids last! 2015-01-19 18:31:57 +01:00
Vincent Breitmoser
c57355b24a actually import user attributes (though they are not shown anywhere yet) 2015-01-14 00:03:02 +01:00
Vincent Breitmoser
2b1c5358b7 make user_ids table typed, with attribute_data support 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java
 2015-01-14 00:02:53 +01:00
Vincent Breitmoser
07251f35ae minor stuff 2015-01-03 23:01:57 +01:00
Vincent Breitmoser
920fbdfb42 throw exception if no data is found in getGenericData 2015-01-02 02:24:11 +01:00
Vincent Breitmoser
438405d3d2 add PIN as a SecretKeyType 2014-12-30 12:34:24 +01:00
Dominik Schürmann
26a4cf2a56 Changelog 3.1.1 2014-10-30 12:48:06 +01:00
Dominik Schürmann
30c3021fea Always use INTEGER instead of BOOLEAN in database to avoid confusion 2014-10-29 23:41:10 +01:00
Vincent Breitmoser
5ce89c4af8 fix consolidate if no secret key are present 2014-10-26 22:20:44 +01:00
Vincent Breitmoser
082722a3cf prevent cancel dring consolidate, move logic into progressable 2014-10-26 22:00:57 +01:00
Vincent Breitmoser
33738b1f52 Retry canonicalization with pubkey self certs if first attempt failed 
Fixes #974
 2014-10-26 00:26:13 +02:00
Vincent Breitmoser
30d0afa363 change the way merging is logged 2014-10-25 02:45:16 +02:00
Vincent Breitmoser
214b60cd00 integrate download from keyserver into key import operation 2014-10-23 23:29:40 +02:00
Vincent Breitmoser
93aefaca8e fix logging in consolidate, part 2 2014-10-11 20:04:45 +02:00
Vincent Breitmoser
4bd9c6ff96 fix logging in consolidate, part 1 2014-10-11 19:54:07 +02:00
Vincent Breitmoser
fe981e5498 move around package structure a bit 2014-10-10 19:59:25 +02:00
Vincent Breitmoser
45dcc7d070 move operations into ops package, introduce BaseOperation class 2014-10-10 19:31:43 +02:00
Dominik Schürmann
45b02008fb Replace many PgpGeneralExceptions with PgpKeyNotFoundException 2014-10-09 01:37:44 +02:00