Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Fallback if no primary user id exists | Dominik Schürmann | 2014-07-16 | 1 | -1/+1 | |
| | ||||||
* | Move sks-keyservers.net CA into assets folder | mar-v-in | 2014-06-25 | 1 | -6/+4 | |
| | ||||||
* | Merge branch 'master' into hkps-by-default | mar-v-in | 2014-06-24 | 2 | -0/+9 | |
|\ | ||||||
| * | Merge pull request #686 from mar-v-in/minidns | Vincent | 2014-06-23 | 1 | -10/+11 | |
| |\ | | | | | | | Use minidns instead of dnsjava | |||||
| * \ | 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. | |||||
* | | | Use URLEncoder instead of Uri.encode | mar-v-in | 2014-06-24 | 1 | -2/+6 | |
| | | | ||||||
* | | | Rewrote hkp add to work with hkps as well. | mar-v-in | 2014-06-24 | 1 | -24/+13 | |
| | | | | | | | | | | | | Also removes HttpClient dependency (deprecated for android) | |||||
* | | | Few fixes on hkps | mar-v-in | 2014-06-23 | 1 | -4/+3 | |
| | | | | | | | | | | | | TODO: Fix add as well | |||||
* | | | Add hkps support for sks-keyservers.net | mar-v-in | 2014-06-23 | 1 | -65/+42 | |
| |/ |/| | ||||||
* | | Switch to dnsjava | mar-v-in | 2014-06-23 | 1 | -10/+11 | |
|/ | ||||||
* | 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? |