Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | 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 | |
| | | | | | ||||||
| * | | | | ContactHelper can read email addresses from contact list | mar-v-in | 2014-05-26 | 2 | -0/+22 | |
| | | | | | ||||||
* | | | | | Move SlidingTabLayout and SlidingTabStrip into appropriate subpackage | Dominik Schürmann | 2014-06-06 | 6 | -6/+6 | |
| | | | | | ||||||
* | | | | | Hide subkeys, certs tabs in key view, checkable menu item to show/hide them | Dominik Schürmann | 2014-06-06 | 4 | -10/+94 | |
| |_|/ / |/| | | | ||||||
* | | | | Clean up keyimport.ImportKeysListEntry | Tim Bray | 2014-06-05 | 2 | -67/+66 | |
| | | | | ||||||
* | | | | Merge pull request #645 from timbray/master | Dominik Schürmann | 2014-06-05 | 2 | -7/+4 | |
|\ \ \ \ | |_|_|/ |/| | | | Don't show full fingerprint in key search result lists | |||||
| * | | | Don't show full fingerprint in key search results | Tim Bray | 2014-06-05 | 1 | -6/+2 | |
| | | | | ||||||
| * | | | fixed error message | Tim Bray | 2014-06-04 | 2 | -4/+3 | |
| | |/ | |/| | ||||||
* | | | ui: do show Certify identities button even for secret keys | Vincent Breitmoser | 2014-06-04 | 1 | -8/+0 | |
| | | | | | | | | | | | | Closes #636 | |||||
* | | | fix bug with bad verifying master keys | Vincent Breitmoser | 2014-06-04 | 1 | -3/+3 | |
| | | | ||||||
* | | | do respect expectedFingerprint during key import | Vincent Breitmoser | 2014-06-04 | 2 | -9/+18 | |
| | | | ||||||
* | | | neatness refactoring | Vincent Breitmoser | 2014-06-04 | 33 | -241/+118 | |
|/ / | ||||||
* | | Merge remote-tracking branch 'origin/master' into edit-key-rewrite | Vincent Breitmoser | 2014-06-02 | 99 | -712/+1368 | |
|\ \ | ||||||
| * | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-05-31 | 7 | -63/+54 | |
| |\| | ||||||
| | * | Finished cleaning up rebase conflicts post Keyserver exception refactor | Tim Bray | 2014-05-23 | 6 | -32/+33 | |
| | | | ||||||
| | * | Add Log.d for QueryFailedException | Tim Bray | 2014-05-23 | 1 | -0/+2 | |
| | | | ||||||
| | * | Add Log.d for QueryFailedException | Tim Bray | 2014-05-23 | 7 | -40/+28 | |
| | | | ||||||
| * | | Pull from transifex | Dominik Schürmann | 2014-05-31 | 92 | -649/+1314 | |
| |/ | ||||||
* | | wrapped-key-ring: add documentation | Vincent Breitmoser | 2014-06-02 | 7 | -7/+83 | |
| | | ||||||
* | | make everything work again | Vincent Breitmoser | 2014-06-02 | 3 | -8/+22 | |
| | | ||||||
* | | wrapped-key-ring: move key data around in ParcelableKeyRing instead of ↵ | Vincent Breitmoser | 2014-06-02 | 9 | -183/+119 | |
| | | | | | | | | ImportKeysListEntry | |||||
* | | wrapped-key-ring: no UncachedSecretKeyRing after all | Vincent Breitmoser | 2014-06-02 | 9 | -61/+75 | |
| | | ||||||
* | | new savekeyring operation (mostly stub) | Vincent Breitmoser | 2014-05-27 | 16 | -356/+595 | |
| | | ||||||
* | | introduce new SaveKeyringParcel | Vincent Breitmoser | 2014-05-27 | 1 | -0/+113 | |
| | | ||||||
* | | rename SaveKeyringParcel to OldSaveKeyringParcel | Vincent Breitmoser | 2014-05-27 | 4 | -14/+19 | |
| | | ||||||
* | | update unit test support in build files | Vincent Breitmoser | 2014-05-27 | 3 | -69/+12 | |
| | | ||||||
* | | fix missing userIds in ImportKeysListEntry | Vincent Breitmoser | 2014-05-27 | 2 | -4/+9 | |
| | | ||||||
* | | wrapped-key-ring: forgot a part in PgpDecryptVerify | Vincent Breitmoser | 2014-05-23 | 1 | -2/+9 | |
| | | ||||||
* | | introduce WrappedSignature for the ViewCert* ui code | Vincent Breitmoser | 2014-05-23 | 3 | -31/+149 | |
| | | ||||||
* | | wrapped-key-ring: use UncachedKeyRing in ImportKeysListLoader | Vincent Breitmoser | 2014-05-23 | 1 | -28/+8 | |
| | | ||||||
* | | wrapped-key-ring: UncachedKeyRing wraps only one ring of dynamic type | Vincent Breitmoser | 2014-05-23 | 8 | -101/+126 | |
| | | ||||||
* | | wrapped-key-ring: encapsulate key flags | Vincent Breitmoser | 2014-05-22 | 3 | -18/+27 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into wrapped-key-ring | Vincent Breitmoser | 2014-05-21 | 27 | -253/+375 | |
|\| | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java | |||||
| * | Layout fixes for key import | Dominik Schürmann | 2014-05-19 | 9 | -66/+58 | |
| | | ||||||
| * | Add license header to FixedDrawerLayout | Dominik Schürmann | 2014-05-18 | 1 | -0/+16 | |
| | | ||||||
| * | Merge highlight keyserver pull request | Dominik Schürmann | 2014-05-18 | 9 | -91/+128 | |
| |\ | ||||||
| | * | Rename mCurQuery to mQuery for consistency | Thialfihar | 2014-05-16 | 1 | -5/+5 | |
| | | | ||||||
| | * | Use Highlighter instead of HighlightQueryCursorAdapter | Thialfihar | 2014-05-16 | 3 | -79/+28 | |
| | | | ||||||
| | * | Add highlighting to keyserver/keybase search | Thialfihar | 2014-05-16 | 5 | -5/+75 | |
| | | | ||||||
| | * | Support mutliple search words and highlight them | Thialfihar | 2014-05-16 | 3 | -6/+24 | |
| | | | | | | | | | | | | | | | | | | | | | For the regex matching it would be smart to sort the words by length, so the longest matches come first. This only matters for queries with words containing parts of each other, which is an unlikely event and even then it doesn't break anything. | |||||
| * | | Rename KeyServer to Keyserver | Dominik Schürmann | 2014-05-18 | 9 | -38/+34 | |
| |/ | ||||||
| * | 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 | |
| | | ||||||
| * | JWalk javadocs | Tim Bray | 2014-05-14 | 1 | -0/+48 | |
| | | ||||||
| * | Merge pull request #627 from thi/improve-keybase.io-support | Dominik Schürmann | 2014-05-14 | 6 | -49/+94 | |
| |\ | | | | | | | Improve keybase.io support | |||||
| | * | Rename fingerPrint to fingerprint | Thialfihar | 2014-05-14 | 5 | -16/+16 | |
| | | | ||||||
| | * | 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 | 2 | -5/+8 | |
| | | | | | | | | | | | | | | | Once keybase reports them, we can display them. Until then we simply don't know and shouldn't lie about it. |