Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'development' into keybase-proofs | Dominik Schürmann | 2014-12-05 | 1 | -1/+1 |
|\ | |||||
| * | Update target and support libs to SDK 21, fixing compile issues | Dominik Schürmann | 2014-12-04 | 1 | -1/+1 |
| | | |||||
* | | Merge remote-tracking branch 'origin/keybase-proofs' into keybase-proofs | Tim Bray | 2014-11-21 | 1 | -2/+1 |
|\ \ | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java | ||||
| * | | fix signature check | Dominik Schürmann | 2014-11-22 | 1 | -2/+2 |
| | | | |||||
* | | | Add check that proof & database fingerprints are the same | Tim Bray | 2014-11-21 | 2 | -4/+8 |
|/ / | |||||
* | | Dont accept signatures by expired or revoked subkeys | Dominik Schürmann | 2014-11-22 | 4 | -9/+13 |
| | | |||||
* | | Use master key id for keybase proof verification | Dominik Schürmann | 2014-11-22 | 1 | -10/+4 |
| | | |||||
* | | Merge branch 'development' into keybase-proofs | Dominik Schürmann | 2014-11-21 | 4 | -25/+20 |
|\| | |||||
| * | more cleanup | Dominik Schürmann | 2014-11-21 | 1 | -14/+9 |
| | | |||||
| * | Minor code cleanup | Dominik Schürmann | 2014-11-21 | 4 | -11/+11 |
| | | |||||
* | | Prevent multiple cloud-trust-search launches. Handle DNS query failure ↵ | Tim Bray | 2014-11-19 | 2 | -1/+8 |
| | | | | | | | | gracefully. Fixes #1007 & #1008. | ||||
* | | In the ImportKeysList display, arrange for Keybase UserIDs to sort below the ↵ | Tim Bray | 2014-11-18 | 2 | -3/+20 |
| | | | | | | | | rest. Also mention Keybase stuff other than Twitter/GitHub/Website | ||||
* | | All keybase proofs now in place | Tim Bray | 2014-11-11 | 3 | -44/+89 |
| | | |||||
* | | Fix a no-result corner case, and make verifications clickable | Tim Bray | 2014-11-07 | 1 | -1/+2 |
| | | |||||
* | | Moved from WebView to Spannables, some proof cleanup too | Tim Bray | 2014-11-07 | 5 | -21/+732 |
|/ | |||||
* | export secret and public keys in separate armored blocks | Vincent Breitmoser | 2014-10-31 | 1 | -9/+24 |
| | |||||
* | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Vincent Breitmoser | 2014-10-30 | 2 | -13/+11 |
|\ | | | | | | | development | ||||
| * | Changelog 3.1.1 | Dominik Schürmann | 2014-10-30 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2014-10-30 | 4 | -102/+28 |
| |\ | | | | | | | | | | development | ||||
| * | | Always use INTEGER instead of BOOLEAN in database to avoid confusion | Dominik Schürmann | 2014-10-29 | 1 | -12/+10 |
| | | | |||||
* | | | forgot a thing for secret key export | Vincent Breitmoser | 2014-10-30 | 1 | -18/+24 |
| |/ |/| | |||||
* | | Fix to preselect certification key if only one is available | Vincent Breitmoser | 2014-10-29 | 1 | -1/+1 |
| | | | | | | | | Closes #981 | ||||
* | | remove unused ExchangeKeySpinner class | Vincent Breitmoser | 2014-10-29 | 1 | -100/+0 |
| | | |||||
* | | Close stream on key export to avoid partial write (see #986) | Vincent Breitmoser | 2014-10-29 | 1 | -0/+7 |
| | | |||||
* | | retrofit getBlob method of matrixcursor for android 2.3 | Vincent Breitmoser | 2014-10-27 | 1 | -1/+20 |
|/ | |||||
* | Fix crash with NotFoundException | Dominik Schürmann | 2014-10-26 | 1 | -3/+8 |
| | |||||
* | Rename multi certify files to certify | Dominik Schürmann | 2014-10-26 | 6 | -22/+17 |
| | |||||
* | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2014-10-26 | 7 | -5/+30 |
|\ | | | | | | | development | ||||
| * | Display error on certification attempt with yubikey | Vincent Breitmoser | 2014-10-26 | 2 | -0/+6 |
| | | | | | | | | Closes #978 | ||||
| * | disable cancel button instead of hiding it on cancel prevention | Vincent Breitmoser | 2014-10-26 | 1 | -1/+1 |
| | | |||||
| * | fix consolidate if no secret key are present | Vincent Breitmoser | 2014-10-26 | 1 | -2/+6 |
| | | |||||
| * | prevent cancel dring consolidate, move logic into progressable | Vincent Breitmoser | 2014-10-26 | 4 | -2/+17 |
| | | |||||
* | | Fix notify after certify | Dominik Schürmann | 2014-10-26 | 2 | -26/+20 |
|/ | |||||
* | Use new safe slinger activity from share tab | Dominik Schürmann | 2014-10-26 | 1 | -76/+26 |
| | |||||
* | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2014-10-26 | 6 | -16/+56 |
|\ | | | | | | | development | ||||
| * | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Vincent Breitmoser | 2014-10-26 | 1 | -10/+10 |
| |\ | | | | | | | | | | development | ||||
| * | | implement upload of keyring after certification, check that option by default | Vincent Breitmoser | 2014-10-26 | 6 | -16/+56 |
| | | | |||||
* | | | Move advanced info into own activity | Dominik Schürmann | 2014-10-26 | 5 | -263/+214 |
| |/ |/| | |||||
* | | Keyboard tests | Dominik Schürmann | 2014-10-26 | 1 | -10/+10 |
|/ | |||||
* | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Vincent Breitmoser | 2014-10-26 | 4 | -7/+23 |
|\ | | | | | | | development | ||||
| * | Fail on unknown key ids on API, Key item design consistency for API | Dominik Schürmann | 2014-10-26 | 4 | -3/+19 |
| | | |||||
| * | Fix layout of select key adapter | Dominik Schürmann | 2014-10-26 | 1 | -4/+4 |
| | | |||||
* | | Retry canonicalization with pubkey self certs if first attempt failed | Vincent Breitmoser | 2014-10-26 | 2 | -4/+17 |
|/ | | | | Fixes #974 | ||||
* | Remove empty layout | Dominik Schürmann | 2014-10-25 | 1 | -24/+0 |
| | |||||
* | Remove PassphraseDialogFragment | Dominik Schürmann | 2014-10-25 | 2 | -435/+2 |
| | |||||
* | Remove old certify activity | Dominik Schürmann | 2014-10-25 | 3 | -461/+1 |
| | |||||
* | Use passphrase dialog activity instead of passphrase dialog | Dominik Schürmann | 2014-10-25 | 3 | -36/+67 |
| | |||||
* | Remove old exception handling code from loaders | Dominik Schürmann | 2014-10-25 | 1 | -35/+3 |
| | |||||
* | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2014-10-25 | 3 | -8/+20 |
|\ | | | | | | | development | ||||
| * | remove unnecessary (and buggy) BufferedInputStream wrapping | Vincent Breitmoser | 2014-10-25 | 3 | -8/+20 |
| | |