Commit Graph
1788 Commits
Author SHA1 Message Date
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 5c54ab1a0d Merge branch 'development' into keybase-proofs 2014-12-05 15:51:15 +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 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 450ac161b9 Set version to 3.2beta1 2014-12-04 19:26:10 +01:00
cketti aa8b3db139 Fix spelling of 'K-9 Mail' in FAQ 2014-11-26 04:40:58 +01:00
Tim Bray 2a608c12ca Check fingerprint match between proof & database 2014-11-22 09:27:28 -08:00
Tim Bray 734a085f0d Merge remote-tracking branch 'origin/keybase-proofs' into keybase-proofs
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java
2014-11-21 19:45:35 -08:00
Tim Bray e72c082acd Add check that proof & database fingerprints are the same 2014-11-21 19:44:05 -08:00
Dominik Schürmann 9c133d343f fix signature check 2014-11-22 02:55:42 +01:00
Dominik Schürmann bbbc45e4e9 Dont accept signatures by expired or revoked subkeys 2014-11-22 00:29:14 +01:00
Dominik Schürmann fd60d49d26 Use master key id for keybase proof verification 2014-11-22 00:10:15 +01:00
Dominik Schürmann 47caad3edb Merge branch 'development' into keybase-proofs 2014-11-21 23:55:17 +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
Tim Bray 629d83a1ce Merge branch 'keybase-proofs' of https://github.com/open-keychain/open-keychain into keybase-proofs 2014-11-19 14:37:06 -08:00
Tim Bray b5cdeb7f5a Prevent multiple cloud-trust-search launches. Handle DNS query failure gracefully. Fixes #1007 & #1008. 2014-11-19 14:35:05 -08:00
Dominik Schürmann 1c0f994d08 Merge branch 'keybase-proofs' of github.com:open-keychain/open-keychain into keybase-proofs 2014-11-19 22:22:18 +01:00
Tim Bray 0f59e6bd95 In the ImportKeysList display, arrange for Keybase UserIDs to sort below the rest. Also mention Keybase stuff other than Twitter/GitHub/Website 2014-11-18 22:12:50 -08:00
Dominik Schürmann 6691f5118a Version 3.2beta1 2014-11-18 19:04:16 +01:00
Tim Bray 36bac67dd5 All keybase proofs now in place 2014-11-11 18:45:36 -08:00
Tim Bray 3c19e6cfc1 Fix a no-result corner case, and make verifications clickable 2014-11-07 21:07:10 -08:00
Tim Bray 4929e346a2 XML fragment for proof listing 2014-11-07 12:29:17 -08:00
Tim Bray c05441667e Moved from WebView to Spannables, some proof cleanup too 2014-11-07 12:28:27 -08:00
Dominik Schürmann 9de76bb903 Version 3.1.2 2014-11-02 17:54:33 +01:00
Dominik Schürmann f3da3b31e5 Pull from transifex 2014-11-02 17:54:10 +01:00
Dominik Schürmann 602930d929 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2014-11-02 17:50:38 +01:00
Dominik Schürmann 9dc8c0d506 Changelog 2014-11-02 17:50:31 +01:00
Vincent Breitmoser 1886dd1790 export secret and public keys in separate armored blocks 2014-10-31 18:18:09 +01:00
Vincent Breitmoser 8720a21106 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2014-10-30 19:48:27 +01:00
Vincent Breitmoser 7017527999 forgot a thing for secret key export 2014-10-30 15:14:44 +01:00
Dominik Schürmann f10ec91380 Version 3.1.1 2014-10-30 12:54:17 +01:00
Dominik Schürmann 148c9a5c62 Revert "Version 3.1.1"
This reverts commit 8461f953f6.
2014-10-30 12:54:01 +01:00
Dominik Schürmann 8461f953f6 Version 3.1.1 2014-10-30 12:53:21 +01:00
Dominik Schürmann f4d0e5250b Pull from transifex 2014-10-30 12:52:33 +01:00
Dominik Schürmann 26a4cf2a56 Changelog 3.1.1 2014-10-30 12:48:06 +01:00
Dominik Schürmann 18255e331b Merge branch 'development' of github.com:open-keychain/open-keychain into development 2014-10-30 12:44:13 +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 a221464f38 Fix to preselect certification key if only one is available
Closes #981
2014-10-29 22:47:34 +01:00
Vincent Breitmoser 8b53bed6c0 remove unused ExchangeKeySpinner class 2014-10-29 22:45:49 +01:00
Vincent Breitmoser e1285eec7b Close stream on key export to avoid partial write (see #986) 2014-10-29 22:39:38 +01:00
Vincent Breitmoser 727783dd00 retrofit getBlob method of matrixcursor for android 2.3 2014-10-27 17:36:53 +01:00
Dominik Schürmann 3e601431ea Version 3.1 2014-10-26 23:32:57 +01:00
Dominik Schürmann e02b2ab30c Pull from transifex 2014-10-26 23:32:34 +01:00
Dominik Schürmann 5f20abdb26 Pull from transifex 2014-10-26 23:23:30 +01:00
Dominik Schürmann 893a4620c1 Changelog 3.1 2014-10-26 23:15:46 +01:00
Dominik Schürmann e1b0908290 Fix crash with NotFoundException 2014-10-26 22:49:34 +01:00