Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Beautify key id (thanks to Tim Bray) | Dominik Schürmann | 2014-09-19 | 1 | -3/+3 |
| | |||||
* | Use key icons in import, prettify items | Dominik Schürmann | 2014-09-18 | 1 | -0/+1 |
| | |||||
* | package reordering: merge util and helper, there were no real difference; ↵ | Dominik Schürmann | 2014-09-17 | 4 | -10/+10 |
| | | | | created ui.util for everything related to formatting | ||||
* | Fix construction of algorithmID in Keybase result lists | Tim Bray | 2014-09-15 | 1 | -2/+2 |
| | |||||
* | Keys found on multiple servers are now imported from all of them | Tim Bray | 2014-09-13 | 4 | -9/+14 |
| | |||||
* | Change shuffle to rotate, and when merging ImportKeysList entries, if either ↵ | Tim Bray | 2014-09-13 | 2 | -2/+12 |
| | | | | side is revoked/expired, the merge reflects that | ||||
* | Add cloud search tab, lose Keybase/Keyserver tabs, re-organize prefs | Tim Bray | 2014-09-13 | 4 | -2/+195 |
| | |||||
* | show bitsizes in import key list again | Vincent Breitmoser | 2014-08-30 | 1 | -4/+4 |
| | | | | closes #802 | ||||
* | add ecc support | Vincent Breitmoser | 2014-08-24 | 3 | -10/+17 |
| | |||||
* | Copyright (C) 2014 Vincent Breitmoser | Vincent Breitmoser | 2014-08-21 | 1 | -0/+1 |
| | |||||
* | Upload key working | Dominik Schürmann | 2014-08-20 | 1 | -0/+2 |
| | |||||
* | Upload key working | Dominik Schürmann | 2014-08-20 | 1 | -0/+3 |
| | |||||
* | Work on upload key | Dominik Schürmann | 2014-08-20 | 1 | -14/+24 |
| | |||||
* | 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 |
| | | | |