Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of https://github.com/da-kid/open-keychain | Daniel Albert | 2014-06-23 | 1 | -0/+3 |
|\ | |||||
| * | Handle empty keybase.io query, should fix #675 | Tim Bray | 2014-06-22 | 1 | -0/+3 |
| | | |||||
* | | Fixed Issue #683 which caused OK to crash upon importing keys which contain ↵ | Daniel Albert | 2014-06-23 | 1 | -0/+6 |
|/ | | | | percent signs. | ||||
* | Merge remote-tracking branch 'origin/master' | Vincent Breitmoser | 2014-06-22 | 1 | -103/+26 |
|\ | |||||
| * | Cleanup pull keybase code | Dominik Schürmann | 2014-06-21 | 1 | -6/+1 |
| | | |||||
| * | Moved Keybase stuff into KeybaseLib submodule | Tim Bray | 2014-06-20 | 1 | -101/+29 |
| | | |||||
* | | fix parcel method in ParcelableKeyRing | Vincent Breitmoser | 2014-06-22 | 1 | -1/+3 |
| | | |||||
* | | use hashcode instead of keyid in import list (keyids may not be unique!) | Vincent Breitmoser | 2014-06-22 | 1 | -0/+10 |
|/ | |||||
* | Fix keybase import | Dominik Schürmann | 2014-06-20 | 1 | -1/+2 |
| | |||||
* | New callback model for ImportKeysActivity | Dominik Schürmann | 2014-06-19 | 1 | -9/+10 |
| | |||||
* | Merge remote-tracking branch 'origin/master' into canonicalize | Vincent Breitmoser | 2014-06-13 | 4 | -78/+182 |
|\ | | | | | | | | | | | | | | | | | | | Conflicts: .gitmodules OpenKeychain/build.gradle OpenKeychain/src/main/AndroidManifest.xml OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysListEntry.java OpenKeychain/src/main/res/values/strings.xml settings.gradle | ||||
| * | Merge branch 'master' into automatic-contact-discovery | mar-v-in | 2014-06-05 | 3 | -72/+71 |
| |\ | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysListEntry.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java | ||||
| | * | Clean up keyimport.ImportKeysListEntry | Tim Bray | 2014-06-05 | 1 | -58/+58 |
| | | | |||||
| | * | Merge pull request #645 from timbray/master | Dominik Schürmann | 2014-06-05 | 1 | -1/+2 |
| | |\ | | | | | | | | | Don't show full fingerprint in key search result lists | ||||
| | | * | fixed error message | Tim Bray | 2014-06-04 | 1 | -1/+2 |
| | | | | |||||
| * | | | Merge branch 'master' into automatic-contact-discovery | mar-v-in | 2014-06-04 | 2 | -60/+61 |
| |\ \ \ | | | |/ | | |/| | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java | ||||
| * | | | Fix regex for hkp parsing to support multiple uids | mar-v-in | 2014-06-04 | 1 | -2/+2 |
| | | | | |||||
| * | | | Store expired state within ImportKeysListEntry | mar-v-in | 2014-06-04 | 2 | -0/+12 |
| | | | | |||||
| * | | | Merge branch 'hkps-support' into automatic-contact-discovery | mar-v-in | 2014-05-29 | 1 | -15/+54 |
| |\ \ \ | |||||
| | * | | | Fix url building to support certificate check on hkps servers | mar-v-in | 2014-05-28 | 1 | -8/+19 |
| | | | | | | | | | | | | | | | | | | | | Note: the CA used by sks-keyservers.net is not valid for android, thus using hkps fails for them. pgp.mit.edu uses a perfectly valid cert. | ||||
| | * | | | Add hkps support | mar-v-in | 2014-05-27 | 1 | -9/+37 |
| | | | | | |||||
| * | | | | Store nice origin with keybase keys (that can't be interpreted as HKP server) | mar-v-in | 2014-05-29 | 1 | -1/+2 |
| | | | | | |||||
| * | | | | Make abstract methods in Keyserver public (implementations make them public ↵ | mar-v-in | 2014-05-29 | 1 | -3/+3 |
| |/ / / | | | | | | | | | | | | | anyway) | ||||
| * | | | Store origin with ImportKeysListEntry | mar-v-in | 2014-05-27 | 3 | -0/+13 |
| | | | | |||||
| * | | | Add ability to resolve HkpKeyserver from _hkp._tcp SRV record | mar-v-in | 2014-05-27 | 1 | -0/+38 |
| | | | | |||||
* | | | | canonicalize: more stuff | Vincent Breitmoser | 2014-06-12 | 1 | -1/+1 |
| | | | | |||||
* | | | | canonicalize: first step(s) | Vincent Breitmoser | 2014-06-10 | 1 | -1/+1 |
| |_|/ |/| | | |||||
* | | | do respect expectedFingerprint during key import | Vincent Breitmoser | 2014-06-04 | 1 | -8/+6 |
| |/ |/| | |||||
* | | Merge remote-tracking branch 'origin/master' into edit-key-rewrite | Vincent Breitmoser | 2014-06-02 | 3 | -31/+36 |
|\| | |||||
| * | Finished cleaning up rebase conflicts post Keyserver exception refactor | Tim Bray | 2014-05-23 | 3 | -23/+24 |
| | | |||||
| * | Add Log.d for QueryFailedException | Tim Bray | 2014-05-23 | 3 | -12/+16 |
| | | |||||
* | | wrapped-key-ring: move key data around in ParcelableKeyRing instead of ↵ | Vincent Breitmoser | 2014-06-02 | 2 | -24/+51 |
| | | | | | | | | ImportKeysListEntry | ||||
* | | fix missing userIds in ImportKeysListEntry | Vincent Breitmoser | 2014-05-27 | 1 | -2/+1 |
| | | |||||
* | | wrapped-key-ring: UncachedKeyRing wraps only one ring of dynamic type | Vincent Breitmoser | 2014-05-23 | 1 | -37/+12 |
|/ | |||||
* | Merge highlight keyserver pull request | Dominik Schürmann | 2014-05-18 | 3 | -2/+13 |
|\ | |||||
| * | Add highlighting to keyserver/keybase search | Thialfihar | 2014-05-16 | 3 | -2/+13 |
| | | |||||
* | | Rename KeyServer to Keyserver | Dominik Schürmann | 2014-05-18 | 3 | -8/+5 |
|/ | |||||
* | keybase cleanups for revised search output format | Tim Bray | 2014-05-15 | 1 | -24/+7 |
| | |||||
* | keybase now has key info in search output | Tim Bray | 2014-05-15 | 1 | -0/+5 |
| | |||||
* | Rename fingerPrint to fingerprint | Thialfihar | 2014-05-14 | 2 | -9/+9 |
| | |||||
* | Add github, twitter, website info for keybase keys | Thialfihar | 2014-05-14 | 1 | -0/+17 |
| | | | | | | | The very point of keybase.io is the identification and proven link to those identities, so it should be nice to have them. The display is a bit basic still, as it just adds them as userIds, I'm sure this can be prettified, perhaps with logos? | ||||
* | Cleanup keybase query a bit | Thialfihar | 2014-05-14 | 1 | -15/+14 |
| | | | | | | | Remove ctime and the cached key, making the query for the entire user object unnecessary. This should only be done when the user decides to import the key. Hopefully keybase.io can provide all info necessary in the search results. | ||||
* | Don't guess keybase key algorithm and size | Thialfihar | 2014-05-14 | 1 | -4/+2 |
| | | | | | Once keybase reports them, we can display them. Until then we simply don't know and shouldn't lie about it. | ||||
* | Add extraData property in ImportKeyListEntry | Thialfihar | 2014-05-14 | 2 | -6/+18 |
| | | | | | | This allows any KeyServer to store some extra data it might need. In the case of KeybaseKeyServer it is the username, which then can be grabbed directly, without the hack of storing it as userId. | ||||
* | List full keybase id or strong key id matches on top | Thialfihar | 2014-05-14 | 1 | -1/+10 |
| | |||||
* | Make keybase lookup works for key ids starting with 0x | Thialfihar | 2014-05-14 | 1 | -1/+6 |
| | |||||
* | Move logic classes for import into own sub-package | Dominik Schürmann | 2014-05-06 | 4 | -0/+835 |