Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Optimize imports | Dominik Schürmann | 2014-08-05 | 1 | -5/+5 | |
| | ||||||
* | Add license headers | Dominik Schürmann | 2014-08-04 | 1 | -0/+17 | |
| | ||||||
* | Fixing lint complaints, removing unused resources | Dominik Schürmann | 2014-08-04 | 1 | -5/+5 | |
| | ||||||
* | move classes around a bit | Vincent Breitmoser | 2014-08-01 | 1 | -97/+0 | |
| | ||||||
* | lowercase all key ids from keyserver | Vincent Breitmoser | 2014-07-31 | 1 | -2/+2 | |
| | ||||||
* | Robots like coffee too... | Dominik Schürmann | 2014-07-31 | 1 | -4/+0 | |
| | ||||||
* | Parcelable data over 1MB can not be send through binder, parcel into a cache ↵ | Dominik Schürmann | 2014-07-31 | 1 | -0/+101 | |
| | | | | file, fix #592 | |||||
* | Keyserver exception translateable | Dominik Schürmann | 2014-07-31 | 2 | -1/+8 | |
| | ||||||
* | Smaller notes | Dominik Schürmann | 2014-07-31 | 1 | -0/+8 | |
| | ||||||
* | Even better Exception handling with keyserver queries | Dominik Schürmann | 2014-07-31 | 1 | -8/+10 | |
| | ||||||
* | Exception handling with keyserver queries | Dominik Schürmann | 2014-07-31 | 1 | -5/+13 | |
| | ||||||
* | 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 | |
| | |