cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,800 Commits 1 Branch 0 Tags
e9a2f256b9324cc898061d2a2ebde18446ce1dd1
Commit Graph
244 Commits
Author SHA1 Message Date
Vincent Breitmoser e9a2f256b9 add cancel prevention mechanism, improve cancellation for key import 2014-08-31 20:05:19 +02:00
Vincent Breitmoser d17b478a9e don't make our service sticky 2014-08-31 19:31:21 +02:00
Vincent Breitmoser e46bc24079 add cancel support to edit key action 2014-08-31 19:20:08 +02:00
Vincent Breitmoser 7da7832284 Add cancelable mechanism and support in key import 
Closes #323
 2014-08-31 17:32:13 +02:00
Vincent Breitmoser 5ff3043903 canonicalize: add check for algorithm type 
closes #797
 2014-08-30 17:00:58 +02:00
Dominik Schürmann c0ebc92611 Merge branch 'master' into yubikey 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/Preferences.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
 2014-08-28 11:00:18 +02:00
Dominik Schürmann b193965e58 Merge pull request #796 from open-keychain/develop 
ECC support
 2014-08-28 10:46:58 +02:00
Dominik Schürmann c2f6aa09c5 Merge branch 'master' of github.com:open-keychain/open-keychain 2014-08-27 19:28:46 +02:00
Dominik Schürmann d795f8d4e2 Strip out duplicate user ids 2014-08-27 19:28:33 +02:00
Vincent Breitmoser cb2eb8aca2 small language fixes for previous commit 2014-08-27 15:42:09 +02:00
Dominik Schürmann 12a5b2174f Abort import of pubkeys where secret keys exist but new pubkey has more subkeys, fix #696 2014-08-27 14:12:59 +02:00
Vincent Breitmoser 783dae8804 add ecc support 2014-08-24 16:08:37 +02:00
Dominik Schürmann 2930f83b2a Change account type 2014-08-21 11:19:44 +02:00
Vincent Breitmoser ad9339b23d Merge branch 'master' of github.com:open-keychain/open-keychain 2014-08-21 00:02:33 +02:00
Vincent Breitmoser 63ca81d871 Copyright (C) 2014 Vincent Breitmoser 2014-08-21 00:02:27 +02:00
Dominik Schürmann 3ace5052e7 Comment extra in requestSync 2014-08-20 23:56:17 +02:00
Dominik Schürmann 6e3af6605a Sync in KeychainIntentService on delete, import, save 2014-08-20 23:55:01 +02:00
Dominik Schürmann 642a63fab6 Merge branch 'master' of github.com:open-keychain/open-keychain 2014-08-20 23:26:09 +02:00
Dominik Schürmann 418e922c78 Enable sync adapter, changelog 2014-08-20 23:26:01 +02:00
Dominik Schürmann 0b07c5258f Disable key import in sync adapter 2014-08-20 23:13:37 +02:00
Vincent Breitmoser ce4bfdf945 Merge branch 'master' of github.com:open-keychain/open-keychain 2014-08-20 23:09:25 +02:00
Vincent Breitmoser dcf268bcb2 move key deletion into KeychainIntentHandler 2014-08-20 23:08:52 +02:00
Dominik Schürmann 37caddca70 Upload key working 2014-08-20 22:51:00 +02:00
Vincent Breitmoser 945764b30f Merge branch 'master' of github.com:open-keychain/open-keychain 2014-08-20 22:38:28 +02:00
Vincent Breitmoser 6c428fa6b5 make number of secret keys imported part of ImportResult parcel 2014-08-20 21:51:57 +02:00
Dominik Schürmann 45706e6534 Notify duration, cleanup 2014-08-20 21:09:46 +02:00
Vincent Breitmoser 1e5ac82985 Merge branch 'master' of github.com:open-keychain/open-keychain 2014-08-20 19:59:54 +02:00
Vincent Breitmoser 475293a116 consolidate: prevent concurrent calls of step 2 2014-08-20 19:59:45 +02:00
Dominik Schürmann 0e152d1db0 Merge branch 'master' of github.com:open-keychain/open-keychain 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
 2014-08-20 19:48:19 +02:00
Dominik Schürmann f46f2b6895 Fixes and temporary fixes for returning results 2014-08-20 19:46:44 +02:00
Vincent Breitmoser fe1f5489ff consolidate: implement (mostly) recovery mode 2014-08-20 19:34:36 +02:00
Dominik Schürmann 16ab761006 Fix strings 2014-08-19 18:12:19 +02:00
Vincent Breitmoser 9930ab7f6f consolidate: a lot more log output, better recovery 2014-08-19 16:53:55 +02:00
Vincent Breitmoser c725239a69 consolidate: split into two steps, can pick up at second step if anything fails 2014-08-19 15:45:59 +02:00
Vincent Breitmoser 14290c3ce9 consolidate: working implementation, lacking ui 2014-08-17 03:29:03 +02:00
Vincent Breitmoser aa625d4fbf parametrize FileImportCache for filename 2014-08-17 00:49:14 +02:00
Vincent Breitmoser c00343d516 modify*Key: improve handling of passphrase modification (add tests, too) 2014-08-16 21:04:43 +02:00
Dominik Schürmann 474fc50b80 Always return a SaveKeyringResult from saving 2014-08-16 12:24:46 +02:00
Dominik Schürmann 188eeb79c9 Fix and simplify in OperationResultParcel 2014-08-16 12:13:30 +02:00
Vincent Breitmoser de0d95432e typed expected failures and a couple minor things 2014-08-16 06:53:50 +02:00
Vincent Breitmoser a943bebfdf support for master key modifications, among other stuff 2014-08-16 06:53:50 +02:00
Vincent Breitmoser 1fa77d57d2 modifySecretKey: err out on "use previous" expiry date for (sub)key creation 2014-08-16 06:53:50 +02:00
Vincent Breitmoser c54fe21f44 modifySecretKey: err out on revocation of nonexistent user id 2014-08-16 06:53:50 +02:00
Dominik Schürmann 8d60d9f103 Fix encrypt only 2014-08-16 03:59:58 +02:00
Vincent Breitmoser 09d37a5fa6 fix keys with no expiry in ui code 2014-08-14 22:12:18 +02:00
Dominik Schürmann 0f60bcbc3d Pass through of master key id in SaveKeyringResult 2014-08-14 19:25:39 +02:00
Vincent Breitmoser 9af301ec77 handle modify and save errors in KeychainIntentResult 2014-08-14 17:12:17 +02:00
Dominik Schürmann 62f7bf6215 move v3 key import prevention into canonicalization method 2014-08-14 15:58:26 +02:00
Dominik Schürmann 0a1de8deea Do not import v3 keys, they are insecure! 2014-08-14 15:42:02 +02:00
Dominik Schürmann e72e47d92e Remove support for v3 sig generation 2014-08-14 15:24:37 +02:00